From 9fad4ec948a0e8cc19b8642858562055b6655d9c Mon Sep 17 00:00:00 2001 From: Skull Merlin <86374920+skkuull@users.noreply.github.com> Date: Sat, 19 Feb 2022 15:23:47 +0200 Subject: [PATCH] Remove store config --- .../game/demonware/services/bdStorage.cpp | 1 - src/client/game/symbols.hpp | 2 +- src/client/resource.hpp | 19 +++++++------------ src/client/resource.rc | 1 - .../resources/dw/winStoreConfig_tu22.csv | 10 ---------- 5 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 src/client/resources/dw/winStoreConfig_tu22.csv diff --git a/src/client/game/demonware/services/bdStorage.cpp b/src/client/game/demonware/services/bdStorage.cpp index 1534bffd..5bd1382d 100644 --- a/src/client/game/demonware/services/bdStorage.cpp +++ b/src/client/game/demonware/services/bdStorage.cpp @@ -20,7 +20,6 @@ namespace demonware this->map_publisher_resource("motd-.*\\.txt", DW_MOTD); this->map_publisher_resource("ffotd-.*\\.ff", DW_FASTFILE); this->map_publisher_resource("playlists(_.+)?\\.aggr", DW_PLAYLISTS); - this->map_publisher_resource("winStoreConfig_[Tt][Uu][0-9]+\\.csv", DW_STORE_CONFIG); } void bdStorage::map_publisher_resource(const std::string& expression, const INT id) diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp index f4855222..e8f91b5e 100644 --- a/src/client/game/symbols.hpp +++ b/src/client/game/symbols.hpp @@ -197,7 +197,7 @@ namespace game WEAK symbol g_assetNames{ 0, 0x140BEF280 }; - WEAK symbol g_poolSize{ 0, 0x140BF2E40 }; + WEAK symbol g_poolSize{ 0, 0x140FEADF0 }; // H1(1.4) WEAK symbol gfxDrawMethod{ 0,0x14EDF9E00 }; diff --git a/src/client/resource.hpp b/src/client/resource.hpp index c2ce9b6a..f80f9b48 100644 --- a/src/client/resource.hpp +++ b/src/client/resource.hpp @@ -5,18 +5,13 @@ #define IMAGE_SPLASH 300 #define IMAGE_LOGO 301 -#define DW_ENTITLEMENT_CONFIG 302 -#define DW_SOCIAL_CONFIG 303 -#define DW_MM_CONFIG 304 -#define DW_LOOT_CONFIG 305 -#define DW_STORE_CONFIG 306 -#define DW_MOTD 307 -#define DW_FASTFILE 308 -#define DW_PLAYLISTS 309 +#define DW_MOTD 302 +#define DW_FASTFILE 303 +#define DW_PLAYLISTS 304 -#define MENU_MAIN 310 +#define MENU_MAIN 305 -#define TLS_DLL 311 -#define RUNNER 312 +#define TLS_DLL 306 +#define RUNNER 307 -#define ICON_IMAGE 313 +#define ICON_IMAGE 308 diff --git a/src/client/resource.rc b/src/client/resource.rc index f794d347..6866f241 100644 --- a/src/client/resource.rc +++ b/src/client/resource.rc @@ -98,7 +98,6 @@ ID_ICON ICON "resources/icon.ico" IMAGE_SPLASH BITMAP "resources/splash.bmp" IMAGE_LOGO BITMAP "resources/logo.bmp" -DW_STORE_CONFIG RCDATA "resources/dw/winStoreConfig_tu22.csv" DW_FASTFILE RCDATA "resources/dw/ffotd-1.15.1.ff" DW_MOTD RCDATA "resources/dw/motd-english.txt" DW_PLAYLISTS RCDATA "resources/dw/playlists_tu12.aggr" diff --git a/src/client/resources/dw/winStoreConfig_tu22.csv b/src/client/resources/dw/winStoreConfig_tu22.csv deleted file mode 100644 index 4ccc8e11..00000000 --- a/src/client/resources/dw/winStoreConfig_tu22.csv +++ /dev/null @@ -1,10 +0,0 @@ -version,version_id,5,,,,,,,,,,, -product,product_1,134217732,store_codpoints_200,consumable,CODPOINTS,all,0,,,DEPOT_200_COD_POINTS,DEPOT_200_COD_POINTS_DESC_SHORT,DEPOT_200_COD_POINTS_DESC_LONG, -product,product_2,134217736,store_codpoints_1100,consumable,CODPOINTS,all,0,,,DEPOT_1100_COD_POINTS,DEPOT_1100_COD_POINTS_DESC_SHORT,DEPOT_1100_COD_POINTS_DESC_LONG, -product,product_3,134217740,store_codpoints_2400,consumable,CODPOINTS,all,0,,,DEPOT_2400_COD_POINTS,DEPOT_2400_COD_POINTS_DESC_SHORT,DEPOT_2400_COD_POINTS_DESC_LONG, -product,product_4,134217744,store_codpoints_5000,consumable,CODPOINTS,all,0,,,DEPOT_5000_COD_POINTS,DEPOT_5000_COD_POINTS_DESC_SHORT,DEPOT_5000_COD_POINTS_DESC_LONG, -product,product_5,134217748,store_codpoints_9500,consumable,CODPOINTS,all,0,,,DEPOT_9500_COD_POINTS,DEPOT_9500_COD_POINTS_DESC_SHORT,DEPOT_9500_COD_POINTS_DESC_LONG, -product,product_6,134217752,store_codpoints_13000,consumable,CODPOINTS,all,0,,,DEPOT_13000_COD_POINTS,DEPOT_13000_COD_POINTS_DESC_SHORT,DEPOT_13000_COD_POINTS_DESC_LONG, -product,product_7,594970,store_mappack1,mappack1,MAPPACKS,all,0,,,DEPOT_MAP_PACK_1,DEPOT_MAP_PACK_1_DESC_SHORT,DEPOT_MAP_PACK_1_DESC_LONG, -category,category_1,1,CODPOINTS,DEPOT_COD_POINTS,all,0,,,,,,, -category,category_2,2,MAPPACKS,DEPOT_STORE_MAP_PACKS,all,0,,,,,,,