Net: port the select-phase packets
Character create/delete/rename and empire selection now reach the server, and LOGIN_SUCCESS3, PLAYER_CREATE_SUCCESS/FAILURE, PLAYER_DELETE_SUCCESS/WRONG_SOCIAL_ID, POINT_CHANGE and CHANGE_NAME are parsed and forwarded to the select/create windows like Windows. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
40cac5cf52
commit
31c74cec28
@@ -580,12 +580,23 @@ PyObject* net_warp(PyObject*, PyObject*) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
// CPythonNetworkStream::Send* on the select connection; Windows only traces a failed Send.
|
||||
void send_select_packet(const char* what,wire::Bytes packet) {
|
||||
try { client.send_select_packet(std::move(packet)); }
|
||||
catch(const std::exception& e) { SDL_Log("%s - Error: %s",what,e.what()); }
|
||||
}
|
||||
|
||||
PyObject* send_create_character(PyObject*, PyObject* args) {
|
||||
if(!has_mock_characters) { PyErr_SetString(PyExc_NotImplementedError,"AVA2 character creation server exchange has not been ported");return nullptr; }
|
||||
int slot = 0, race = 0, shape = 0, con = 0, i_stat = 0, str = 0, dex = 0;
|
||||
char* name = nullptr;
|
||||
if (!PyArg_ParseTuple(args, "isiiiiii", &slot, &name, &race, &shape, &con, &i_stat, &str, &dex))
|
||||
return nullptr;
|
||||
if(!has_mock_characters) {
|
||||
// netSendCreateCharacterPacket: (BYTE) index/job/shape and the four stats.
|
||||
send_select_packet("Failed to SendCreateCharacterPacket",wire::create_character(std::uint8_t(slot),name,std::uint8_t(race),std::uint8_t(shape),
|
||||
std::uint8_t(con),std::uint8_t(i_stat),std::uint8_t(str),std::uint8_t(dex)));
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
if (slot >= 0 && slot < 5) {
|
||||
Character chr;
|
||||
@@ -613,11 +624,14 @@ PyObject* send_create_character(PyObject*, PyObject* args) {
|
||||
}
|
||||
|
||||
PyObject* send_destroy_character(PyObject*, PyObject* args) {
|
||||
if(!has_mock_characters) { PyErr_SetString(PyExc_NotImplementedError,"AVA2 character deletion server exchange has not been ported");return nullptr; }
|
||||
int slot = 0;
|
||||
char* privateCode = nullptr;
|
||||
if (!PyArg_ParseTuple(args, "is", &slot, &privateCode))
|
||||
return nullptr;
|
||||
if(!has_mock_characters) {
|
||||
send_select_packet("SendDestroyCharacterPacket",wire::destroy_character(std::uint8_t(slot),privateCode));
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
if (slot >= 0 && slot < 5) {
|
||||
mock_characters[slot] = Character{};
|
||||
@@ -975,6 +989,10 @@ static PyObject* net_SendSelectEmpirePacket(PyObject*, PyObject* poArgs) {
|
||||
int iEmpireIndex = 0;
|
||||
if (!PyTuple_GetInteger(poArgs, 0, &iEmpireIndex))
|
||||
return Py_BuildException();
|
||||
if(has_mock_characters) { set_mock_empire(std::uint8_t(iEmpireIndex));return Py_BuildNone(); }
|
||||
// SendSelectEmpirePacket: the empire id is kept locally only after a successful Send.
|
||||
try { client.send_select_packet(wire::select_empire(std::uint8_t(iEmpireIndex)));client.set_empire(std::uint8_t(iEmpireIndex)); }
|
||||
catch(const std::exception& e) { SDL_Log("SendSelectEmpirePacket - Error: %s",e.what()); }
|
||||
return Py_BuildNone();
|
||||
}
|
||||
|
||||
@@ -983,6 +1001,7 @@ static PyObject* net_SendChangeNamePacket(PyObject*, PyObject* poArgs) {
|
||||
char* szName = nullptr;
|
||||
if (!PyTuple_GetInteger(poArgs, 0, &iIndex) || !PyTuple_GetString(poArgs, 1, &szName))
|
||||
return Py_BuildException();
|
||||
if(!has_mock_characters) send_select_packet("Failed to SendChangeNamePacket",wire::change_name(std::uint8_t(iIndex),szName));
|
||||
return Py_BuildNone();
|
||||
}
|
||||
|
||||
@@ -1410,6 +1429,19 @@ void pump_python_net() {
|
||||
callback(handler, client.session()->empire() ? "SetSelectCharacterPhase" : "SetSelectEmpirePhase");
|
||||
if(event.generation == client.generation()) callback(phases[2], "Refresh");
|
||||
} else if(event.type == LoginClient::EventType::SelectRefresh) callback(phases[2], "Refresh");
|
||||
else if(event.type == LoginClient::EventType::SelectResult) {
|
||||
// PHASE_WINDOW_SELECT=2, PHASE_WINDOW_CREATE=3 (PythonNetworkStreamPhaseSelect.cpp).
|
||||
const auto& r=event.result;
|
||||
switch(r.kind) {
|
||||
case SelectResult::Kind::CreateSuccess: callback(phases[3],"OnCreateSuccess");break;
|
||||
case SelectResult::Kind::CreateFailure:
|
||||
PyCallClassMemberFunc(phases[3],"OnCreateFailure",Py_BuildValue("(i)",r.value));
|
||||
PyCallClassMemberFunc(phases[2],"OnCreateFailure",Py_BuildValue("(i)",r.value));break;
|
||||
case SelectResult::Kind::DeleteSuccess: PyCallClassMemberFunc(phases[2],"OnDeleteSuccess",Py_BuildValue("(i)",r.value));break;
|
||||
case SelectResult::Kind::DeleteFailure: callback(phases[2],"OnDeleteFailure");break;
|
||||
case SelectResult::Kind::ChangeName: PyCallClassMemberFunc(phases[2],"OnChangeName",Py_BuildValue("(is)",r.value,r.name.c_str()));break;
|
||||
}
|
||||
}
|
||||
else if(event.type == LoginClient::EventType::DirectEnterReady) callback(handler, "SetLoadingPhase");
|
||||
else if(event.type == LoginClient::EventType::Loading) {
|
||||
PythonNetworkStream::Instance().SetPhase(PHASE_LOADING);
|
||||
|
||||
Reference in New Issue
Block a user