Removed unused locale information, refactored where needed. Enabled DS system.

This commit is contained in:
Exynox 2024-03-10 10:37:36 +02:00
parent e1cf8cde92
commit c9aa9a0b03
22 changed files with 70 additions and 288 deletions

View File

@ -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"

View File

@ -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

View File

@ -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 );

View File

@ -1,4 +0,0 @@
#define LOCALE_SERVICE_SINGAPORE // 教啊弃
#define ENABLE_COSTUME_SYSTEM
#define ENABLE_ENERGY_SYSTEM
#define ENABLE_NEW_EQUIPMENT_SYSTEM

View File

@ -1,5 +0,0 @@
#define LOCALE_SERVICE_BRAZIL // 브라질
#define ENABLE_COSTUME_SYSTEM
#define ENABLE_ENERGY_SYSTEM
#define ENABLE_DRAGON_SOUL_SYSTEM

View File

@ -1,4 +0,0 @@
#define LOCALE_SERVICE_CANADA // 캐나다
#define ENABLE_COSTUME_SYSTEM
#define ENABLE_ENERGY_SYSTEM

View File

@ -1,3 +0,0 @@
#define LOCALE_SERVICE_EUROPE // 유럽
#define LSS_SECURITY_KEY "1234abcd5678efgh"

View File

@ -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

View File

@ -1,3 +0,0 @@
#define LOCALE_SERVICE_GLOBAL // GLOBAL version
#define USE_RELATIVE_PATH

View File

@ -1,2 +0,0 @@
#define LOCALE_SERVICE_HONGKONG // 全尼

View File

@ -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

View File

@ -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

View File

@ -1,5 +0,0 @@
#define LOCALE_SERVICE_YMIR // Korean
#define LOCALE_SERVICE_STAGE_DEVELOPMENT
#define USE_RELATIVE_PATH

View File

@ -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

View File

@ -1,3 +0,0 @@
#define LOCALE_SERVICE_SINGAPORE // 教啊弃
#define ENABLE_COSTUME_SYSTEM
#define ENABLE_ENERGY_SYSTEM

View File

@ -1 +0,0 @@
#define LOCALE_SERVICE_VIETNAM // 베트남

View File

@ -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

View File

@ -89,8 +89,6 @@ void CPythonNetworkStream::LoginPhase()
void CPythonNetworkStream::SetLoginPhase()
{
const char* key = LocaleService_GetSecurityKey();
if ("Login" != m_strPhase)
m_phaseLeaveFunc.Run();

View File

@ -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)
/////////////////////////////////////////////////////////////////////////////
//
@ -124,13 +73,14 @@ 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_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"
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
@ -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"
@ -196,35 +147,6 @@ BEGIN
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
@ -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

View File

@ -143,7 +143,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0412</Culture>
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<ShowProgress>NotSet</ShowProgress>
@ -196,7 +196,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0412</Culture>
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<ShowProgress>NotSet</ShowProgress>
@ -241,7 +241,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0412</Culture>
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<ShowProgress>NotSet</ShowProgress>
@ -292,7 +292,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0412</Culture>
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<ShowProgress>NotSet</ShowProgress>
@ -422,20 +422,6 @@
<ClInclude Include="InstanceBase.h" />
<ClInclude Include="InsultChecker.h" />
<ClInclude Include="Locale.h" />
<ClInclude Include="Locale_inc.h" />
<ClInclude Include="Locale_inc_BR.h" />
<ClInclude Include="Locale_inc_CA.h" />
<ClInclude Include="Locale_inc_dev.h" />
<ClInclude Include="Locale_inc_EU.h" />
<ClInclude Include="Locale_inc_EU2.h" />
<ClInclude Include="Locale_inc_GB.h" />
<ClInclude Include="Locale_inc_HK.h" />
<ClInclude Include="Locale_inc_JP.h" />
<ClInclude Include="Locale_inc_KO.h" />
<ClInclude Include="Locale_inc_KO_DEV.h" />
<ClInclude Include="Locale_inc_NEWCIBN.h" />
<ClInclude Include="Locale_inc_SG.h" />
<ClInclude Include="Locale_inc_VI.h" />
<ClInclude Include="MarkImage.h" />
<ClInclude Include="MarkManager.h" />
<ClInclude Include="MovieMan.h" />

View File

@ -406,48 +406,6 @@
<ClInclude Include="Locale.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_BR.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_CA.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_dev.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_EU.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_EU2.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_GB.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_HK.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_JP.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_KO.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_KO_DEV.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_NEWCIBN.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_SG.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="Locale_inc_VI.h">
<Filter>Locale</Filter>
</ClInclude>
<ClInclude Include="AccountConnector.h">
<Filter>Network</Filter>
</ClInclude>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB