diff --git a/src/EterPythonLib/PythonGraphicModule.cpp b/src/EterPythonLib/PythonGraphicModule.cpp index ce62f66..b54ffd9 100644 --- a/src/EterPythonLib/PythonGraphicModule.cpp +++ b/src/EterPythonLib/PythonGraphicModule.cpp @@ -17,10 +17,10 @@ PyObject* grpCreateTextBar(PyObject* poSelf, PyObject* poArgs) if (!pTextBar->Create(NULL, iWidth, iHeight)) { delete pTextBar; - return Py_BuildValue("i", NULL); + return Py_BuildValue("K", NULL); } - return Py_BuildValue("i", pTextBar); + return Py_BuildValue("K", pTextBar); } PyObject* grpCreateBigTextBar(PyObject* poSelf, PyObject* poArgs) @@ -40,16 +40,16 @@ PyObject* grpCreateBigTextBar(PyObject* poSelf, PyObject* poArgs) if (!pTextBar->Create(NULL, iWidth, iHeight)) { delete pTextBar; - return Py_BuildValue("i", NULL); + return Py_BuildValue("K", NULL); } - return Py_BuildValue("i", pTextBar); + return Py_BuildValue("K", pTextBar); } PyObject* grpDestroyTextBar(PyObject* poSelf, PyObject* poArgs) { - int iHandle; - if (!PyTuple_GetInteger(poArgs, 0, &iHandle)) + unsigned long long iHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 0, &iHandle)) return Py_BuildException(); CTextBar * pTextBar = (CTextBar *)iHandle; @@ -60,8 +60,8 @@ PyObject* grpDestroyTextBar(PyObject* poSelf, PyObject* poArgs) PyObject* grpRenderTextBar(PyObject* poSelf, PyObject* poArgs) { - int iHandle; - if (!PyTuple_GetInteger(poArgs, 0, &iHandle)) + unsigned long long iHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 0, &iHandle)) return Py_BuildException(); int ix; if (!PyTuple_GetInteger(poArgs, 1, &ix)) @@ -79,8 +79,8 @@ PyObject* grpRenderTextBar(PyObject* poSelf, PyObject* poArgs) PyObject* grpTextBarSetTextColor(PyObject* poSelf, PyObject* poArgs) { - int iHandle; - if (!PyTuple_GetInteger(poArgs, 0, &iHandle)) + unsigned long long iHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 0, &iHandle)) return Py_BuildException(); int r; if (!PyTuple_GetInteger(poArgs, 1, &r)) @@ -101,8 +101,8 @@ PyObject* grpTextBarSetTextColor(PyObject* poSelf, PyObject* poArgs) PyObject* grpTextBarGetTextExtent(PyObject* poSelf, PyObject* poArgs) { - int iHandle; - if (!PyTuple_GetInteger(poArgs, 0, &iHandle)) + unsigned long long iHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 0, &iHandle)) return Py_BuildException(); char * szText; if (!PyTuple_GetString(poArgs, 1, &szText)) @@ -118,8 +118,8 @@ PyObject* grpTextBarGetTextExtent(PyObject* poSelf, PyObject* poArgs) PyObject* grpTextBarTextOut(PyObject* poSelf, PyObject* poArgs) { - int iHandle; - if (!PyTuple_GetInteger(poArgs, 0, &iHandle)) + unsigned long long iHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 0, &iHandle)) return Py_BuildException(); int ix; if (!PyTuple_GetInteger(poArgs, 1, &ix)) @@ -140,8 +140,8 @@ PyObject* grpTextBarTextOut(PyObject* poSelf, PyObject* poArgs) PyObject* grpClearTextBar(PyObject* poSelf, PyObject* poArgs) { - int iHandle; - if (!PyTuple_GetInteger(poArgs, 0, &iHandle)) + unsigned long long iHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 0, &iHandle)) return Py_BuildException(); CTextBar * pTextBar = (CTextBar *)iHandle; @@ -153,8 +153,8 @@ PyObject* grpClearTextBar(PyObject* poSelf, PyObject* poArgs) PyObject* grpSetTextBarClipRect(PyObject* poSelf, PyObject* poArgs) { - int iHandle; - if (!PyTuple_GetInteger(poArgs, 0, &iHandle)) + unsigned long long iHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 0, &iHandle)) return Py_BuildException(); int isx; if (!PyTuple_GetInteger(poArgs, 1, &isx)) diff --git a/src/EterPythonLib/PythonWindowManagerModule.cpp b/src/EterPythonLib/PythonWindowManagerModule.cpp index ae8dc0c..2df4eb2 100644 --- a/src/EterPythonLib/PythonWindowManagerModule.cpp +++ b/src/EterPythonLib/PythonWindowManagerModule.cpp @@ -1147,8 +1147,8 @@ PyObject * wndMgrSetSlot(PyObject * poSelf, PyObject * poArgs) if (!PyTuple_GetInteger(poArgs, 4, &iHeight)) return Py_BuildException(); - int iImageHandle; - if (!PyTuple_GetInteger(poArgs, 5, &iImageHandle)) + unsigned long long iImageHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 5, &iImageHandle)) return Py_BuildException(); D3DXCOLOR diffuseColor; diff --git a/src/UserInterface/MarkImage.cpp b/src/UserInterface/MarkImage.cpp index 2f43128..b77e802 100644 --- a/src/UserInterface/MarkImage.cpp +++ b/src/UserInterface/MarkImage.cpp @@ -221,7 +221,7 @@ void CGuildMarkImage::GetDiffBlocks(const DWORD * crcList, std::map & mapDiffBlocks); private: diff --git a/src/UserInterface/MarkManager.cpp b/src/UserInterface/MarkManager.cpp index b07875b..26b9916 100644 --- a/src/UserInterface/MarkManager.cpp +++ b/src/UserInterface/MarkManager.cpp @@ -296,7 +296,7 @@ bool CGuildMarkManager::SaveBlockFromCompressedData(DWORD imgIdx, DWORD posBlock } // CLIENT -bool CGuildMarkManager::GetBlockCRCList(DWORD imgIdx, DWORD * crcList) +bool CGuildMarkManager::GetBlockCRCList(DWORD imgIdx, uint32_t* crcList) { // 클라이언트에서 서버에 없는 이미지를 요청할 수는 없다. if (m_mapIdx_Image.end() == m_mapIdx_Image.find(imgIdx)) diff --git a/src/UserInterface/MarkManager.h b/src/UserInterface/MarkManager.h index 913ba50..3240112 100644 --- a/src/UserInterface/MarkManager.h +++ b/src/UserInterface/MarkManager.h @@ -52,7 +52,7 @@ class CGuildMarkManager : public singleton // CLIENT bool SaveBlockFromCompressedData(DWORD imgIdx, DWORD idBlock, const uint8_t * pbBlock, DWORD dwSize); - bool GetBlockCRCList(DWORD imgIdx, DWORD * crcList); + bool GetBlockCRCList(DWORD imgIdx, uint32_t * crcList); private: // diff --git a/src/UserInterface/Packet.h b/src/UserInterface/Packet.h index de2acae..d259314 100644 --- a/src/UserInterface/Packet.h +++ b/src/UserInterface/Packet.h @@ -1228,7 +1228,7 @@ typedef struct command_player_create uint16_t job; uint8_t shape; uint8_t CON; - uint8_t int32_t; + uint8_t INT; uint8_t STR; uint8_t DEX; } TPacketCGCreateCharacter; diff --git a/src/UserInterface/PythonApplication.cpp b/src/UserInterface/PythonApplication.cpp index 7700466..6fd1116 100644 --- a/src/UserInterface/PythonApplication.cpp +++ b/src/UserInterface/PythonApplication.cpp @@ -1281,7 +1281,7 @@ bool CPythonApplication::Create(PyObject * poSelf, const char * c_szName, int wi return true; } -void CPythonApplication::SetGlobalCenterPosition(LONG x, LONG y) +void CPythonApplication::SetGlobalCenterPosition(int32_t x, int32_t y) { CPythonBackground& rkBG=CPythonBackground::Instance(); rkBG.GlobalPositionToLocalPosition(x, y); diff --git a/src/UserInterface/PythonApplication.h b/src/UserInterface/PythonApplication.h index 09488e0..fd61c1e 100644 --- a/src/UserInterface/PythonApplication.h +++ b/src/UserInterface/PythonApplication.h @@ -184,7 +184,7 @@ class CPythonApplication : public CMSApplication, public CInputKeyboard, public int GetWidth(); int GetHeight(); - void SetGlobalCenterPosition(LONG x, LONG y); + void SetGlobalCenterPosition(int32_t x, int32_t y); void SetCenterPosition(float fx, float fy, float fz); void GetCenterPosition(TPixelPosition * pPixelPosition); void SetCamera(float Distance, float Pitch, float Rotation, float fDestinationHeight); diff --git a/src/UserInterface/PythonApplicationModule.cpp b/src/UserInterface/PythonApplicationModule.cpp index cbb87c5..85bc11d 100644 --- a/src/UserInterface/PythonApplicationModule.cpp +++ b/src/UserInterface/PythonApplicationModule.cpp @@ -1062,13 +1062,13 @@ PyObject * appOpenTextFile(PyObject * poSelf, PyObject * poArgs) CTextLineLoader * pTextLineLoader = new CTextLineLoader(szFileName); - return Py_BuildValue("i", (int)pTextLineLoader); + return Py_BuildValue("K", pTextLineLoader); } PyObject * appCloseTextFile(PyObject * poSelf, PyObject * poArgs) { - int iHandle; - if (!PyTuple_GetInteger(poArgs, 0, &iHandle)) + unsigned long long iHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 0, &iHandle)) return Py_BuildException(); CTextLineLoader * pTextFileLoader = (CTextLineLoader *)iHandle; @@ -1079,8 +1079,8 @@ PyObject * appCloseTextFile(PyObject * poSelf, PyObject * poArgs) PyObject * appGetTextFileLineCount(PyObject * poSelf, PyObject * poArgs) { - int iHandle; - if (!PyTuple_GetInteger(poArgs, 0, &iHandle)) + unsigned long long iHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 0, &iHandle)) return Py_BuildException(); CTextLineLoader * pTextFileLoader = (CTextLineLoader *)iHandle; @@ -1089,8 +1089,8 @@ PyObject * appGetTextFileLineCount(PyObject * poSelf, PyObject * poArgs) PyObject * appGetTextFileLine(PyObject * poSelf, PyObject * poArgs) { - int iHandle; - if (!PyTuple_GetInteger(poArgs, 0, &iHandle)) + unsigned long long iHandle; + if (!PyTuple_GetUnsignedLongLong(poArgs, 0, &iHandle)) return Py_BuildException(); int iLineIndex; if (!PyTuple_GetInteger(poArgs, 1, &iLineIndex)) diff --git a/src/UserInterface/PythonBackground.cpp b/src/UserInterface/PythonBackground.cpp index 38c7af3..f27d475 100644 --- a/src/UserInterface/PythonBackground.cpp +++ b/src/UserInterface/PythonBackground.cpp @@ -702,18 +702,30 @@ void CPythonBackground::SetBackgroundDirLight() STATEMANAGER.SetLight(0, &mc_pcurEnvironmentData->DirLights[ENV_DIRLIGHT_BACKGROUND]); } -void CPythonBackground::GlobalPositionToLocalPosition(LONG& rGlobalX, LONG& rGlobalY) +void CPythonBackground::GlobalPositionToLocalPosition(int32_t& rGlobalX, int32_t& rGlobalY) { rGlobalX-=m_dwBaseX; rGlobalY-=m_dwBaseY; } -void CPythonBackground::LocalPositionToGlobalPosition(LONG& rLocalX, LONG& rLocalY) +void CPythonBackground::LocalPositionToGlobalPosition(int32_t& rLocalX, int32_t& rLocalY) { rLocalX+=m_dwBaseX; rLocalY+=m_dwBaseY; } +void CPythonBackground::GlobalPositionToLocalPosition(uint32_t& rGlobalX, uint32_t& rGlobalY) +{ + rGlobalX -= m_dwBaseX; + rGlobalY -= m_dwBaseY; +} + +void CPythonBackground::LocalPositionToGlobalPosition(uint32_t& rLocalX, uint32_t& rLocalY) +{ + rLocalX += m_dwBaseX; + rLocalY += m_dwBaseY; +} + void CPythonBackground::RegisterDungeonMapName(const char * c_szMapName) { m_kSet_strDungeonMapName.insert(c_szMapName); diff --git a/src/UserInterface/PythonBackground.h b/src/UserInterface/PythonBackground.h index 92656e5..a88e786 100644 --- a/src/UserInterface/PythonBackground.h +++ b/src/UserInterface/PythonBackground.h @@ -61,8 +61,11 @@ public: void Destroy(); void Create(); - void GlobalPositionToLocalPosition(LONG& rGlobalX, LONG& rGlobalY); - void LocalPositionToGlobalPosition(LONG& rLocalX, LONG& rLocalY); + void GlobalPositionToLocalPosition(int32_t& rGlobalX, int32_t& rGlobalY); + void LocalPositionToGlobalPosition(int32_t& rLocalX, int32_t& rLocalY); + + void GlobalPositionToLocalPosition(uint32_t& rGlobalX, uint32_t& rGlobalY); + void LocalPositionToGlobalPosition(uint32_t& rLocalX, uint32_t& rLocalY); void EnableTerrainOnlyForHeight(); bool SetSplatLimit(int iSplatNum); diff --git a/src/UserInterface/PythonBackgroundModule.cpp b/src/UserInterface/PythonBackgroundModule.cpp index e375f10..93ecd3a 100644 --- a/src/UserInterface/PythonBackgroundModule.cpp +++ b/src/UserInterface/PythonBackgroundModule.cpp @@ -449,8 +449,8 @@ PyObject * backgroundGlobalPositionToLocalPosition(PyObject * poSelf, PyObject * if (!PyTuple_GetInteger(poArgs, 1, &iY)) return Py_BadArgument(); - LONG lX=iX; - LONG lY=iY; + int32_t lX=iX; + int32_t lY=iY; CPythonBackground& rkBG=CPythonBackground::Instance(); rkBG.GlobalPositionToLocalPosition(lX, lY); diff --git a/src/UserInterface/PythonCharacterManagerModule.cpp b/src/UserInterface/PythonCharacterManagerModule.cpp index aca294d..a36d526 100644 --- a/src/UserInterface/PythonCharacterManagerModule.cpp +++ b/src/UserInterface/PythonCharacterManagerModule.cpp @@ -98,8 +98,8 @@ PyObject * chrmgrGetVIDInfo(PyObject* poSelf, PyObject* poArgs) TPixelPosition kPPosInst; pkInstBase->NEW_GetPixelPosition(&kPPosInst); - LONG xInst=kPPosInst.x; - LONG yInst=kPPosInst.y; + int32_t xInst=kPPosInst.x; + int32_t yInst=kPPosInst.y; CPythonBackground& rkBG=CPythonBackground::Instance(); rkBG.LocalPositionToGlobalPosition(xInst, yInst); diff --git a/src/UserInterface/PythonItemModule.cpp b/src/UserInterface/PythonItemModule.cpp index 6ea2377..d6a9bf2 100644 --- a/src/UserInterface/PythonItemModule.cpp +++ b/src/UserInterface/PythonItemModule.cpp @@ -92,7 +92,7 @@ PyObject * itemGetIconImage(PyObject * poSelf, PyObject * poArgs) // CGraphicImage * pImage = (CGraphicImage *)CResourceManager::Instance().GetResourcePointer(szItemName); // } - return Py_BuildValue("i", pItemData->GetIconImage()); + return Py_BuildValue("K", pItemData->GetIconImage()); } PyObject * itemGetIconImageFileName(PyObject * poSelf, PyObject * poArgs) diff --git a/src/UserInterface/PythonNetworkStream.h b/src/UserInterface/PythonNetworkStream.h index e0b88e5..057c467 100644 --- a/src/UserInterface/PythonNetworkStream.h +++ b/src/UserInterface/PythonNetworkStream.h @@ -583,8 +583,11 @@ class CPythonNetworkStream : public CNetworkStream, public CSingletonpImage); + return Py_BuildValue("K", c_pSkillData->pImage); } @@ -2036,7 +2036,7 @@ PyObject * skillGetIconInstance(PyObject * poSelf, PyObject * poArgs) CGraphicImageInstance * pImageInstance = CGraphicImageInstance::New(); pImageInstance->SetImagePointer(c_pSkillData->pImage); - return Py_BuildValue("i", pImageInstance); + return Py_BuildValue("K", pImageInstance); } PyObject * skillGetIconImageNew(PyObject * poSelf, PyObject * poArgs) @@ -2059,7 +2059,7 @@ PyObject * skillGetIconImageNew(PyObject * poSelf, PyObject * poArgs) if (iGradeIndex >= CPythonSkill::SKILL_GRADE_COUNT) iGradeIndex = CPythonSkill::SKILL_GRADE_COUNT-1; - return Py_BuildValue("i", c_pSkillData->GradeData[iGradeIndex].pImage); + return Py_BuildValue("K", c_pSkillData->GradeData[iGradeIndex].pImage); } PyObject * skillGetIconInstanceNew(PyObject * poSelf, PyObject * poArgs) @@ -2087,7 +2087,7 @@ PyObject * skillGetIconInstanceNew(PyObject * poSelf, PyObject * poArgs) CGraphicImageInstance * pImageInstance = CGraphicImageInstance::New(); pImageInstance->SetImagePointer(c_pSkillData->GradeData[iGradeIndex].pImage); - return Py_BuildValue("i", pImageInstance); + return Py_BuildValue("K", pImageInstance); } PyObject * skillDeleteIconInstance(PyObject * poSelf, PyObject * poArgs)