diff --git a/extern/include/armadillo/SecuredSections.h b/extern/include/armadillo/SecuredSections.h deleted file mode 100644 index f4efa555..00000000 --- a/extern/include/armadillo/SecuredSections.h +++ /dev/null @@ -1,157 +0,0 @@ - -#if defined(__BORLANDC__) - /* These definitions provided by Dr. Todd Brennan, 04Oct2002 */ - #define SECUREBEGIN _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x00;} - #define SECUREEND _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_A _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x01;} - #define SECUREEND_A _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_B _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x02;} - #define SECUREEND_B _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_C _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x03;} - #define SECUREEND_C _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_D _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x04;} - #define SECUREEND_D _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_E _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x05;} - #define SECUREEND_E _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_F _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x06;} - #define SECUREEND_F _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_G _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x07;} - #define SECUREEND_G _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_H _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x08;} - #define SECUREEND_H _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_I _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x09;} - #define SECUREEND_I _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_J _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x0A;} - #define SECUREEND_J _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define SECUREBEGIN_K _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0x0B;} - #define SECUREEND_K _asm {db 0xEB; db 0x03; db 0xD6; db 0xD6; db 0xFF;} - #define NANOBEGIN _asm {db 0xEB; db 0x03; db 0xD6; db 0xD7; db 0x01;} - #define NANOEND _asm {db 0xEB; db 0x03; db 0xD6; db 0xD7; db 0x00;} - - /* The former definitions for Borland C++ Builder, if anyone needs them. */ - /* - #define SECUREBEGIN __emit__ (0xEB,0x03,0xD6,0xD6,0x00); - #define SECUREEND __emit__ (0xEB,0x03,0xD6,0xD6,0xFF); - #define SECUREBEGIN_A __emit__ (0xEB,0x03,0xD6,0xD6,0x01); - #define SECUREEND_A __emit__ (0xEB,0x03,0xD6,0xD6,0xFF); - #define SECUREBEGIN_B __emit__ (0xEB,0x03,0xD6,0xD6,0x02); - #define SECUREEND_B __emit__ (0xEB,0x03,0xD6,0xD6,0xFF); - #define SECUREBEGIN_C __emit__ (0xEB,0x03,0xD6,0xD6,0x03); - #define SECUREEND_C __emit__ (0xEB,0x03,0xD6,0xD6,0xFF); - #define NANOBEGIN __emit__ (0xEB,0x03,0xD6,0xD7,0x01); - #define NANOEND __emit__ (0xEB,0x03,0xD6,0xD7,0x00); - */ -#elif defined(__LCC__) - /* Provided by Rubem Pechansky, 26Feb2003 */ - #define SECUREBEGIN _asm(".byte 0xEB,0x03,0xD6,0xD6,0x00"); - #define SECUREEND _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_A _asm(".byte 0xEB,0x03,0xD6,0xD6,0x01"); - #define SECUREEND_A _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_B _asm(".byte 0xEB,0x03,0xD6,0xD6,0x02"); - #define SECUREEND_B _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_C _asm(".byte 0xEB,0x03,0xD6,0xD6,0x03"); - #define SECUREEND_C _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_D _asm(".byte 0xEB,0x03,0xD6,0xD6,0x04"); - #define SECUREEND_D _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_E _asm(".byte 0xEB,0x03,0xD6,0xD6,0x05"); - #define SECUREEND_E _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_F _asm(".byte 0xEB,0x03,0xD6,0xD6,0x06"); - #define SECUREEND_F _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_G _asm(".byte 0xEB,0x03,0xD6,0xD6,0x07"); - #define SECUREEND_G _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_H _asm(".byte 0xEB,0x03,0xD6,0xD6,0x08"); - #define SECUREEND_H _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_I _asm(".byte 0xEB,0x03,0xD6,0xD6,0x09"); - #define SECUREEND_I _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_J _asm(".byte 0xEB,0x03,0xD6,0xD6,0x0A"); - #define SECUREEND_J _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define SECUREBEGIN_K _asm(".byte 0xEB,0x03,0xD6,0xD6,0x0B"); - #define SECUREEND_K _asm(".byte 0xEB,0x03,0xD6,0xD6,0xFF"); - #define NANOBEGIN _asm(".byte 0xEB,0x03,0xD6,0xD7,0x01"); - #define NANOEND _asm(".byte 0xEB,0x03,0xD6,0xD7,0x00"); -#endif - -#ifdef _WIN64 - #define ARMACCESS_API __declspec(dllimport) __stdcall - extern "C" void ARMACCESS_API SECUREBEGIN(void); - extern "C" void ARMACCESS_API SECUREBEGIN_A(void); - extern "C" void ARMACCESS_API SECUREBEGIN_B(void); - extern "C" void ARMACCESS_API SECUREBEGIN_C(void); - extern "C" void ARMACCESS_API SECUREBEGIN_D(void); - extern "C" void ARMACCESS_API SECUREBEGIN_E(void); - extern "C" void ARMACCESS_API SECUREBEGIN_F(void); - extern "C" void ARMACCESS_API SECUREBEGIN_G(void); - extern "C" void ARMACCESS_API SECUREBEGIN_H(void); - extern "C" void ARMACCESS_API SECUREBEGIN_I(void); - extern "C" void ARMACCESS_API SECUREBEGIN_J(void); - extern "C" void ARMACCESS_API SECUREBEGIN_K(void); - extern "C" void ARMACCESS_API SECUREEND(void); - extern "C" void ARMACCESS_API SECUREEND_A(void); - extern "C" void ARMACCESS_API SECUREEND_B(void); - extern "C" void ARMACCESS_API SECUREEND_C(void); - extern "C" void ARMACCESS_API SECUREEND_D(void); - extern "C" void ARMACCESS_API SECUREEND_E(void); - extern "C" void ARMACCESS_API SECUREEND_F(void); - extern "C" void ARMACCESS_API SECUREEND_G(void); - extern "C" void ARMACCESS_API SECUREEND_H(void); - extern "C" void ARMACCESS_API SECUREEND_I(void); - extern "C" void ARMACCESS_API SECUREEND_J(void); - extern "C" void ARMACCESS_API SECUREEND_K(void); - extern "C" void ARMACCESS_API NANOBEGIN(void); - extern "C" void ARMACCESS_API NANOEND(void); - - #define SECUREBEGIN SECUREBEGIN() - #define SECUREEND SECUREEND() - #define SECUREBEGIN_A SECUREBEGIN_A() - #define SECUREEND_A SECUREEND_A() - #define SECUREBEGIN_B SECUREBEGIN_B() - #define SECUREEND_B SECUREEND_B() - #define SECUREBEGIN_C SECUREBEGIN_C() - #define SECUREEND_C SECUREEND_C() - #define SECUREBEGIN_D SECUREBEGIN_D() - #define SECUREEND_D SECUREEND_D() - #define SECUREBEGIN_E SECUREBEGIN_E() - #define SECUREEND_E SECUREEND_E() - #define SECUREBEGIN_F SECUREBEGIN_F() - #define SECUREEND_F SECUREEND_F() - #define SECUREBEGIN_G SECUREBEGIN_G() - #define SECUREEND_G SECUREEND_G() - #define SECUREBEGIN_H SECUREBEGIN_H() - #define SECUREEND_H SECUREEND_H() - #define SECUREBEGIN_I SECUREBEGIN_I() - #define SECUREEND_I SECUREEND_I() - #define SECUREBEGIN_J SECUREBEGIN_J() - #define SECUREEND_J SECUREEND_J() - #define SECUREBEGIN_K SECUREBEGIN_K() - #define SECUREEND_K SECUREEND_K() - #define NANOBEGIN NANOBEGIN() - #define NANOEND NANOEND() - -#else - #define SECUREBEGIN __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x00 - #define SECUREEND __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_A __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x01 - #define SECUREEND_A __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_B __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x02 - #define SECUREEND_B __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_C __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x03 - #define SECUREEND_C __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_D __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x04 - #define SECUREEND_D __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_E __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x05 - #define SECUREEND_E __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_F __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x06 - #define SECUREEND_F __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_G __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x07 - #define SECUREEND_G __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_H __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x08 - #define SECUREEND_H __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_I __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x09 - #define SECUREEND_I __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_J __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x0A - #define SECUREEND_J __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define SECUREBEGIN_K __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0x0B - #define SECUREEND_K __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD6 __asm _emit 0xFF - #define NANOBEGIN __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD7 __asm _emit 0x01 - #define NANOEND __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD7 __asm _emit 0x00 -#endif diff --git a/src/EterBase/StdAfx.h b/src/EterBase/StdAfx.h index c13c470b..de7a2cfc 100644 --- a/src/EterBase/StdAfx.h +++ b/src/EterBase/StdAfx.h @@ -40,16 +40,6 @@ #define atoi _atoi64 #endif -// Armadillo nanomite protection -#if !defined(NANOBEGIN) && !defined(NANOEND) - #ifdef _DEBUG - #define NANOBEGIN - #define NANOEND - #else - #include - #endif -#endif - #include "vk.h" #include "filename.h" #include "ServiceDefs.h" diff --git a/src/EterBase/Timer.cpp b/src/EterBase/Timer.cpp index 923b8294..596f622f 100644 --- a/src/EterBase/Timer.cpp +++ b/src/EterBase/Timer.cpp @@ -35,13 +35,8 @@ DWORD ELTimer_GetMSec() VOID ELTimer_SetServerMSec(DWORD dwServerTime) { - NANOBEGIN - if (0 != dwServerTime) // nanomite를 위한 더미 if - { - gs_dwServerTime = dwServerTime; - gs_dwClientTime = CTimer::instance().GetCurrentMillisecond(); - } - NANOEND + gs_dwServerTime = dwServerTime; + gs_dwClientTime = CTimer::instance().GetCurrentMillisecond(); } DWORD ELTimer_GetServerMSec() @@ -69,18 +64,13 @@ CTimer::CTimer() { ELTimer_Init(); - NANOBEGIN - if (this) // nanomite를 위한 더미 if - { - m_dwCurrentTime = 0; - m_bUseRealTime = true; - m_index = 0; + m_dwCurrentTime = 0; + m_bUseRealTime = true; + m_index = 0; - m_dwElapsedTime = 0; + m_dwElapsedTime = 0; - m_fCurrentTime = 0.0f; - } - NANOEND + m_fCurrentTime = 0.0f; } CTimer::~CTimer() diff --git a/src/EterGrnLib/LODController.cpp b/src/EterGrnLib/LODController.cpp index 3095a766..b20fa971 100644 --- a/src/EterGrnLib/LODController.cpp +++ b/src/EterGrnLib/LODController.cpp @@ -91,7 +91,6 @@ void __FreeDeformVertexBuffer(CGraphicVertexBuffer* pkDelVB) void __ReserveSharedVertexBuffers(unsigned index, unsigned count) { - NANOBEGIN if (index >= SHARED_VB_NUM) return; @@ -107,7 +106,6 @@ void __ReserveSharedVertexBuffers(unsigned index, unsigned count) D3DPOOL_MANAGED); gs_vbs[index].push_back(pkNewVB); } - NANOEND } void GrannyCreateSharedDeformBuffer() diff --git a/src/EterGrnLib/StdAfx.h b/src/EterGrnLib/StdAfx.h index a0cb07cc..6a007f41 100644 --- a/src/EterGrnLib/StdAfx.h +++ b/src/EterGrnLib/StdAfx.h @@ -10,13 +10,3 @@ #include "../eterBase/Stl.h" #include "Util.h" - -// Armadillo nanomite protection -#if !defined(NANOBEGIN) && !defined(NANOEND) - #ifdef _DEBUG - #define NANOBEGIN - #define NANOEND - #else - #include - #endif -#endif diff --git a/src/EterLib/Input.cpp b/src/EterLib/Input.cpp index 47a528b4..ea8ea055 100644 --- a/src/EterLib/Input.cpp +++ b/src/EterLib/Input.cpp @@ -55,8 +55,6 @@ void CInputKeyboard::ResetKeyboard() bool CInputKeyboard::InitializeKeyboard(HWND hWnd) { - NANOBEGIN - if (ms_lpKeyboard) return true; @@ -82,7 +80,6 @@ bool CInputKeyboard::InitializeKeyboard(HWND hWnd) ms_lpKeyboard->Acquire(); - NANOEND return true; } diff --git a/src/GameLib/FlyingData.cpp b/src/GameLib/FlyingData.cpp index 40524d15..87f7a5b4 100644 --- a/src/GameLib/FlyingData.cpp +++ b/src/GameLib/FlyingData.cpp @@ -124,7 +124,6 @@ void CFlyingData::DuplicateAttach(int iIndex) bool CFlyingData::LoadScriptFile(const char* c_szFilename) { - NANOBEGIN Destroy(); m_strFilename = c_szFilename; @@ -278,7 +277,6 @@ bool CFlyingData::LoadScriptFile(const char* c_szFilename) } } - NANOEND return true; } diff --git a/src/GameLib/MapOutdoorLoad.cpp b/src/GameLib/MapOutdoorLoad.cpp index cfccfe1a..e61e8c73 100644 --- a/src/GameLib/MapOutdoorLoad.cpp +++ b/src/GameLib/MapOutdoorLoad.cpp @@ -289,7 +289,6 @@ bool CMapOutdoor::LoadTerrain(WORD wTerrainCoordX, WORD wTerrainCoordY, WORD wCe bool CMapOutdoor::LoadSetting(const char * c_szFileName) { - NANOBEGIN CTokenVectorMap stTokenVectorMap; if (!LoadMultipleTextData(c_szFileName, stTokenVectorMap)) @@ -440,7 +439,7 @@ bool CMapOutdoor::LoadSetting(const char * c_szFileName) D3DXMatrixScaling(&m_matBuildingTransparent, 1.0f / ((float)ms_iWidth), -1.0f / ((float)ms_iHeight), 1.0f); m_matBuildingTransparent._41 = 0.5f; m_matBuildingTransparent._42 = 0.5f; - NANOEND + return true; } diff --git a/src/MilesLib/Stdafx.h b/src/MilesLib/Stdafx.h index 307d3ccb..36f63999 100644 --- a/src/MilesLib/Stdafx.h +++ b/src/MilesLib/Stdafx.h @@ -16,14 +16,4 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. -// Armadillo nanomite protection -#if !defined(NANOBEGIN) && !defined(NANOEND) - #ifdef _DEBUG - #define NANOBEGIN - #define NANOEND - #else - #include - #endif -#endif - #endif \ No newline at end of file diff --git a/src/PRTerrainLib/TextureSet.cpp b/src/PRTerrainLib/TextureSet.cpp index 078199cb..144725c9 100644 --- a/src/PRTerrainLib/TextureSet.cpp +++ b/src/PRTerrainLib/TextureSet.cpp @@ -24,7 +24,6 @@ void CTextureSet::Create() bool CTextureSet::Load(const char * c_szTextureSetFileName, float fTerrainTexCoordBase) { - NANOBEGIN Clear(); CTokenVectorMap stTokenVectorMap; @@ -91,7 +90,7 @@ bool CTextureSet::Load(const char * c_szTextureSetFileName, float fTerrainTexCoo } m_stFileName.assign(c_szTextureSetFileName); - NANOEND + return true; } diff --git a/src/ScriptLib/PythonLauncher.cpp b/src/ScriptLib/PythonLauncher.cpp index 4ee247f1..d0ab24e4 100644 --- a/src/ScriptLib/PythonLauncher.cpp +++ b/src/ScriptLib/PythonLauncher.cpp @@ -114,7 +114,6 @@ void CPythonLauncher::SetTraceFunc(int (*pFunc)(PyObject * obj, PyFrameObject * bool CPythonLauncher::Create(const char* c_szProgramName) { - NANOBEGIN Py_SetProgramName((char*)c_szProgramName); #ifdef _DEBUG PyEval_SetTrace(TraceFunc, NULL); @@ -138,13 +137,11 @@ bool CPythonLauncher::Create(const char* c_szProgramName) if (!RunLine("import sys")) return false; - NANOEND return true; } bool CPythonLauncher::RunCompiledFile(const char* c_szFileName) { - NANOBEGIN FILE * fp = fopen(c_szFileName, "rb"); if (!fp) @@ -191,14 +188,12 @@ bool CPythonLauncher::RunCompiledFile(const char* c_szFileName) if (Py_FlushLine()) PyErr_Clear(); - NANOEND return true; } bool CPythonLauncher::RunMemoryTextFile(const char* c_szFileName, std::shared_ptr> fileData) { - NANOBEGIN std::string stConvFileData; stConvFileData.reserve(fileData->size()); stConvFileData+="exec(compile('''"; @@ -219,7 +214,6 @@ bool CPythonLauncher::RunMemoryTextFile(const char* c_szFileName, std::shared_pt stConvFileData+= "'exec'))"; const CHAR* c_pcConvFileData=stConvFileData.c_str(); - NANOEND return RunLine(c_pcConvFileData); } diff --git a/src/SphereLib/spherepack.cpp b/src/SphereLib/spherepack.cpp index 5bacb4db..16f2094a 100644 --- a/src/SphereLib/spherepack.cpp +++ b/src/SphereLib/spherepack.cpp @@ -19,7 +19,6 @@ int DrawCircle(int locx, int locy, int radius, int color); SpherePackFactory::SpherePackFactory(int maxspheres, float rootsize, float leafsize, float gravy) { - NANOBEGIN maxspheres *= 4; // include room for both trees, the root node and leaf node tree, and the superspheres mMaxRootSize = rootsize; mMaxLeafSize = leafsize; @@ -61,7 +60,6 @@ SpherePackFactory::SpherePackFactory(int maxspheres, float rootsize, float leafs mColors[11] = 0x0080FFFF; #endif - NANOEND } SpherePackFactory::~SpherePackFactory(void) diff --git a/src/UserInterface/Locale.cpp b/src/UserInterface/Locale.cpp index aa91dc76..23c99fb4 100644 --- a/src/UserInterface/Locale.cpp +++ b/src/UserInterface/Locale.cpp @@ -25,7 +25,6 @@ int MULTI_LOCALE_CODE = 1252; void LocaleService_LoadConfig(const char* fileName) { - NANOBEGIN FILE* fp = fopen(fileName, "rt"); if (fp) @@ -44,7 +43,6 @@ void LocaleService_LoadConfig(const char* fileName) } fclose(fp); } - NANOEND } unsigned LocaleService_GetLastExp(int level) diff --git a/src/UserInterface/PythonApplication.cpp b/src/UserInterface/PythonApplication.cpp index 5f92da30..14710e1e 100644 --- a/src/UserInterface/PythonApplication.cpp +++ b/src/UserInterface/PythonApplication.cpp @@ -978,8 +978,7 @@ void CPythonApplication::Loop() // SUPPORT_NEW_KOREA_SERVER bool LoadLocaleData(const char* localePath) { - NANOBEGIN - CPythonNonPlayer& rkNPCMgr = CPythonNonPlayer::Instance(); + CPythonNonPlayer& rkNPCMgr = CPythonNonPlayer::Instance(); CItemManager& rkItemMgr = CItemManager::Instance(); CPythonSkill& rkSkillMgr = CPythonSkill::Instance(); CPythonNetworkStream& rkNetStream = CPythonNetworkStream::Instance(); @@ -1055,8 +1054,7 @@ bool LoadLocaleData(const char* localePath) } } - NANOEND - return true; + return true; } // END_OF_SUPPORT_NEW_KOREA_SERVER @@ -1070,8 +1068,7 @@ unsigned __GetWindowMode(bool windowed) bool CPythonApplication::Create(PyObject * poSelf, const char * c_szName, int width, int height, int Windowed) { - NANOBEGIN - Windowed = CPythonSystem::Instance().IsWindowed() ? 1 : 0; + Windowed = CPythonSystem::Instance().IsWindowed() ? 1 : 0; bool bAnotherWindow = false; @@ -1135,115 +1132,114 @@ bool CPythonApplication::Create(PyObject * poSelf, const char * c_szName, int wi } } - NANOEND - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - // Cursor - if (!CreateCursors()) + // Cursor + if (!CreateCursors()) + { + //PyErr_SetString(PyExc_RuntimeError, "CMSWindow::Cursors Create Error"); + TraceError("CMSWindow::Cursors Create Error"); + SET_EXCEPTION("CREATE_CURSOR"); + return false; + } + + if (!m_pySystem.IsNoSoundCard()) + { + // Sound + if (!m_SoundManager.Create()) { - //PyErr_SetString(PyExc_RuntimeError, "CMSWindow::Cursors Create Error"); - TraceError("CMSWindow::Cursors Create Error"); - SET_EXCEPTION("CREATE_CURSOR"); - return false; + // NOTE : 중국측의 요청으로 생략 + // LogBox(ApplicationStringTable_GetStringz(IDS_WARN_NO_SOUND_DEVICE)); } + } - if (!m_pySystem.IsNoSoundCard()) + extern bool GRAPHICS_CAPS_SOFTWARE_TILING; + + if (!m_pySystem.IsAutoTiling()) + GRAPHICS_CAPS_SOFTWARE_TILING = m_pySystem.IsSoftwareTiling(); + + // Device + if (!CreateDevice(m_pySystem.GetWidth(), m_pySystem.GetHeight(), Windowed, m_pySystem.GetBPP(), m_pySystem.GetFrequency())) + return false; + + GrannyCreateSharedDeformBuffer(); + + if (m_pySystem.IsAutoTiling()) + { + if (m_grpDevice.IsFastTNL()) { - // Sound - if (!m_SoundManager.Create()) - { - // NOTE : 중국측의 요청으로 생략 - // LogBox(ApplicationStringTable_GetStringz(IDS_WARN_NO_SOUND_DEVICE)); - } - } - - extern bool GRAPHICS_CAPS_SOFTWARE_TILING; - - if (!m_pySystem.IsAutoTiling()) - GRAPHICS_CAPS_SOFTWARE_TILING = m_pySystem.IsSoftwareTiling(); - - // Device - if (!CreateDevice(m_pySystem.GetWidth(), m_pySystem.GetHeight(), Windowed, m_pySystem.GetBPP(), m_pySystem.GetFrequency())) - return false; - - GrannyCreateSharedDeformBuffer(); - - if (m_pySystem.IsAutoTiling()) - { - if (m_grpDevice.IsFastTNL()) - { - m_pyBackground.ReserveSoftwareTilingEnable(false); - } - else - { - m_pyBackground.ReserveSoftwareTilingEnable(true); - } + m_pyBackground.ReserveSoftwareTilingEnable(false); } else { - m_pyBackground.ReserveSoftwareTilingEnable(m_pySystem.IsSoftwareTiling()); + m_pyBackground.ReserveSoftwareTilingEnable(true); } + } + else + { + m_pyBackground.ReserveSoftwareTilingEnable(m_pySystem.IsSoftwareTiling()); + } - SetVisibleMode(true); + SetVisibleMode(true); - if (m_isWindowFullScreenEnable) //m_pySystem.IsUseDefaultIME() && !m_pySystem.IsWindowed()) - { - SetWindowPos(GetWindowHandle(), HWND_TOP, 0, 0, width, height, SWP_SHOWWINDOW); - } + if (m_isWindowFullScreenEnable) //m_pySystem.IsUseDefaultIME() && !m_pySystem.IsWindowed()) + { + SetWindowPos(GetWindowHandle(), HWND_TOP, 0, 0, width, height, SWP_SHOWWINDOW); + } - if (!InitializeKeyboard(GetWindowHandle())) - return false; + if (!InitializeKeyboard(GetWindowHandle())) + return false; - m_pySystem.GetDisplaySettings(); + m_pySystem.GetDisplaySettings(); - // Mouse - if (m_pySystem.IsSoftwareCursor()) - SetCursorMode(CURSOR_MODE_SOFTWARE); - else - SetCursorMode(CURSOR_MODE_HARDWARE); + // Mouse + if (m_pySystem.IsSoftwareCursor()) + SetCursorMode(CURSOR_MODE_SOFTWARE); + else + SetCursorMode(CURSOR_MODE_HARDWARE); - // Network - if (!m_netDevice.Create()) - { - //PyErr_SetString(PyExc_RuntimeError, "NetDevice::Create failed"); - TraceError("NetDevice::Create failed"); - SET_EXCEPTION("CREATE_NETWORK"); - return false; - } + // Network + if (!m_netDevice.Create()) + { + //PyErr_SetString(PyExc_RuntimeError, "NetDevice::Create failed"); + TraceError("NetDevice::Create failed"); + SET_EXCEPTION("CREATE_NETWORK"); + return false; + } - if (!m_grpDevice.IsFastTNL()) - CGrannyLODController::SetMinLODMode(true); + if (!m_grpDevice.IsFastTNL()) + CGrannyLODController::SetMinLODMode(true); - m_pyItem.Create(); + m_pyItem.Create(); - // Other Modules - DefaultFont_Startup(); + // Other Modules + DefaultFont_Startup(); - CPythonIME::Instance().Create(GetWindowHandle()); - CPythonIME::Instance().SetText("", 0); - CPythonTextTail::Instance().Initialize(); + CPythonIME::Instance().Create(GetWindowHandle()); + CPythonIME::Instance().SetText("", 0); + CPythonTextTail::Instance().Initialize(); - // Light Manager - m_LightManager.Initialize(); + // Light Manager + m_LightManager.Initialize(); - CGraphicImageInstance::CreateSystem(32); + CGraphicImageInstance::CreateSystem(32); - // 백업 - STICKYKEYS sStickKeys; - memset(&sStickKeys, 0, sizeof(sStickKeys)); - sStickKeys.cbSize = sizeof(sStickKeys); - SystemParametersInfo( SPI_GETSTICKYKEYS, sizeof(sStickKeys), &sStickKeys, 0 ); - m_dwStickyKeysFlag = sStickKeys.dwFlags; + // 백업 + STICKYKEYS sStickKeys; + memset(&sStickKeys, 0, sizeof(sStickKeys)); + sStickKeys.cbSize = sizeof(sStickKeys); + SystemParametersInfo( SPI_GETSTICKYKEYS, sizeof(sStickKeys), &sStickKeys, 0 ); + m_dwStickyKeysFlag = sStickKeys.dwFlags; - // 설정 - sStickKeys.dwFlags &= ~(SKF_AVAILABLE|SKF_HOTKEYACTIVE); - SystemParametersInfo( SPI_SETSTICKYKEYS, sizeof(sStickKeys), &sStickKeys, 0 ); + // 설정 + sStickKeys.dwFlags &= ~(SKF_AVAILABLE|SKF_HOTKEYACTIVE); + SystemParametersInfo( SPI_SETSTICKYKEYS, sizeof(sStickKeys), &sStickKeys, 0 ); - // SphereMap - CGrannyMaterial::CreateSphereMap(0, "d:/ymir work/special/spheremap.jpg"); - CGrannyMaterial::CreateSphereMap(1, "d:/ymir work/special/spheremap01.jpg"); - return true; + // SphereMap + CGrannyMaterial::CreateSphereMap(0, "d:/ymir work/special/spheremap.jpg"); + CGrannyMaterial::CreateSphereMap(1, "d:/ymir work/special/spheremap01.jpg"); + return true; } void CPythonApplication::SetGlobalCenterPosition(LONG x, LONG y) diff --git a/src/UserInterface/PythonApplicationCursor.cpp b/src/UserInterface/PythonApplicationCursor.cpp index c103c15e..c3fdd143 100644 --- a/src/UserInterface/PythonApplicationCursor.cpp +++ b/src/UserInterface/PythonApplicationCursor.cpp @@ -4,7 +4,6 @@ bool CPythonApplication::CreateCursors() { - NANOBEGIN m_bCursorVisible = TRUE; m_bLiarCursorOn = false; @@ -41,7 +40,6 @@ bool CPythonApplication::CreateCursors() m_CursorHandleMap.insert(TCursorHandleMap::value_type(i, hCursor)); } - NANOEND return true; } diff --git a/src/UserInterface/PythonNetworkStream.cpp b/src/UserInterface/PythonNetworkStream.cpp index 2c5f6e2c..31f5d99a 100644 --- a/src/UserInterface/PythonNetworkStream.cpp +++ b/src/UserInterface/PythonNetworkStream.cpp @@ -763,7 +763,6 @@ DWORD CPythonNetworkStream::GetEmpireID() void CPythonNetworkStream::__ClearSelectCharacterData() { - NANOBEGIN memset(&m_akSimplePlayerInfo, 0, sizeof(m_akSimplePlayerInfo)); for (int i = 0; i < PLAYER_PER_ACCOUNT4; ++i) @@ -771,7 +770,6 @@ void CPythonNetworkStream::__ClearSelectCharacterData() m_adwGuildID[i] = 0; m_astrGuildName[i] = ""; } - NANOEND } void CPythonNetworkStream::__DirectEnterMode_Initialize() diff --git a/src/UserInterface/PythonNetworkStreamPhaseGame.cpp b/src/UserInterface/PythonNetworkStreamPhaseGame.cpp index 4eb7bc7b..750cbc2d 100644 --- a/src/UserInterface/PythonNetworkStreamPhaseGame.cpp +++ b/src/UserInterface/PythonNetworkStreamPhaseGame.cpp @@ -1079,7 +1079,6 @@ bool CPythonNetworkStream::SendMessengerRemovePacket(const char * c_szKey, const bool CPythonNetworkStream::SendCharacterStatePacket(const TPixelPosition& c_rkPPosDst, float fDstRot, UINT eFunc, UINT uArg) { - NANOBEGIN if (!__CanActMainInstance()) return true; @@ -1113,7 +1112,7 @@ bool CPythonNetworkStream::SendCharacterStatePacket(const TPixelPosition& c_rkPP kStatePacket.bArg); return false; } - NANOEND + return SendSequence(); } diff --git a/src/UserInterface/UserInterface.cpp b/src/UserInterface/UserInterface.cpp index ff765c6b..aabbdc18 100644 --- a/src/UserInterface/UserInterface.cpp +++ b/src/UserInterface/UserInterface.cpp @@ -205,7 +205,6 @@ int Setup(LPSTR lpCmdLine); // Internal function forward bool PackInitialize(const std::string& packFolder) { - NANOBEGIN if (_access(packFolder.c_str(), 0) != 0) return true; @@ -278,7 +277,6 @@ bool PackInitialize(const std::string& packFolder) } } - NANOEND return true; } @@ -319,8 +317,6 @@ bool RunMainScript(CPythonLauncher& pyLauncher, const char* lpCmdLine) initguild(); initServerStateChecker(); - NANOBEGIN - // RegisterDebugFlag { std::string stRegisterDebugFlag; @@ -392,7 +388,6 @@ bool RunMainScript(CPythonLauncher& pyLauncher, const char* lpCmdLine) } } - NANOEND return true; }