Add support for the taiwanese client, fixes #5

Author: lateleite

src/UnCSO2.vcxproj

@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B12702AD-ABFB-343A-A199-8E24837244A3}</ProjectGuid>
     <Keyword>Qt4VSv1.0</Keyword>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <ProjectName>UnCSO2</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -62,6 +62,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <PrecompiledHeader>Create</PrecompiledHeader>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -97,6 +98,7 @@ cmd /c "$(SolutionDir)git-version-gen.cmd"</Command>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PrecompiledHeader>Create</PrecompiledHeader>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

src/pkgfilesystem.cpp

@@ -7,9 +7,11 @@
 
 static const std::string s_szTiancityPackageFileKey = "\x9B\x65\xC7\x9B\xC7\xDF\x8E\x7E\xD4\xC6\x59\x52\x5C\xF7\x22\xFF\xF4\xE8\xFF\xE7\xB5\xC2\x77";
 static const std::string s_szNexonPackageFileKey = "\x6C\x6B\x67\x75\x69\x37\x38\x31\x6B\x6C\x37\x38\x39\x73\x64\x21\x40\x23\x25\x38\x39\x26\x5E\x73\x64";
+static const std::string s_szBeanfunPackageFileKey = "\x86\x39\x53\xBD\x16\x11\x6D\x06\x2A\x84\xF3\x4E\xE0\x4A\xA3";
 
 static const std::string s_szTiancityPackageEntryKey = "\x8E\x5C\xB8\x92\x45\xD1\x90\xBA\x82\x0F\xD9\x7A\x99\x8E\xB3\x87\xF7";
 static const std::string s_szNexonPackageEntryKey = "\x5E\x39\x67\x45\x72\x67\x32\x53\x78\x37\x62\x6E\x6B\x37\x40\x23\x73\x64\x66\x6A\x6E\x68\x40";
+static const std::string s_szBeanfunPackageEntryKey = "\x1F\x9F\xF8\xF4\x18\xAC\x25\xA2\xBB\x37\x82\x6D\xA8\xAE\xA7\x28\xBA\xDD\xDD\xE4\x6B";
 
 GameDataProvider g_GameDataProvider = GameDataProvider::GAMEDATAPROVIDER_NONE;
 
@@ -21,6 +23,8 @@ static const std::string& GetPackageFileKey()
 			return s_szNexonPackageFileKey;
 		case GAMEDATAPROVIDER_TIANCITY:
 			return s_szTiancityPackageFileKey;
+		case GAMEDATAPROVIDER_BEANFUN:
+			return s_szBeanfunPackageFileKey;
 		default:
 			throw std::exception("Unknown game data provider!\n");
 	}
@@ -34,6 +38,8 @@ static const std::string& GetPackageEntryKey()
 			return s_szNexonPackageEntryKey;
 		case GAMEDATAPROVIDER_TIANCITY:
 			return s_szTiancityPackageEntryKey;
+		case GAMEDATAPROVIDER_BEANFUN:
+			return s_szBeanfunPackageEntryKey;
 		default:
 			throw std::exception("Unknown game data provider!\n");
 	}

src/pkgfilesystem.h

@@ -79,7 +79,8 @@ enum GameDataProvider
 {
 	GAMEDATAPROVIDER_NONE = -1,
 	GAMEDATAPROVIDER_NEXON = 0, // south korean version
-	GAMEDATAPROVIDER_TIANCITY // chinese version
+	GAMEDATAPROVIDER_TIANCITY, // chinese version
+	GAMEDATAPROVIDER_BEANFUN // taiwanese version
 };
 
 extern GameDataProvider g_GameDataProvider;
@@ -88,9 +89,12 @@ inline void DetectGameDataProvider( const uint8_t* pFileBuffer )
 {			 
 	std::string szPkgBuffer = reinterpret_cast<const char*>(pFileBuffer);
 	bool bFoundTiancityDll = szPkgBuffer.find( "sedata.dll" ) != std::string::npos;
+	bool bIsBeancity = szPkgBuffer.find( "be607ef651369efec2dbf8ee4eb18c23.pkg" ) != std::string::npos;
 
 	if (bFoundTiancityDll)
 		g_GameDataProvider = GAMEDATAPROVIDER_TIANCITY;
+	else if (bIsBeancity)
+		g_GameDataProvider = GAMEDATAPROVIDER_BEANFUN;
 	else
 		g_GameDataProvider = GAMEDATAPROVIDER_NEXON;
 }
@@ -103,6 +107,8 @@ inline const wchar_t* GetGameDataProviderStr()
 			return L"Nexon (South Korea)";
 		case GAMEDATAPROVIDER_TIANCITY:
 			return L"Tiancity (China)";
+		case GAMEDATAPROVIDER_BEANFUN:
+			return L"Beanfun (Taiwan)";
 		default:
 			return L"unknown";
 	}

src/stdafx.h

@@ -3,18 +3,24 @@
 #define DBG_PRINTF(message, ...) printf( "%s: " message, __func__, ##__VA_ARGS__ )
 #define DBG_WPRINTF(message, ...) wprintf( L"%S: " message, __func__, ##__VA_ARGS__  );
 
-#include <Windows.h>
+#include <stdint.h>
 
 #include <assert.h>
-#include <intrin.h>	
+#include <intrin.h>	  
+#include <stdio.h>	 
+
+#include <filesystem>
 #include <sstream>
-#include <stdint.h>
-#include <stdio.h>	  
+
+#include <array>
 #include <string>
 #include <vector>
-#include "vc17_filesystem.h"
 
 #include "version.h"
 
+#ifdef _WIN32
+#include <Windows.h>
+#endif
+
 extern std::filesystem::path g_PkgDataPath;
 extern std::filesystem::path g_OutPath;