Stats display refactor using ini file done.

2025-10-13 16:34:22 -05:00 · 2024-05-02 21:43:43 -06:00
parent f8349e6ba1
commit 7fd617abd7
176 changed files with 1731 additions and 1866 deletions
--- a/vendor/D2Template/D2Template.h
+++ b/vendor/D2Template/D2Template.h
@@ -60,51 +60,50 @@ extern DWORD DLLBASE_SGD2FREERES;

 struct DLLBaseStrc
 {
-    char* szName;
-    DWORD dwAddress;
+	char* szName;
+	DWORD dwAddress;
 };

 struct DLLPatchStrc
 {
-    int nDLL;
-    DWORD dwAddress;
-    DWORD dwData;
-    BOOL bRelative;
-    size_t nPatchSize;
+	int nDLL;
+	DWORD dwAddress;
+	DWORD dwData;
+	BOOL bRelative;
+	size_t nPatchSize;
 };

 enum D2TEMPLATE_DLL_FILES
 {
-    D2DLL_BINKW32,
-    D2DLL_BNCLIENT,
-    D2DLL_D2CLIENT,
-    D2DLL_D2CMP,
-    D2DLL_D2COMMON,
-    D2DLL_D2DDRAW,
-    D2DLL_D2DIRECT3D,
-    D2DLL_D2GAME,
-    D2DLL_D2GDI,
-    D2DLL_D2GFX,
-    D2DLL_D2GLIDE,
-    D2DLL_D2LANG,
-    D2DLL_D2LAUNCH,
-    D2DLL_D2MCPCLIENT,
-    D2DLL_D2MULTI,
-    D2DLL_D2NET,
-    D2DLL_D2SOUND,
-    D2DLL_D2WIN,
-    D2DLL_FOG,
-    D2DLL_IJL11,
-    D2DLL_SMACKW32,
-    D2DLL_STORM,
+	D2DLL_BINKW32,
+	D2DLL_BNCLIENT,
+	D2DLL_D2CLIENT,
+	D2DLL_D2CMP,
+	D2DLL_D2COMMON,
+	D2DLL_D2DDRAW,
+	D2DLL_D2DIRECT3D,
+	D2DLL_D2GAME,
+	D2DLL_D2GDI,
+	D2DLL_D2GFX,
+	D2DLL_D2GLIDE,
+	D2DLL_D2LANG,
+	D2DLL_D2LAUNCH,
+	D2DLL_D2MCPCLIENT,
+	D2DLL_D2MULTI,
+	D2DLL_D2NET,
+	D2DLL_D2SOUND,
+	D2DLL_D2WIN,
+	D2DLL_FOG,
+	D2DLL_IJL11,
+	D2DLL_SMACKW32,
+	D2DLL_STORM,
 	D2DLL_UTILITY,
 	D2DLL_PLUGY,
 	D2DLL_D2EXPRES,
 	D2DLL_SGD2FREERES,
-    D2DLL_INVALID
+	D2DLL_INVALID
 };

