Add defines [W.I.P] (diasurgical#160)

wml · Aug 16, 2018 · fa64b21 · fa64b21
1 parent a08be06
commit fa64b21
Show file tree

Hide file tree

Showing 43 changed files with 396 additions and 385 deletions.
diff --git a/DiabloUI/diabloui.cpp b/DiabloUI/diabloui.cpp
@@ -8,6 +8,11 @@
 #include <process.h>
 #include <shlobj.h>
 
+#ifdef _MSC_VER
+#pragma warning (disable : 4018) // signed/unsigned mismatch
+#endif
+
+#include "..\defs.h"
 #include "..\structs.h"
 #include "diabloui.h"
 

diff --git a/Source/dead.cpp b/Source/dead.cpp
@@ -3,7 +3,7 @@
 #include "../types.h"
 
 int spurtndx; // weak
-DeadStruct dead[31];
+DeadStruct dead[MAXDEAD];
 int stonendx;
 
 void __cdecl InitDead()
@@ -21,7 +21,7 @@ void __cdecl InitDead()
 	CMonster *v10; // ecx
 	char *v11; // edi
 	int *v12; // ebx
-	int mtypes[200]; // [esp+Ch] [ebp-330h]
+	int mtypes[MAXMONSTERS]; // [esp+Ch] [ebp-330h]
 	int *v14; // [esp+32Ch] [ebp-10h]
 	int *v15; // [esp+330h] [ebp-Ch]
 	int v16; // [esp+334h] [ebp-8h]

diff --git a/Source/dead.h b/Source/dead.h
@@ -3,7 +3,7 @@
 #define __DEAD_H__
 
 extern int spurtndx; // weak
-extern DeadStruct dead[31];
+extern DeadStruct dead[MAXDEAD];
 extern int stonendx;
 
 void __cdecl InitDead();

diff --git a/Source/debug.cpp b/Source/debug.cpp
@@ -3,8 +3,8 @@
 #include "../types.h"
 
 void *pSquareCel;
-char dMonsDbg[17][112][112];
-char dFlagDbg[17][112][112];
+char dMonsDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
+char dFlagDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
 
 void __cdecl LoadDebugGFX()
 {
@@ -27,9 +27,9 @@ void __cdecl CheckDungeonClear()
 	int i;
 	int j;
 
-	for(i = 0; i < 112; i++)
+	for(i = 0; i < MAXDUNX; i++)
 	{
-		for(j = 0; j < 112; j++)
+		for(j = 0; j < MAXDUNY; j++)
 		{
 			if ( dMonster[i][j] )
 				TermMsg("Monsters not cleared");
@@ -178,7 +178,7 @@ void __cdecl PrintDebugQuest()
 
 	sprintf(dstr, "Quest %i :  Active = %i, Var1 = %i", dbgqst, quests[dbgqst]._qactive, quests[dbgqst]._qvar1);
 	NetSendCmdString(1 << myplr, dstr);
-	if ( ++dbgqst == 16 )
+	if ( ++dbgqst == MAXQUESTS )
 		dbgqst = 0;
 }
 
@@ -236,7 +236,7 @@ void __cdecl NextDebugMonster()
 {
 	char dstr[128]; // [esp+0h] [ebp-80h]
 
-	if ( dbgmon++ == 200 )
+	if ( dbgmon++ == MAXMONSTERS )
 		dbgmon = 0;
 
 	sprintf(dstr, "Current debug monster = %i", dbgmon);

diff --git a/Source/debug.h b/Source/debug.h
@@ -3,8 +3,8 @@
 #define __DEBUG_H__
 
 extern void *pSquareCel;
-extern char dMonsDbg[17][112][112];
-extern char dFlagDbg[17][112][112];
+extern char dMonsDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
+extern char dFlagDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
 
 void __cdecl LoadDebugGFX();
 void __cdecl FreeDebugGFX();

diff --git a/Source/diablo.cpp b/Source/diablo.cpp
@@ -4,19 +4,19 @@
 
 int diablo_cpp_init_value; // weak
 HWND ghMainWnd;
-int glMid1Seed[17];
-int glMid2Seed[17];
-int gnLevelTypeTbl[17];
+int glMid1Seed[NUMLEVELS];
+int glMid2Seed[NUMLEVELS];
+int gnLevelTypeTbl[NUMLEVELS];
 int MouseY; // idb
 int MouseX; // idb
 bool gbGameLoopStartup; // idb
-int glSeedTbl[17];
+int glSeedTbl[NUMLEVELS];
 int gbRunGame; // weak
-int glMid3Seed[17];
+int glMid3Seed[NUMLEVELS];
 int gbRunGameResult; // weak
 int zoomflag; // weak
 int gbProcessPlayers; // weak
-int glEndSeed[17];
+int glEndSeed[NUMLEVELS];
 int dword_5256E8; // weak
 HINSTANCE ghInst; // idb
 int DebugMonsters[10];
@@ -261,7 +261,7 @@ void __cdecl free_game()
 	FreeQuestText();
 	FreeStoreMem();
 
-	for(i = 0; i < 4; i++)
+	for(i = 0; i < MAX_PLRS; i++)
 		FreePlayerGFX(i);
 
 	FreeItemGFX();
@@ -1982,7 +1982,7 @@ void __fastcall LoadGameLevel(bool firstflag, int lvldir)
 			GetPortalLvlPos();
 		IncProgress();
 
-		for(i = 0; i < 4; i++)
+		for(i = 0; i < MAX_PLRS; i++)
 		{
 			if ( plr[i].plractive )
 			{
@@ -2080,7 +2080,7 @@ void __fastcall LoadGameLevel(bool firstflag, int lvldir)
 	if ( lvldir == 5 )
 		GetPortalLvlPos();
 
-	for(i = 0; i < 4; i++)
+	for(i = 0; i < MAX_PLRS; i++)
 	{
 		if ( plr[i].plractive )
 		{
@@ -2110,7 +2110,7 @@ void __fastcall LoadGameLevel(bool firstflag, int lvldir)
 LABEL_72:
 	SyncPortals();
 
-	for(i = 0; i < 4; i++)
+	for(i = 0; i < MAX_PLRS; i++)
 	{
 		if ( plr[i].plractive && plr[i].plrlevel == currlevel && (!plr[i]._pLvlChanging || i == myplr) )
 		{

diff --git a/Source/diablo.h b/Source/diablo.h
@@ -4,19 +4,19 @@
 
 extern int diablo_cpp_init_value; // weak
 extern HWND ghMainWnd;
-extern int glMid1Seed[17];
-extern int glMid2Seed[17];
-extern int gnLevelTypeTbl[17];
+extern int glMid1Seed[NUMLEVELS];
+extern int glMid2Seed[NUMLEVELS];
+extern int gnLevelTypeTbl[NUMLEVELS];
 extern int MouseY; // idb
 extern int MouseX; // idb
 extern bool gbGameLoopStartup; // idb
-extern int glSeedTbl[17];
+extern int glSeedTbl[NUMLEVELS];
 extern int gbRunGame; // weak
-extern int glMid3Seed[17];
+extern int glMid3Seed[NUMLEVELS];
 extern int gbRunGameResult; // weak
 extern int zoomflag; // weak
 extern int gbProcessPlayers; // weak
-extern int glEndSeed[17];
+extern int glEndSeed[NUMLEVELS];
 extern int dword_5256E8; // weak
 extern HINSTANCE ghInst; // idb
 extern int DebugMonsters[10];

diff --git a/Source/effects.cpp b/Source/effects.cpp
@@ -13,7 +13,7 @@ char monster_action_sounds[] = { 'a', 'h', 'd', 's' }; // idb
 
 /* rdata */
 
-TSFX sgSFX[858] =
+TSFX sgSFX[NUM_SFX] =
 {
   { 2u, "Sfx\\Misc\\Walk1.wav", NULL },
   { 2u, "Sfx\\Misc\\Walk2.wav", NULL },
@@ -1256,7 +1256,7 @@ void __cdecl sound_stop()
 {
 	int i; // edi
 
-	for(i = 0; i < 858; i++)
+	for(i = 0; i < NUM_SFX; i++)
 	{
 		if ( sgSFX[i].pSnd )
 			snd_stop_snd(sgSFX[i].pSnd);
@@ -1308,7 +1308,7 @@ void __cdecl effects_cleanup_sfx()
 		}
 		++v0;
 	}
-	while ( v0 < 858 );
+	while ( v0 < NUM_SFX );
 }
 
 void __cdecl stream_update()
@@ -1377,7 +1377,7 @@ void __fastcall priv_sound_init(int bLoadMask)
 			}
 			++v3;
 		}
-		while ( v3 < 858 );
+		while ( v3 < NUM_SFX );
 	}
 }
 
@@ -1401,7 +1401,7 @@ void __stdcall effects_play_sound(char *snd_file)
 		{
 			++v2;
 			++v1;
-			if ( v2 >= 858 )
+			if ( v2 >= NUM_SFX )
 				return;
 		}
 		v3 = &sgSFX[v1].pSnd;

diff --git a/Source/effects.h b/Source/effects.h
@@ -36,6 +36,6 @@ extern char monster_action_sounds[]; // idb
 
 /* rdata */
 
-extern TSFX sgSFX[858];
+extern TSFX sgSFX[NUM_SFX];
 
 #endif /* __EFFECTS_H__ */
diff --git a/Source/gendung.cpp b/Source/gendung.cpp
@@ -6,28 +6,28 @@ short level_frame_types[2048];
 int themeCount;
 char nTransTable[2049];
 //int dword_52D204;
-int dMonster[112][112];
+int dMonster[MAXDUNX][MAXDUNY];
 char dungeon[40][40];
-char dObject[112][112];
+char dObject[MAXDUNX][MAXDUNY];
 void *pSpeedCels;
 int nlevel_frames; // weak
 char pdungeon[40][40];
-char dDead[112][112];
-short dpiece_defs_map_1[16][112][112];
-char dTransVal2[112][112];
+char dDead[MAXDUNX][MAXDUNY];
+short dpiece_defs_map_1[16][MAXDUNX][MAXDUNY];
+char dTransVal2[MAXDUNX][MAXDUNY];
 char TransVal; // weak
 int dword_5A5594;
 char dflags[40][40];
-int dPiece[112][112];
-char dTransVal[112][112];
+int dPiece[MAXDUNX][MAXDUNY];
+char dTransVal[MAXDUNX][MAXDUNY];
 int setloadflag_2; // weak
 Tile tile_defs[1024];
 void *pMegaTiles;
 void *pLevelPieces;
 int gnDifficulty; // idb
 char block_lvid[2049];
 //char byte_5B78EB;
-char dung_map[112][112];
+char dung_map[MAXDUNX][MAXDUNY];
 char nTrapTable[2049];
 char leveltype; // weak
 unsigned char currlevel; // idb
@@ -37,17 +37,17 @@ int level_frame_count[2049];
 ScrollStruct ScrollInfo;
 void *pDungeonCels;
 int speed_cel_frame_num_from_light_index_frame_num[16][128];
-THEME_LOC themeLoc[50];
-char dPlayer[112][112];
+THEME_LOC themeLoc[MAXTHEMES];
+char dPlayer[MAXDUNX][MAXDUNY];
 int dword_5C2FF8; // weak
 int dword_5C2FFC; // weak
 int scr_pix_width; // weak
 int scr_pix_height; // weak
-char dArch[112][112];
+char dArch[MAXDUNX][MAXDUNY];
 char nBlockTable[2049];
 void *level_special_cel;
-char dFlags[112][112];
-char dItem[112][112];
+char dFlags[MAXDUNX][MAXDUNY];
+char dItem[MAXDUNX][MAXDUNY];
 char setlvlnum; // weak
 int level_frame_sizes[2048];
 char nMissileTable[2049];
@@ -64,10 +64,10 @@ int setpc_x; // idb
 int ViewX; // idb
 int ViewY; // idb
 int setpc_y; // idb
-char dMissile[112][112];
+char dMissile[MAXDUNX][MAXDUNY];
 int dminx; // weak
 int dminy; // weak
-short dpiece_defs_map_2[16][112][112];
+short dpiece_defs_map_2[16][MAXDUNX][MAXDUNY];
 
 void __cdecl FillSolidBlockTbls()
 {

diff --git a/Source/gendung.h b/Source/gendung.h
@@ -6,28 +6,28 @@ extern short level_frame_types[2048];
 extern int themeCount;
 extern char nTransTable[2049];
 //int dword_52D204;
-extern int dMonster[112][112];
+extern int dMonster[MAXDUNX][MAXDUNY];
 extern char dungeon[40][40];
-extern char dObject[112][112];
+extern char dObject[MAXDUNX][MAXDUNY];
 extern void *pSpeedCels;
 extern int nlevel_frames; // weak
 extern char pdungeon[40][40];
-extern char dDead[112][112];
-extern short dpiece_defs_map_1[16][112][112];
-extern char dTransVal2[112][112];
+extern char dDead[MAXDUNX][MAXDUNY];
+extern short dpiece_defs_map_1[16][MAXDUNX][MAXDUNY];
+extern char dTransVal2[MAXDUNX][MAXDUNY];
 extern char TransVal; // weak
 extern int dword_5A5594;
 extern char dflags[40][40];
-extern int dPiece[112][112];
-extern char dTransVal[112][112];
+extern int dPiece[MAXDUNX][MAXDUNY];
+extern char dTransVal[MAXDUNX][MAXDUNY];
 extern int setloadflag_2; // weak
 extern Tile tile_defs[1024];
 extern void *pMegaTiles;
 extern void *pLevelPieces;
 extern int gnDifficulty; // idb
 extern char block_lvid[2049];
 //char byte_5B78EB;
-extern char dung_map[112][112];
+extern char dung_map[MAXDUNX][MAXDUNY];
 extern char nTrapTable[2049];
 extern char leveltype; // weak
 extern unsigned char currlevel; // idb
@@ -37,17 +37,17 @@ extern int level_frame_count[2049];
 extern ScrollStruct ScrollInfo;
 extern void *pDungeonCels;
 extern int speed_cel_frame_num_from_light_index_frame_num[16][128];
-extern THEME_LOC themeLoc[50];
-extern char dPlayer[112][112];
+extern THEME_LOC themeLoc[MAXTHEMES];
+extern char dPlayer[MAXDUNX][MAXDUNY];
 extern int dword_5C2FF8; // weak
 extern int dword_5C2FFC; // weak
 extern int scr_pix_width; // weak
 extern int scr_pix_height; // weak
-extern char dArch[112][112];
+extern char dArch[MAXDUNX][MAXDUNY];
 extern char nBlockTable[2049];
 extern void *level_special_cel;
-extern char dFlags[112][112];
-extern char dItem[112][112];
+extern char dFlags[MAXDUNX][MAXDUNY];
+extern char dItem[MAXDUNX][MAXDUNY];
 extern char setlvlnum; // weak
 extern int level_frame_sizes[2048];
 extern char nMissileTable[2049];
@@ -64,10 +64,10 @@ extern int setpc_x; // idb
 extern int ViewX; // idb
 extern int ViewY; // idb
 extern int setpc_y; // idb
-extern char dMissile[112][112];
+extern char dMissile[MAXDUNX][MAXDUNY];
 extern int dminx; // weak
 extern int dminy; // weak
-extern short dpiece_defs_map_2[16][112][112];
+extern short dpiece_defs_map_2[16][MAXDUNX][MAXDUNY];
 
 void __cdecl FillSolidBlockTbls();
 void __cdecl gendung_418D91();