From c9aa9a0b03bfab4745327ccfee4dec061230d98a Mon Sep 17 00:00:00 2001 From: Exynox Date: Sun, 10 Mar 2024 10:37:36 +0200 Subject: [PATCH] Removed unused locale information, refactored where needed. Enabled DS system. --- bin/pack/root/localeinfo.py | 2 +- src/UserInterface/Locale.cpp | 76 ++++------ src/UserInterface/Locale.h | 10 +- src/UserInterface/Locale_inc.h | 4 - src/UserInterface/Locale_inc_BR.h | 5 - src/UserInterface/Locale_inc_CA.h | 4 - src/UserInterface/Locale_inc_EU.h | 3 - src/UserInterface/Locale_inc_EU2.h | 11 -- src/UserInterface/Locale_inc_GB.h | 3 - src/UserInterface/Locale_inc_HK.h | 2 - src/UserInterface/Locale_inc_JP.h | 8 - src/UserInterface/Locale_inc_KO.h | 6 - src/UserInterface/Locale_inc_KO_DEV.h | 5 - src/UserInterface/Locale_inc_NEWCIBN.h | 6 - src/UserInterface/Locale_inc_SG.h | 3 - src/UserInterface/Locale_inc_VI.h | 1 - src/UserInterface/Locale_inc_dev.h | 6 - .../PythonNetworkStreamPhaseLogin.cpp | 2 - src/UserInterface/UserInterface.rc | 137 ++++-------------- src/UserInterface/UserInterface.vcxproj | 22 +-- .../UserInterface.vcxproj.filters | 42 ------ src/UserInterface/metin2.ico | Bin 7406 -> 7406 bytes 22 files changed, 70 insertions(+), 288 deletions(-) delete mode 100644 src/UserInterface/Locale_inc.h delete mode 100644 src/UserInterface/Locale_inc_BR.h delete mode 100644 src/UserInterface/Locale_inc_CA.h delete mode 100644 src/UserInterface/Locale_inc_EU.h delete mode 100644 src/UserInterface/Locale_inc_EU2.h delete mode 100644 src/UserInterface/Locale_inc_GB.h delete mode 100644 src/UserInterface/Locale_inc_HK.h delete mode 100644 src/UserInterface/Locale_inc_JP.h delete mode 100644 src/UserInterface/Locale_inc_KO.h delete mode 100644 src/UserInterface/Locale_inc_KO_DEV.h delete mode 100644 src/UserInterface/Locale_inc_NEWCIBN.h delete mode 100644 src/UserInterface/Locale_inc_SG.h delete mode 100644 src/UserInterface/Locale_inc_VI.h delete mode 100644 src/UserInterface/Locale_inc_dev.h diff --git a/bin/pack/root/localeinfo.py b/bin/pack/root/localeinfo.py index f660406f..f6271ecd 100644 --- a/bin/pack/root/localeinfo.py +++ b/bin/pack/root/localeinfo.py @@ -9,7 +9,7 @@ MAP_TREE2 = "MAP_TREE2" BLEND_POTION_NO_TIME = "BLEND_POTION_NO_TIME" BLEND_POTION_NO_INFO = "BLEND_POTION_NO_INFO" -APP_TITLE = "METIN2" +APP_TITLE = "Metin2" GUILD_HEADQUARTER = "Main Building" GUILD_FACILITY = "Facility" diff --git a/src/UserInterface/Locale.cpp b/src/UserInterface/Locale.cpp index b83d0b38..414f546b 100644 --- a/src/UserInterface/Locale.cpp +++ b/src/UserInterface/Locale.cpp @@ -18,12 +18,6 @@ const char* LSS_GLOBAL = "GLOBAL"; static bool IS_CHEONMA = false; -#ifndef LSS_SECURITY_KEY -#define LSS_SECURITY_KEY "testtesttesttest" -#endif - -std::string __SECURITY_KEY_STRING__ = LSS_SECURITY_KEY; - char MULTI_LOCALE_SERVICE[256] = "YMIR"; char MULTI_LOCALE_PATH[256] = "locale/ymir"; char MULTI_LOCALE_NAME[256] = "ymir"; @@ -165,11 +159,6 @@ int LocaleService_GetSkillPower(unsigned level) return INTERNATIONAL_SKILL_POWERS[level]; } -const char* LocaleService_GetSecurityKey() -{ - return __SECURITY_KEY_STRING__.c_str(); -} - // CHEONMA void LocaleService_SetCHEONMA(bool isEnable) { @@ -243,12 +232,6 @@ void LocaleService_ForceSetLocale(const char* name, const char* localePath) { strcpy(MULTI_LOCALE_NAME, name); strcpy(MULTI_LOCALE_PATH, localePath); - - // 기존 천마 서버로 접속시에는 security key 변경 (WE 버전 클라로 천마서버 접속하기 위함) - if (0 == stricmp(name, "ymir")) - __SECURITY_KEY_STRING__ = "testtesttesttest"; - if (0 == stricmp(name, "we_korea")) - __SECURITY_KEY_STRING__ = "1234abcd5678efgh"; } #if defined(LOCALE_SERVICE_GLOBAL) @@ -257,36 +240,35 @@ struct SLOCALEDATA const char* szServiceName; const char* szLocaleName; WORD wCodePage; - const char* szSecurityKey; } gs_stLocaleData[] = { - { LSS_YMIR, "ymir", 949, "testtesttesttest" }, // Korea - { LSS_EUROPE, "de", 1252, "1234abcd5678efgh" }, // GameForge (Germany) - { LSS_EUROPE, "en", 1252, "1234abcd5678efgh" }, // GameForge (United Kingdom) - { LSS_EUROPE, "us", 1252, "1234abcd5678efgh" }, // GameForge (USA) - { LSS_EUROPE, "es", 1252, "1234abcd5678efgh" }, // GameForge (Spain) - { LSS_EUROPE, "it", 1252, "1234abcd5678efgh" }, // GameForge (Italy) - { LSS_EUROPE, "fr", 1252, "1234abcd5678efgh" }, // GameForge (France) - { LSS_EUROPE, "pt", 1252, "1234abcd5678efgh" }, // GameForge (Portugal) - { LSS_EUROPE, "tr", 1253, "1234abcd5678efgh" }, // GameForge (Greece) - { LSS_EUROPE, "pl", 1250, "1234abcd5678efgh" }, // GameForge (Poland) - { LSS_EUROPE, "tr", 1254, "1234abcd5678efgh" }, // GameForge (Turkey) - { LSS_EUROPE, "dk", 1252, "1234abcd5678efgh" }, // GameForge (Demmark) - { LSS_EUROPE, "ae", 1256, "1234abcd5678efgh" }, // GameForge (United Arab Emirate) - { LSS_EUROPE, "mx", 1252, "1234abcd5678efgh" }, // GameForge (Mexico) - { LSS_EUROPE, "nl", 1252, "1234abcd5678efgh" }, // GameForge (Netherlands) - { LSS_EUROPE, "cz", 1252, "1234abcd5678efgh" }, // GameForge (Czech Republic) - { LSS_EUROPE, "ru", 1251, "1234abcd5678efgh" }, // GameForge (Russian Federation) - { LSS_EUROPE, "hu", 1250, "1234abcd5678efgh" }, // GameForge (Hungary) - { LSS_EUROPE, "ro", 1250, "1234abcd5678efgh" }, // GameForge (Romania) - { LSS_EUROPE, "ca", 1252, "testtesttesttest" }, // Z8Games (Canada) - { LSS_EUROPE, "sg", 1252, "testtesttesttest" }, // TEC (Singapore) - { LSS_JAPAN, "japan", 932, "testtesttesttest" }, // Japan - { LSS_EUROPE, "br", 1252, "testtesttesttest" }, // OnGame (Brazil) - { LSS_HONGKONG, "hongkong", 950, "testtesttesttest" }, // HongKong & Taiwan - { LSS_NEWCIBN, "newcibn", 936, "testtesttesttest" }, // CIBN (Free world) - { LSS_ENGLISH, "english", 949, "testtesttesttest" }, // English (Obsoleted) - { LSS_YMIR, "kr", 949, "testtesttesttest" }, // Korea (Obsoleted) - { NULL, NULL, 0, "testtesttesttest" } + { LSS_YMIR, "ymir", 949 }, // Korea + { LSS_EUROPE, "de", 1252 }, // GameForge (Germany) + { LSS_EUROPE, "en", 1252 }, // GameForge (United Kingdom) + { LSS_EUROPE, "us", 1252 }, // GameForge (USA) + { LSS_EUROPE, "es", 1252 }, // GameForge (Spain) + { LSS_EUROPE, "it", 1252 }, // GameForge (Italy) + { LSS_EUROPE, "fr", 1252 }, // GameForge (France) + { LSS_EUROPE, "pt", 1252 }, // GameForge (Portugal) + { LSS_EUROPE, "tr", 1253 }, // GameForge (Greece) + { LSS_EUROPE, "pl", 1250 }, // GameForge (Poland) + { LSS_EUROPE, "tr", 1254 }, // GameForge (Turkey) + { LSS_EUROPE, "dk", 1252 }, // GameForge (Demmark) + { LSS_EUROPE, "ae", 1256 }, // GameForge (United Arab Emirate) + { LSS_EUROPE, "mx", 1252 }, // GameForge (Mexico) + { LSS_EUROPE, "nl", 1252 }, // GameForge (Netherlands) + { LSS_EUROPE, "cz", 1252 }, // GameForge (Czech Republic) + { LSS_EUROPE, "ru", 1251 }, // GameForge (Russian Federation) + { LSS_EUROPE, "hu", 1250 }, // GameForge (Hungary) + { LSS_EUROPE, "ro", 1250 }, // GameForge (Romania) + { LSS_EUROPE, "ca", 1252 }, // Z8Games (Canada) + { LSS_EUROPE, "sg", 1252 }, // TEC (Singapore) + { LSS_JAPAN, "japan", 932 }, // Japan + { LSS_EUROPE, "br", 1252 }, // OnGame (Brazil) + { LSS_HONGKONG, "hongkong", 950 }, // HongKong & Taiwan + { LSS_NEWCIBN, "newcibn", 936 }, // CIBN (Free world) + { LSS_ENGLISH, "english", 949 }, // English (Obsoleted) + { LSS_YMIR, "kr", 949 }, // Korea (Obsoleted) + { NULL, NULL, 0 } }; const char* LocaleService_GetName() @@ -379,8 +361,6 @@ bool LocaleService_LoadGlobal(HINSTANCE hInstance) strcpy(MULTI_LOCALE_NAME, gs_stLocaleData[gs_iLocale].szLocaleName); sprintf(MULTI_LOCALE_PATH, "locale/%s", gs_stLocaleData[gs_iLocale].szLocaleName); MULTI_LOCALE_CODE = gs_stLocaleData[gs_iLocale].wCodePage; - if(gs_stLocaleData[gs_iLocale].szSecurityKey) - __SECURITY_KEY_STRING__ = gs_stLocaleData[gs_iLocale].szSecurityKey; return true; } #else diff --git a/src/UserInterface/Locale.h b/src/UserInterface/Locale.h index d1630429..63fa7b96 100644 --- a/src/UserInterface/Locale.h +++ b/src/UserInterface/Locale.h @@ -1,6 +1,12 @@ #pragma once -#include "Locale_inc.h" +#define LOCALE_SERVICE_EUROPE + +#define ENABLE_COSTUME_SYSTEM +#define ENABLE_ENERGY_SYSTEM +#define ENABLE_DRAGON_SOUL_SYSTEM +#define ENABLE_NEW_EQUIPMENT_SYSTEM + bool LocaleService_IsYMIR(); bool LocaleService_IsJAPAN(); @@ -9,13 +15,11 @@ bool LocaleService_IsHONGKONG(); bool LocaleService_IsTAIWAN(); bool LocaleService_IsNEWCIBN(); bool LocaleService_IsEUROPE(); -bool LocaleService_IsWorldEdition(); unsigned LocaleService_GetCodePage(); const char* LocaleService_GetName(); const char* LocaleService_GetLocaleName(); const char* LocaleService_GetLocalePath(); -const char* LocaleService_GetSecurityKey(); BOOL LocaleService_IsLeadByte( const char chByte ); int LocaleService_StringCompareCI( LPCSTR szStringLeft, LPCSTR szStringRight, size_t sizeLength ); diff --git a/src/UserInterface/Locale_inc.h b/src/UserInterface/Locale_inc.h deleted file mode 100644 index 50e71431..00000000 --- a/src/UserInterface/Locale_inc.h +++ /dev/null @@ -1,4 +0,0 @@ -#define LOCALE_SERVICE_SINGAPORE // 싱가폴 -#define ENABLE_COSTUME_SYSTEM -#define ENABLE_ENERGY_SYSTEM -#define ENABLE_NEW_EQUIPMENT_SYSTEM diff --git a/src/UserInterface/Locale_inc_BR.h b/src/UserInterface/Locale_inc_BR.h deleted file mode 100644 index 7ce2bf5c..00000000 --- a/src/UserInterface/Locale_inc_BR.h +++ /dev/null @@ -1,5 +0,0 @@ -#define LOCALE_SERVICE_BRAZIL // 브라질 - -#define ENABLE_COSTUME_SYSTEM -#define ENABLE_ENERGY_SYSTEM -#define ENABLE_DRAGON_SOUL_SYSTEM \ No newline at end of file diff --git a/src/UserInterface/Locale_inc_CA.h b/src/UserInterface/Locale_inc_CA.h deleted file mode 100644 index e60d4872..00000000 --- a/src/UserInterface/Locale_inc_CA.h +++ /dev/null @@ -1,4 +0,0 @@ -#define LOCALE_SERVICE_CANADA // 캐나다 - -#define ENABLE_COSTUME_SYSTEM -#define ENABLE_ENERGY_SYSTEM diff --git a/src/UserInterface/Locale_inc_EU.h b/src/UserInterface/Locale_inc_EU.h deleted file mode 100644 index 70c2583a..00000000 --- a/src/UserInterface/Locale_inc_EU.h +++ /dev/null @@ -1,3 +0,0 @@ -#define LOCALE_SERVICE_EUROPE // 유럽 - -#define LSS_SECURITY_KEY "1234abcd5678efgh" diff --git a/src/UserInterface/Locale_inc_EU2.h b/src/UserInterface/Locale_inc_EU2.h deleted file mode 100644 index 5add6e1b..00000000 --- a/src/UserInterface/Locale_inc_EU2.h +++ /dev/null @@ -1,11 +0,0 @@ -#define LOCALE_SERVICE_EUROPE // 유럽 - -#define LSS_SECURITY_KEY "1234abcd5678efgh" - -#define ENABLE_COSTUME_SYSTEM - -#define ENABLE_ENERGY_SYSTEM - -#define ENABLE_DRAGON_SOUL_SYSTEM -#define ENABLE_NEW_EQUIPMENT_SYSTEM - diff --git a/src/UserInterface/Locale_inc_GB.h b/src/UserInterface/Locale_inc_GB.h deleted file mode 100644 index 85745898..00000000 --- a/src/UserInterface/Locale_inc_GB.h +++ /dev/null @@ -1,3 +0,0 @@ -#define LOCALE_SERVICE_GLOBAL // GLOBAL version - -#define USE_RELATIVE_PATH diff --git a/src/UserInterface/Locale_inc_HK.h b/src/UserInterface/Locale_inc_HK.h deleted file mode 100644 index e1d64b0f..00000000 --- a/src/UserInterface/Locale_inc_HK.h +++ /dev/null @@ -1,2 +0,0 @@ -#define LOCALE_SERVICE_HONGKONG // 홍콩 - diff --git a/src/UserInterface/Locale_inc_JP.h b/src/UserInterface/Locale_inc_JP.h deleted file mode 100644 index bdc03217..00000000 --- a/src/UserInterface/Locale_inc_JP.h +++ /dev/null @@ -1,8 +0,0 @@ -#define LOCALE_SERVICE_WE_JAPAN // World Edition(유럽 버젼) 버젼의 일본 -#define LOCALE_SERVICE_EUROPE // 유럽 - -#define LSS_SECURITY_KEY "1234abcd5678efgh" - -#define ENABLE_COSTUME_SYSTEM -#define ENABLE_ENERGY_SYSTEM -#define USE_OPENID diff --git a/src/UserInterface/Locale_inc_KO.h b/src/UserInterface/Locale_inc_KO.h deleted file mode 100644 index ca7ecee8..00000000 --- a/src/UserInterface/Locale_inc_KO.h +++ /dev/null @@ -1,6 +0,0 @@ -#include "Locale_inc_EU.h" - -#define ENABLE_COSTUME_SYSTEM -#define ENABLE_ENERGY_SYSTEM -#define ENABLE_DRAGON_SOUL_SYSTEM -#define ENABLE_NEW_EQUIPMENT_SYSTEM diff --git a/src/UserInterface/Locale_inc_KO_DEV.h b/src/UserInterface/Locale_inc_KO_DEV.h deleted file mode 100644 index 28fcbc82..00000000 --- a/src/UserInterface/Locale_inc_KO_DEV.h +++ /dev/null @@ -1,5 +0,0 @@ -#define LOCALE_SERVICE_YMIR // Korean - -#define LOCALE_SERVICE_STAGE_DEVELOPMENT - -#define USE_RELATIVE_PATH diff --git a/src/UserInterface/Locale_inc_NEWCIBN.h b/src/UserInterface/Locale_inc_NEWCIBN.h deleted file mode 100644 index 4c20a68e..00000000 --- a/src/UserInterface/Locale_inc_NEWCIBN.h +++ /dev/null @@ -1,6 +0,0 @@ -#define LOCALE_SERVICE_NEWCIBN // 중국 자유세계 - -#define ENABLE_COSTUME_SYSTEM -#define ENABLE_ENERGY_SYSTEM -#define ENABLE_DRAGON_SOUL_SYSTEM -#define ENABLE_NEW_EQUIPMENT_SYSTEM \ No newline at end of file diff --git a/src/UserInterface/Locale_inc_SG.h b/src/UserInterface/Locale_inc_SG.h deleted file mode 100644 index 0d59ed9c..00000000 --- a/src/UserInterface/Locale_inc_SG.h +++ /dev/null @@ -1,3 +0,0 @@ -#define LOCALE_SERVICE_SINGAPORE // 싱가폴 -#define ENABLE_COSTUME_SYSTEM -#define ENABLE_ENERGY_SYSTEM diff --git a/src/UserInterface/Locale_inc_VI.h b/src/UserInterface/Locale_inc_VI.h deleted file mode 100644 index 00489384..00000000 --- a/src/UserInterface/Locale_inc_VI.h +++ /dev/null @@ -1 +0,0 @@ -#define LOCALE_SERVICE_VIETNAM // 베트남 diff --git a/src/UserInterface/Locale_inc_dev.h b/src/UserInterface/Locale_inc_dev.h deleted file mode 100644 index ad2f9612..00000000 --- a/src/UserInterface/Locale_inc_dev.h +++ /dev/null @@ -1,6 +0,0 @@ -#include "Locale_inc_EU.h" - -#define ENABLE_COSTUME_SYSTEM -#define ENABLE_ENERGY_SYSTEM -#define ENABLE_DRAGON_SOUL_SYSTEM -#define ENABLE_NEW_EQUIPMENT_SYSTEM \ No newline at end of file diff --git a/src/UserInterface/PythonNetworkStreamPhaseLogin.cpp b/src/UserInterface/PythonNetworkStreamPhaseLogin.cpp index 7c383d27..d951be11 100644 --- a/src/UserInterface/PythonNetworkStreamPhaseLogin.cpp +++ b/src/UserInterface/PythonNetworkStreamPhaseLogin.cpp @@ -89,8 +89,6 @@ void CPythonNetworkStream::LoginPhase() void CPythonNetworkStream::SetLoginPhase() { - const char* key = LocaleService_GetSecurityKey(); - if ("Login" != m_strPhase) m_phaseLeaveFunc.Run(); diff --git a/src/UserInterface/UserInterface.rc b/src/UserInterface/UserInterface.rc index ef9adfef..f966125d 100644 --- a/src/UserInterface/UserInterface.rc +++ b/src/UserInterface/UserInterface.rc @@ -1,7 +1,6 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -14,61 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// 일본어 resources +// English (United States) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) -#ifdef _WIN32 -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(932) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDS_POSSESSIVE_MORPHENE "'s" -END - -#endif // 일본어 resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// 중국어(중국) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) -#ifdef _WIN32 -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDS_POSSESSIVE_MORPHENE "'s" - IDS_WARN_BAD_DRIVER "句寡퀭콘뫘劤鞫엥혜땡。" - IDS_WARN_NO_TNL "퀭돨鞫엥꼇連넣3D TnL 袒숭속醵\n踏狗쉥轟랬攣끽頓契。" -END - -#endif // 중국어(중국) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// 한국어 resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR) -#ifdef _WIN32 -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -#pragma code_page(949) -#endif //_WIN32 +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -117,19 +66,20 @@ END // Cursor // -IDC_CURSOR_NORMAL CURSOR "Cursors\\cursor.cur" -IDC_CURSOR_CHAIR CURSOR "Cursors\\cursor_chair.cur" -IDC_CURSOR_DOOR CURSOR "Cursors\\cursor_door.cur" -IDC_CURSOR_NO CURSOR "Cursors\\cursor_no.cur" -IDC_CURSOR_PICK CURSOR "Cursors\\cursor_pick.cur" -IDC_CURSOR_TALK CURSOR "Cursors\\cursor_talk.cur" -IDC_CURSOR_ATTACK CURSOR "Cursors\\cursor_attack.cur" -IDC_CURSOR_BUY CURSOR "cursors\\cursor_buy.cur" -IDC_CURSOR_SELL CURSOR "cursors\\cursor_sell.cur" +IDC_CURSOR_NORMAL CURSOR "Cursors\\cursor.cur" +IDC_CURSOR_CHAIR CURSOR "Cursors\\cursor_chair.cur" +IDC_CURSOR_DOOR CURSOR "Cursors\\cursor_door.cur" +IDC_CURSOR_NO CURSOR "Cursors\\cursor_no.cur" +IDC_CURSOR_PICK CURSOR "Cursors\\cursor_pick.cur" +IDC_CURSOR_TALK CURSOR "Cursors\\cursor_talk.cur" +IDC_CURSOR_ATTACK CURSOR "Cursors\\cursor_attack.cur" +IDC_CURSOR_BUY CURSOR "Cursors\\cursor_buy.cur" +IDC_CURSOR_SELL CURSOR "Cursors\\cursor_sell.cur" IDC_CURSOR_CAMERA_ROTATE CURSOR "Cursors\\cursor_camera_rotate.cur" -IDC_CURSOR_HSIZE CURSOR "Cursors\\cursor_hsize.cur" -IDC_CURSOR_VSIZE CURSOR "Cursors\\cursor_vsize.cur" -IDC_CURSOR_HVSIZE CURSOR "Cursors\\cursor_hvsize.cur" +IDC_CURSOR_HSIZE CURSOR "Cursors\\cursor_hsize.cur" +IDC_CURSOR_VSIZE CURSOR "Cursors\\cursor_vsize.cur" +IDC_CURSOR_HVSIZE CURSOR "Cursors\\cursor_hvsize.cur" + ///////////////////////////////////////////////////////////////////////////// // @@ -137,7 +87,7 @@ IDC_CURSOR_HVSIZE CURSOR "Cursors\\cursor_hvsize.cur" // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_SELECT_LOCALE, DIALOG BEGIN @@ -157,14 +107,15 @@ END // remains consistent on all systems. IDI_METIN2 ICON "metin2.ico" + ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO - FILEVERSION VER_FILE_VERSION - PRODUCTVERSION 1,0,0,1 + FILEVERSION 0,2,0,0 + PRODUCTVERSION 0,2,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -179,14 +130,14 @@ BEGIN BEGIN BLOCK "080003b5" BEGIN - VALUE "CompanyName", "Ymir Entertainment" - VALUE "FileDescription", "Metin2Client" - VALUE "FileVersion", VER_FILE_VERSION_STR "\0" + VALUE "CompanyName", "The Old Metin2 Project" + VALUE "FileDescription", "The Metin2 Client" + VALUE "FileVersion", "0.2.0.0" VALUE "InternalName", "Metin2Client" - VALUE "LegalCopyright", "Copyright (C) 2011" - VALUE "OriginalFilename", "Metin2Client.exe" + VALUE "LegalCopyright", "Copyright (C) 2024" + VALUE "OriginalFilename", "Metin2.exe" VALUE "ProductName", "Metin2Client" - VALUE "ProductVersion", "1, 0, 0, 1" + VALUE "ProductVersion", "0.2.0.0" END END BLOCK "VarFileInfo" @@ -201,36 +152,7 @@ END // String Table // -STRINGTABLE -BEGIN - IDS_APP_NAME "메틴2" - IDS_POSSESSIVE_MORPHENE "의" - IDS_WARN_BAD_DRIVER "그래픽 드라이버를 업데이트 하시기 바랍니다." - IDS_WARN_NO_TNL "사용하고 계신 시스템의 그래픽카드는 3D TnL 하드웨어 가속이 지원되지 않아\n게임이 느리게 실행되거나 제대로 실행되지 않을수 있습니다." - IDS_ERR_CANNOT_READ_FILE "%s 파일을 읽을 수 없습니다." - IDS_ERR_NOT_LATEST_FILE "'%s' 파일은 최신버전이 아닙니다. 런처를 다시 실행해주세요." - IDS_ERR_MUST_LAUNCH_FROM_PATCHER "클라이언트는 패처를 사용해서 실행되어야 합니다." -END - -#endif // 한국어 resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// 영어(미국) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE +STRINGTABLE BEGIN IDS_APP_NAME "Metin 2" IDS_POSSESSIVE_MORPHENE "'s" @@ -241,7 +163,7 @@ BEGIN IDS_ERR_MUST_LAUNCH_FROM_PATCHER "Please run patcher." END -#endif // 영어(미국) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// @@ -255,3 +177,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/src/UserInterface/UserInterface.vcxproj b/src/UserInterface/UserInterface.vcxproj index 801e36e9..84318307 100644 --- a/src/UserInterface/UserInterface.vcxproj +++ b/src/UserInterface/UserInterface.vcxproj @@ -143,7 +143,7 @@ NDEBUG;%(PreprocessorDefinitions) - 0x0412 + 0x0409 NotSet @@ -196,7 +196,7 @@ _DEBUG;%(PreprocessorDefinitions) - 0x0412 + 0x0409 NotSet @@ -241,7 +241,7 @@ NDEBUG;%(PreprocessorDefinitions) - 0x0412 + 0x0409 NotSet @@ -292,7 +292,7 @@ NDEBUG;%(PreprocessorDefinitions) - 0x0412 + 0x0409 NotSet @@ -422,20 +422,6 @@ - - - - - - - - - - - - - - diff --git a/src/UserInterface/UserInterface.vcxproj.filters b/src/UserInterface/UserInterface.vcxproj.filters index f28ff602..1976b3b1 100644 --- a/src/UserInterface/UserInterface.vcxproj.filters +++ b/src/UserInterface/UserInterface.vcxproj.filters @@ -406,48 +406,6 @@ Locale - - Locale - - - Locale - - - Locale - - - Locale - - - Locale - - - Locale - - - Locale - - - Locale - - - Locale - - - Locale - - - Locale - - - Locale - - - Locale - - - Locale - Network diff --git a/src/UserInterface/metin2.ico b/src/UserInterface/metin2.ico index 0c02a0a6863097c52a46ba8fcb14221d98ba5232..1097646e81e39e5dbf71f9da359ffd697c9b4aa7 100644 GIT binary patch literal 7406 zcmeHL&2Hn!5pI&2SRg&5RBLvVqYPz6qJ~y;8WK!x_NI9WpLdTr<_&BhK+buCxdwg- zJJ`d%z@B$}%XNG`3h}iN z;`DS=?hEk~>IQ?h{D(I}{8eg%% zdTbl@*Npwrh^Ap*pbwkZU(m+(*J$T@^nbznuz$_=Z5_&E*c$_Pc?~;wzPiF#uB|P$ zci_Vu9QMHe9>7a?AR(ebW-?30{F?cod_(mxFSBd_ivFEmRv({lsNQI1(0ftG_k&SM zr+|;gN29Gu5CpzfSwywAJ#?;MQFLYtfsgOpa1^vE zqv3Gkk4O=X^{(F<)2r>gGCT~!A>)VELI@45NbV|R^VK}(4ty*mTn)uA06fC?6f_C^ z8l!kri1d85%77pGMniD`g;8D_om;%XD0tZ0F%0qzKCI0=US+v~PZVWwHjoBxVmvkF zG0|o#m~g)OW|c=G9O^8NV~srme7q7e)FdN#G*Y?jX?)|EOb)9nI37k?r*Z6|gNSl3 zGBoauDdN%Bih8|n2qa;31*=(3UK|&39)*l2?Rl~cd3Hw_fw$UtWGIb24~vMNfC!7Z z5$v$BwU{67pp;(MfsvW~#fCCj-|SU;uH<+8{+ zyvkueRlvuXGanmfnuSR zf;q=+r-v14WgKU==(fO96+>s-KW|y&_gDlF)(d*7T_ci+i?hzB_& z%~jhD7_Mug`KJ&rt|E8$D8kO|&!~sI`ff*}{pu6SYcSKe6!^_JRu>M8p81m50Ldnmj>hkNRN?2akqc|7o84*u`=zzfI0f3+&I^xD^2 z7+r(TYkT$Uj_F5-d|b!)&W5`i|LOKZvT5gNU{uOezN$$}dmmbk77&7!K;-2hiuSKs zxF*>EBnZw)=Jw*!nvD>wf&4H;{EHv1R=T8ZOpDurMsvU*gj_Z%8U|W*fN1^(PEKlK zS10uVHyjuXG=gP*5|Mthio`JceQ%B?GhYo1t}nh{%J!?D>)tnL$mU)#hlmGe9G7S( z<+V`x@-*?T6%f3tO&6b<%s?fJE4OxSr+XOD6WROs*D&S-Y$|nYpavxvJHZC zQt22Wycp3G@p~D29PSyf@>-ylRq9rS!Kgl{usSnSMBnkU!nMgxQ5zIPKM3jtxlS(1 z#n)$ui&}LdG=gBqjW~j&v&uoQBY$&kYz;`Ka$-cdhy z&vo^kBnJ_r)yKR#vuRh~$;d^F$pxNQM3;7vyGEANod8l!pLJm5>@kEaiF49>G?2d( z)0MBjQG14-7ut9M{|`9o9)x2V!Af(7=UWl|fH37xh-6%BRcJFK+7U-r2x~gN#q-@h zA0aNf1UL6EWBIp`+d;$X&%5#yu|GLDY%PMJ|P}_nUH(l&6ST4@T|eeneXMv zk*D6~$C1l^%#mLLyUB&$Ko5C#&d+n6oMRx)opX+ybLN~+=iE5w!)-47Gjx%Y=e)Vi zhp*e5Ifj5T+Muz`mm@dMIdsm~bNhi0b8y%L|JfeE3-)VBO+0Th#RtTKUDurizv-iF zi%3kk&ZOVx#`L|Q^k^`M1$hA~-k-$kV{r7o-&YQ2LZ&ByIyve0Kfasvymx(k;otSo zg0TPgtDJM{#IczJl!d7N<1x- E0s4VfY5)KL literal 7406 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