From c34b46a9a474849191c583685ee6fe9438af21ec Mon Sep 17 00:00:00 2001 From: rtw1x1 Date: Fri, 13 Feb 2026 00:00:23 +0000 Subject: [PATCH] Packet miss match fixed: Packet miss match for command_safebox_money fixed: Py_BuildException log: Detailed TraceError for CreateMemoryFile --- src/EterLib/GrpImageTexture.cpp | 2 +- src/ScriptLib/PythonUtils.cpp | 21 ++++++++++----------- src/UserInterface/Packet.h | 3 ++- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/EterLib/GrpImageTexture.cpp b/src/EterLib/GrpImageTexture.cpp index e2d58cd..a529bd0 100644 --- a/src/EterLib/GrpImageTexture.cpp +++ b/src/EterLib/GrpImageTexture.cpp @@ -182,7 +182,7 @@ bool CGraphicImageTexture::CreateFromMemoryFile(UINT bufSize, const void * c_pvB if (FAILED(D3DXCreateTextureFromFileInMemoryEx(ms_lpd3dDevice, c_pvBuf, bufSize , D3DX_DEFAULT_NONPOW2, D3DX_DEFAULT_NONPOW2, D3DX_DEFAULT, 0, d3dFmt, D3DPOOL_DEFAULT , dwFilter, dwFilter, 0xffff00ff, &imageInfo, NULL, &m_lpd3dTexture))) { - TraceError("CreateFromMemoryFile: Cannot create texture"); + TraceError("CreateFromMemoryFile: Cannot create texture (%s, %u bytes)", m_stFileName.c_str(), bufSize); return false; } diff --git a/src/ScriptLib/PythonUtils.cpp b/src/ScriptLib/PythonUtils.cpp index cdd7ad5..47e3e3d 100644 --- a/src/ScriptLib/PythonUtils.cpp +++ b/src/ScriptLib/PythonUtils.cpp @@ -19,20 +19,19 @@ PyObject * Py_BadArgument() PyObject * Py_BuildException(const char * c_pszErr, ...) { if (!c_pszErr) - PyErr_Clear(); - else { - char szErrBuf[512+1]; - va_list args; - va_start(args, c_pszErr); - vsnprintf(szErrBuf, sizeof(szErrBuf), c_pszErr, args); - va_end(args); - - PyErr_SetString(PyExc_RuntimeError, szErrBuf); + PyErr_Clear(); + return Py_BuildNone(); } - return Py_BuildNone(); - //return NULL; + char szErrBuf[512+1]; + va_list args; + va_start(args, c_pszErr); + vsnprintf(szErrBuf, sizeof(szErrBuf), c_pszErr, args); + va_end(args); + + PyErr_SetString(PyExc_RuntimeError, szErrBuf); + return NULL; } PyObject * Py_BuildNone() diff --git a/src/UserInterface/Packet.h b/src/UserInterface/Packet.h index f491708..9bd9b26 100644 --- a/src/UserInterface/Packet.h +++ b/src/UserInterface/Packet.h @@ -392,6 +392,7 @@ namespace MessengerSub { ADD_BY_VID, ADD_BY_NAME, REMOVE, + INVITE_ANSWER, // Added to match server packet_headers.h }; } namespace GC { enum : uint8_t { LIST, @@ -917,7 +918,7 @@ typedef struct command_safebox_money uint16_t header; uint16_t length; uint8_t bState; - uint32_t dwMoney; + int32_t lMoney; // Changed from uint32_t to int32_t to match server packet_structs.h } TPacketCGSafeboxMoney; typedef struct command_safebox_checkout