-
 static DLLBaseStrc gptDllFiles[] =
 {
 	{"Binkw32.dll",         NULL},
--- a/vendor/D2Template/D2TemplateConstants.h
+++ b/vendor/D2Template/D2TemplateConstants.h
@@ -745,8 +745,8 @@
 //	LNG_POR,// Portuguese
 //	LNG_ITA,// Italian
 //	LNG_JPN,// Japanese
-//	LNG_KOR,// Korean 
-//	LNG_SIN,// 
+//	LNG_KOR,// Korean
+//	LNG_SIN,//
 //	LNG_CHI,// Chinese
 //	LNG_POL,// Polish
 //	LNG_RUS,// Russian
@@ -1138,7 +1138,7 @@
 //	DEXTERITY,
 //	VITALITY,
 //	ENERGY,
-//	MAXMANA, 
+//	MAXMANA,
 //	MAXMANA_PERCENT,
 //	MAXHP,
 //	MAXHP_PERCENT,
--- a/vendor/D2Template/D2TemplateDataTables.h
+++ b/vendor/D2Template/D2TemplateDataTables.h
@@ -48,7 +48,7 @@ struct D2MonstatsTXT;

 struct D2MonstatsTXT
 {
-    //...
+	//...
 };

 // end of file --------------------------------------------------------------
--- a/vendor/D2Template/D2TemplatePacketDef.h
+++ b/vendor/D2Template/D2TemplatePacketDef.h
@@ -21,7 +21,7 @@ struct D2GSPacketSrv03;

 struct D2GSPacketClt01
 {
-    //...
+	//...
 };

 // end of file --------------------------------------------------------------
--- a/vendor/D2Template/D2TemplatePtrs.h
+++ b/vendor/D2Template/D2TemplatePtrs.h
@@ -20,7 +20,7 @@

 #define D2FUNC(DLL, NAME, RETURN, CONV, ARGS, OFFSET) typedef RETURN (CONV##* DLL##_##NAME##_t) ARGS; static DLL##_##NAME##_t DLL##_##NAME = (OFFSET < 0) ? ((DLL##_##NAME##_t)GetProcAddress((HMODULE)DLLBASE_##DLL, (LPCSTR)-(OFFSET))) : (DLL##_##NAME##_t)(DLLBASE_##DLL + OFFSET);        ///
 #define D2VAR(DLL, NAME, TYPE, OFFSET) typedef TYPE DLL##_##NAME##_vt; static DLL##_##NAME##_vt * DLL##_##NAME = (DLL##_##NAME##_vt *)(DLLBASE_##DLL + OFFSET);                                 ///
-#define D2PTR(DLL, NAME, OFFSET) static DWORD NAME = (DLLBASE_##DLL + OFFSET); 
+#define D2PTR(DLL, NAME, OFFSET) static DWORD NAME = (DLLBASE_##DLL + OFFSET);

 extern DWORD __fastcall GetDllOffset(char* ModuleName, DWORD BaseAddress, int Offset);                                                                                                                                          ///
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -149,9 +149,9 @@ extern DWORD __fastcall GetDllOffset(char* ModuleName, DWORD BaseAddress, int Of
 //extern s_shifting shifting;
 //
 ////#ifdef MSVC
-//#define FASTCALL __fastcall 
+//#define FASTCALL __fastcall
 ////#else
-////#define FASTCALL __msfastcall 
+////#define FASTCALL __msfastcall
 ////#endif
 //#define STDCALL		__stdcall
 //#define FCT_ASM(N) __declspec(naked) void N() {__asm{
@@ -216,7 +216,7 @@ extern DWORD __fastcall GetDllOffset(char* ModuleName, DWORD BaseAddress, int Of
 ////6FAECD28 | 53                   | push ebx                                                                                       | ebx == 0
 ////6FAECD29 | 53                   | push ebx                                                                                       | ebx == 0
 ////6FAECD2A | BA 18000000          | mov edx, 18                                                                                    |
-////6FAECD2F | B1 4F                | mov cl, 4F                                                                                     | 
+////6FAECD2F | B1 4F                | mov cl, 4F                                                                                     |
 ////6FAECD31 | 891D 505BBB6F        | mov dword ptr ds:[6FBB5B50], ebx                                                               | ebx == 0
 ////6FAECD37 | E8 A40CFCFF          | call d2client.6FAAD9E0                                                                         |
 //D2FUNC(D2CLIENT, SendToServer7, void, __fastcall, (BYTE type, DWORD num, DWORD unk1, DWORD unk2), 0xD9E0)
@@ -296,7 +296,7 @@ extern DWORD __fastcall GetDllOffset(char* ModuleName, DWORD BaseAddress, int Of
 //// 6FACBAF0 | A1 E419BB6F | mov eax, dword ptr ds:[D2Client.6FBB19E4] //  1.10
 //
 ////020D90	6F620D90	10010	DRLG_GetLevelDefsRecord	int nLevelNo
-////Unique	fastcall	(int nLevelNo)	__fastcall DRLG_GetLevelDefsRecord(int nLevelNo)		
+////Unique	fastcall	(int nLevelNo)	__fastcall DRLG_GetLevelDefsRecord(int nLevelNo)
 ////6F620D90	DRLG_GetLevelDefsRecord	6F620D90	__fastcall DRLG_GetLevelDefsRecord(int nLevelNo)
 //
 ////6FAC5884 $+0x25884 | E8 C3910900          | call <JMP.&D2Common#10010>  // 1.09	InitAutomapLayer
@@ -326,7 +326,7 @@ extern DWORD __fastcall GetDllOffset(char* ModuleName, DWORD BaseAddress, int Of
 //#define D2FUNCPTR(DLL,NAME,t1,t2,OFFSET) typedef t1 DLL##_##NAME##_t t2; DLL##_##NAME##_t *DLL##_##NAME = (DLL##_##NAME##_t *)GetDllOffset(#DLL, DLLBASE_##DLL, OFFSET);
 //#define D2VARPTR(DLL,NAME,t1,OFFSET)     typedef t1 DLL##_##NAME##_t;    DLL##_##NAME##_t *p_##DLL##_##NAME = (DLL##_##NAME##_t *)GetDllOffset(#DLL, DLLBASE_##DLL, OFFSET);
 ////#define D2ASMPTR(d1,v1,o1)        DWORD d1##_##v1 = DLLOFFSET(d1,o1);
-////#define D2PTR(DLL, NAME, OFFSET) DWORD NAME __attribute__((weak)) = GetDllOffset(#DLL, DLLBASE_##DLL, OFFSET); 
+////#define D2PTR(DLL, NAME, OFFSET) DWORD NAME __attribute__((weak)) = GetDllOffset(#DLL, DLLBASE_##DLL, OFFSET);
 ////D2VAR(D2CLIENT, pDrlgAct, DrlgAct *, 0x6FBB0BE4)
 ////D2VAR(D2CLIENT, pPlayerUnit, UnitAny *, 0x6FBC63F8)
 ////
--- a/vendor/D2Template/D2TemplateStructs.h
+++ b/vendor/D2Template/D2TemplateStructs.h
@@ -1337,7 +1337,7 @@
 //	DWORD dwMainIndex;				//0x18
 //	DWORD dwSubIndex;				//0x1C
 //	DWORD dwFrame;					//0x20
-//	BYTE  _1a;						//0x24 DT1's unknown_a ... 
+//	BYTE  _1a;						//0x24 DT1's unknown_a ...
 //	BYTE  _1c;						//0x25
 //	BYTE  _1b;						//0x26
 //	BYTE  _1d;						//0x27
@@ -1347,7 +1347,7 @@
 //	DWORD _18;						//0x44
 //	DWORD dwDataPtr;				//0x48 pointer to sub-block headers
 //	DWORD dwSize;					//0x4C length of the sub-blocks
-//	DWORD dwSubBlocks;				//0x50 
+//	DWORD dwSubBlocks;				//0x50
 //	DT1SubBlock* pBlocks;			//0x54
 //	char* szTileName;				//0x58
 //	DWORD **ptBlock;				//0x5C <not sure - maybe its a struct>
@@ -3209,7 +3209,7 @@
 //	//	UnitAny *pTargetUnit; //+58
 //	//} *pPos; // +2c
 //	DWORD _2b[11];
-//	StatsList * ptStatsList;         // 0x5C 
+//	StatsList * ptStatsList;         // 0x5C
 //	UnitInventory *pInventory; //+60
 //	DWORD _4b[12];
 //	DWORD nOwnerType; // +94
@@ -3382,17 +3382,17 @@
 //	char szAccountName[0x30];
 //	char szCharName[0x18];
 //	char szRealmName[0x18];
-//	BYTE _2[0x102];//+E8 
-//	//BYTE nGameMode; //+1EA 
+//	BYTE _2[0x102];//+E8
+//	//BYTE nGameMode; //+1EA
 //	struct
 //	{
 //		BYTE nCharStat:2;
 //		BYTE nHardcore:2;
 //		BYTE _unk1:1;
 //		BYTE nExpansion:1;
-//		BYTE nLadder:2;	
-//	};//+1EA 
-//	BYTE nReadyAct; //+1EB  quest info 
+//		BYTE nLadder:2;
+//	};//+1EA
+//	BYTE nReadyAct; //+1EB  quest info
 //	BYTE _3[0x3B];
 //	char szServerVersion[24];//227  battle net gameversion
 //	char szGamePassword[0x18];//+23F
@@ -3453,16 +3453,16 @@
 //
 //
 //
-////struct Stats { 
-////	WORD  Param; 
-////	WORD  StatID; 
-////	DWORD Value; 
-////}; 
+////struct Stats {
+////	WORD  Param;
+////	WORD  StatID;
+////	DWORD Value;
+////};
 //
 //struct StatsInfo {
-//	Stats *pStats; // pointer to an array of Stats structs. 
-//	WORD   nUsed;  // how many Stats in array 
-//	WORD   nSize;  // size allocated in Stats 
+//	Stats *pStats; // pointer to an array of Stats structs.
+//	WORD   nUsed;  // how many Stats in array
+//	WORD   nSize;  // size allocated in Stats
 //};
 //
 //struct StatsList {
@@ -3474,11 +3474,11 @@
 //	DWORD _4;				// 0x38
 //	StatsList *pNext;		// 0x3C
 //
-//	StatsList *pSetList;     // +40 
+//	StatsList *pSetList;     // +40
 //	DWORD _5;
-//	StatsInfo sStats1;       // +48 
-//	StatsInfo sStats2;       // +50 unused ??? 
-//	DWORD *ptStateFlags;  //+58 - get with 10487(ptUnit,id) return ptUnit->ptStatsList->ptStateFlags[id/32]&(1<<(id%31)) 
+//	StatsInfo sStats1;       // +48
+//	StatsInfo sStats2;       // +50 unused ???
+//	DWORD *ptStateFlags;  //+58 - get with 10487(ptUnit,id) return ptUnit->ptStatsList->ptStateFlags[id/32]&(1<<(id%31))
 //};
 //
 //// end of file --------------------------------------------------------------
@@ -3761,7 +3761,7 @@
 ////	uint8_t		uk4[0x08];				//+54
 ////	stats* stats;				//+5C
 ////	uint8_t		pad1[0x24];
-////	inventory* inventory;		 //+84  //+60  
+////	inventory* inventory;		 //+84  //+60
 ////	uint8_t		uk5[0x1C];				//+64
 ////	game* game;					//+80
 ////	uint8_t		uk6[0x24];				//+84
@@ -3892,9 +3892,9 @@
 ////ITEMFLAG_FROMPLAYER               = 0x01000000,
 ////ITEMFLAG_RUNEuint16_t               = 0x04000000
 ////*/
-////	uint32_t	guid1;						//+1C Global Unique ID 1  
-////	uint32_t	guid2;						//+20 Global Unique ID 2  
-////	uint32_t	guid3;						//+24 Global Unique ID 3  
+////	uint32_t	guid1;						//+1C Global Unique ID 1
+////	uint32_t	guid2;						//+20 Global Unique ID 2
+////	uint32_t	guid3;						//+24 Global Unique ID 3
 ////	uint32_t	unique_id;					//+28
 ////	uint8_t	ilvl;						//+2C
 ////	uint8_t	uk1[0x03];					//+2D
@@ -3931,7 +3931,7 @@
 ////	uint8_t	item_data3;					//+47 //D2Common10854 D2Common10853
 ////	uint8_t	p_ear_level;					//+48
 ////	uint8_t	var_gfx;						//+49
-////	char	i_name[0x12];				//+4A //inscribed/ear name  
+////	char	i_name[0x12];				//+4A //inscribed/ear name
 ////	inventory* inventory;			//+5C
 ////	unit* pt_prev_item;					//+60
 ////	unit* pt_next_item;					//+64
@@ -3973,18 +3973,18 @@
 //};
 //
 //struct player_data {
-//	char		name[0x10];				//+00	Player Name  
-//	void* pt_quest[3];				//+10	Quest Pointers for each difficulty  
+//	char		name[0x10];				//+00	Player Name
+//	void* pt_quest[3];				//+10	Quest Pointers for each difficulty
 //	uint8_t		uk1[0x18];				//+1C		//before : 0x14
-//	void* pt_arena_unit;			//+34	ptArena for the Unit  
+//	void* pt_arena_unit;			//+34	ptArena for the Unit
 //	uint8_t		uk2[0x4];				//+38		//before : 0x7
-//	uint16_t		mp_source_portal_unique_id;	//+3C	Source Portal Unique_ID  
+//	uint16_t		mp_source_portal_unique_id;	//+3C	Source Portal Unique_ID
 //	uint8_t		uk3[0x2];				//+3E
-//	uint16_t		mp_dest_portal_unique_id;	//+40	Destination Portal Unique_ID  
-//	uint8_t		uk4[0x06];				//+42  
-//	uint8_t		pt_object_un_id;			//+48	Object UniqueID for TownPortals       
-//	uint8_t		uk5[0x94B];//uk5[0x53];				//+49  
-//	net_client* net_client;			//+9C	ptClient  
+//	uint16_t		mp_dest_portal_unique_id;	//+40	Destination Portal Unique_ID
+//	uint8_t		uk4[0x06];				//+42
+//	uint8_t		pt_object_un_id;			//+48	Object UniqueID for TownPortals
+//	uint8_t		uk5[0x94B];//uk5[0x53];				//+49
+//	net_client* net_client;			//+9C	ptClient
 //};
 //
 //struct position {