pdir is uninitialized fix

.clang-format

@@ -1,10 +1,11 @@
 {
-    BasedOnStyle: webkit,
-    AlignTrailingComments: true,
-    AllowShortBlocksOnASingleLine: true,
-    AllowShortFunctionsOnASingleLine: None,
-    PointerAlignment: Right,
-    AlignConsecutiveAssignments: true,
+	BasedOnStyle: webkit,
+	AlignTrailingComments: true,
+	AllowShortBlocksOnASingleLine: true,
+	AllowShortFunctionsOnASingleLine: None,
+	PointerAlignment: Right,
+	AlignConsecutiveAssignments: true,
 	TabWidth: 4,
 	UseTab: ForIndentation,
+	SortIncludes: false,
 }

Source/.clang-format

@@ -6,4 +6,5 @@
 	PointerAlignment: Right,
 	TabWidth: 4,
 	UseTab: ForIndentation,
+	SortIncludes: false,
 }

Source/automap.cpp

@@ -8,7 +8,7 @@ static int MapX;
 static int MapY;
 BOOL automapflag;
 char AmShiftTab[32]; // [31]?
-unsigned char automapview[DMAXX][DMAXY];
+BOOLEAN automapview[DMAXX][DMAXY];
 int AutoMapScale;
 int AutoMapXOfs;
 int AutoMapYOfs;
@@ -72,19 +72,19 @@ void InitAutomap()
 
 	switch (leveltype) {
 	case DTYPE_CATHEDRAL:
-		pAFile = LoadFileInMem("Levels\\L1Data\\L1.AMP", (int *)&dwTiles);
+		pAFile = LoadFileInMem("Levels\\L1Data\\L1.AMP", &dwTiles);
 		dwTiles >>= 1;
 		break;
 	case DTYPE_CATACOMBS:
-		pAFile = LoadFileInMem("Levels\\L2Data\\L2.AMP", (int *)&dwTiles);
+		pAFile = LoadFileInMem("Levels\\L2Data\\L2.AMP", &dwTiles);
 		dwTiles >>= 1;
 		break;
 	case DTYPE_CAVES:
-		pAFile = LoadFileInMem("Levels\\L3Data\\L3.AMP", (int *)&dwTiles);
+		pAFile = LoadFileInMem("Levels\\L3Data\\L3.AMP", &dwTiles);
 		dwTiles >>= 1;
 		break;
 	case DTYPE_HELL:
-		pAFile = LoadFileInMem("Levels\\L4Data\\L4.AMP", (int *)&dwTiles);
+		pAFile = LoadFileInMem("Levels\\L4Data\\L4.AMP", &dwTiles);
 		dwTiles >>= 1;
 		break;
 	default:

Source/automap.h

@@ -5,7 +5,7 @@
 extern WORD automaptype[512];
 extern BOOL automapflag;
 extern char AmShiftTab[32];
-extern unsigned char automapview[DMAXX][DMAXY];
+extern BOOLEAN automapview[DMAXX][DMAXY];
 extern int AutoMapScale;
 extern int AutoMapXOfs;
 extern int AutoMapYOfs;

Source/codec.h

@@ -5,6 +5,6 @@
 int codec_decode(BYTE *pbSrcDst, DWORD size, char *pszPassword);
 void codec_init_key(int unused, char *pszPassword);
 DWORD codec_get_encoded_len(DWORD dwSrcBytes);
-void codec_encode(BYTE* pbSrcDst, DWORD size, int size_64, char *pszPassword);
+void codec_encode(BYTE *pbSrcDst, DWORD size, int size_64, char *pszPassword);
 
 #endif /* __CODEC_H__ */

Source/control.cpp

@@ -1124,24 +1124,24 @@ void InitControlPan()
 	memset(pManaBuff, 0, 88 * 88);
 	pLifeBuff = DiabloAllocPtr(88 * 88);
 	memset(pLifeBuff, 0, 88 * 88);
-	pPanelText = LoadFileInMem("CtrlPan\\SmalText.CEL", 0);
-	pChrPanel = LoadFileInMem("Data\\Char.CEL", 0);
-	pSpellCels = LoadFileInMem("CtrlPan\\SpelIcon.CEL", 0);
+	pPanelText = LoadFileInMem("CtrlPan\\SmalText.CEL", NULL);
+	pChrPanel = LoadFileInMem("Data\\Char.CEL", NULL);
+	pSpellCels = LoadFileInMem("CtrlPan\\SpelIcon.CEL", NULL);
 	SetSpellTrans(RSPLTYPE_SKILL);
-	pStatusPanel = LoadFileInMem("CtrlPan\\Panel8.CEL", 0);
+	pStatusPanel = LoadFileInMem("CtrlPan\\Panel8.CEL", NULL);
 	CelDecodeRect(pBtmBuff, 0, 143, 640, pStatusPanel, 1, 640);
 	MemFreeDbg(pStatusPanel);
-	pStatusPanel = LoadFileInMem("CtrlPan\\P8Bulbs.CEL", 0);
+	pStatusPanel = LoadFileInMem("CtrlPan\\P8Bulbs.CEL", NULL);
 	CelDecodeRect(pLifeBuff, 0, 87, 88, pStatusPanel, 1, 88);
 	CelDecodeRect(pManaBuff, 0, 87, 88, pStatusPanel, 2, 88);
 	MemFreeDbg(pStatusPanel);
 	talkflag = 0;
 	if (gbMaxPlayers != 1) {
-		pTalkPanel = LoadFileInMem("CtrlPan\\TalkPanl.CEL", 0);
+		pTalkPanel = LoadFileInMem("CtrlPan\\TalkPanl.CEL", NULL);
 		CelDecodeRect(pBtmBuff, 0, 287, 640, pTalkPanel, 1, 640);
 		MemFreeDbg(pTalkPanel);
-		pMultiBtns = LoadFileInMem("CtrlPan\\P8But2.CEL", 0);
-		pTalkBtns = LoadFileInMem("CtrlPan\\TalkButt.CEL", 0);
+		pMultiBtns = LoadFileInMem("CtrlPan\\P8But2.CEL", NULL);
+		pTalkBtns = LoadFileInMem("CtrlPan\\TalkButt.CEL", NULL);
 		sgbPlrTalkTbl = 0;
 		sgszTalkMsg[0] = 0;
 		for (i = 0; i < MAX_PLRS; i++)
@@ -1151,28 +1151,28 @@ void InitControlPan()
 	}
 	panelflag = 0;
 	lvlbtndown = 0;
-	pPanelButtons = LoadFileInMem("CtrlPan\\Panel8bu.CEL", 0);
+	pPanelButtons = LoadFileInMem("CtrlPan\\Panel8bu.CEL", NULL);
 	for (i = 0; i < sizeof(panbtn) / sizeof(panbtn[0]); i++)
 		panbtn[i] = 0;
 	panbtndown = 0;
 	if (gbMaxPlayers == 1)
 		numpanbtns = 6;
 	else
 		numpanbtns = 8;
-	pChrButtons = LoadFileInMem("Data\\CharBut.CEL", 0);
+	pChrButtons = LoadFileInMem("Data\\CharBut.CEL", NULL);
 	for (i = 0; i < sizeof(chrbtn) / sizeof(chrbtn[0]); i++)
 		chrbtn[i] = 0;
 	chrbtnactive = FALSE;
-	pDurIcons = LoadFileInMem("Items\\DurIcons.CEL", 0);
+	pDurIcons = LoadFileInMem("Items\\DurIcons.CEL", NULL);
 	strcpy(infostr, "");
 	ClearPanel();
 	drawhpflag = TRUE;
 	drawmanaflag = TRUE;
 	chrflag = 0;
 	spselflag = 0;
-	pSpellBkCel = LoadFileInMem("Data\\SpellBk.CEL", 0);
-	pSBkBtnCel = LoadFileInMem("Data\\SpellBkB.CEL", 0);
-	pSBkIconCels = LoadFileInMem("Data\\SpellI2.CEL", 0);
+	pSpellBkCel = LoadFileInMem("Data\\SpellBk.CEL", NULL);
+	pSBkBtnCel = LoadFileInMem("Data\\SpellBkB.CEL", NULL);
+	pSBkIconCels = LoadFileInMem("Data\\SpellI2.CEL", NULL);
 	sbooktab = 0;
 	sbookflag = 0;
 	if (plr[myplr]._pClass == PC_WARRIOR) {
@@ -1182,8 +1182,8 @@ void InitControlPan()
 	} else if (plr[myplr]._pClass == PC_SORCERER) {
 		SpellPages[0][0] = SPL_RECHARGE;
 	}
-	pQLogCel = LoadFileInMem("Data\\Quest.CEL", 0);
-	pGBoxBuff = LoadFileInMem("CtrlPan\\Golddrop.cel", 0);
+	pQLogCel = LoadFileInMem("Data\\Quest.CEL", NULL);
+	pGBoxBuff = LoadFileInMem("CtrlPan\\Golddrop.cel", NULL);
 	dropGoldFlag = FALSE;
 	dropGoldValue = 0;
 	initialDropGoldValue = 0;
@@ -2044,38 +2044,38 @@ void DrawDurIcon()
 	}
 }
 
-int DrawDurIcon4Item(ItemStruct *item, int x, int frame)
+int DrawDurIcon4Item(ItemStruct *pItem, int x, int c)
 {
-	if (item->_itype == ITYPE_NONE)
+	if (pItem->_itype == ITYPE_NONE)
 		return x;
-	if (item->_iDurability > 5)
+	if (pItem->_iDurability > 5)
 		return x;
-	if (frame == 0) {
-		if (item->_iClass == ICLASS_WEAPON) {
-			switch (item->_itype) {
+	if (c == 0) {
+		if (pItem->_iClass == ICLASS_WEAPON) {
+			switch (pItem->_itype) {
 			case ITYPE_SWORD:
-				frame = 2;
+				c = 2;
 				break;
 			case ITYPE_AXE:
-				frame = 6;
+				c = 6;
 				break;
 			case ITYPE_BOW:
-				frame = 7;
+				c = 7;
 				break;
 			case ITYPE_MACE:
-				frame = 5;
+				c = 5;
 				break;
 			case ITYPE_STAFF:
-				frame = 8;
+				c = 8;
 				break;
 			}
 		} else {
-			frame = 1;
+			c = 1;
 		}
 	}
-	if (item->_iDurability > 2)
-		frame += 8;
-	CelDecodeOnly(x, 495, pDurIcons, frame, 32);
+	if (pItem->_iDurability > 2)
+		c += 8;
+	CelDecodeOnly(x, 495, pDurIcons, c, 32);
 	return x - 40;
 }
 

Source/control.h

@@ -97,7 +97,7 @@ void DrawLevelUpIcon();
 void CheckChrBtns();
 void ReleaseChrBtns();
 void DrawDurIcon();
-int DrawDurIcon4Item(ItemStruct *item, int x, int frame);
+int DrawDurIcon4Item(ItemStruct *pItem, int x, int c);
 void RedBack();
 char GetSBookTrans(int ii, BOOL townok);
 void DrawSpellBook();

Source/cursor.cpp

@@ -2,24 +2,24 @@
 
 DEVILUTION_BEGIN_NAMESPACE
 
-int cursH;      // weak
-int icursH28;   // idb
-int cursW;      // idb
-int pcursmonst; // idb
-int icursW28;   // idb
+int cursH;
+int icursH28;
+int cursW;
+int pcursmonst;
+int icursW28;
 void *pCursCels;
-int icursH; // weak
+int icursH;
 
 // inv_item value
-char pcursinvitem; // weak
-int icursW;        // weak
-char pcursitem;    // weak
-char pcursobj;     // weak
-char pcursplr;     // weak
+char pcursinvitem;
+int icursW;
+char pcursitem;
+char pcursobj;
+char pcursplr;
 int cursmx;
 int cursmy;
-int pcurstemp; // weak
-int pcurs;     // idb
+int pcurstemp;
+int pcurs;
 
 /* rdata */
 const int InvItemWidth[180] = {
@@ -71,7 +71,7 @@ const int InvItemHeight[180] = {
 void InitCursor()
 {
 	/// ASSERT: assert(! pCursCels);
-	pCursCels = LoadFileInMem("Data\\Inv\\Objcurs.CEL", 0);
+	pCursCels = LoadFileInMem("Data\\Inv\\Objcurs.CEL", NULL);
 	ClearCursor();
 }
 

Source/cursor.h

@@ -2,22 +2,22 @@
 #ifndef __CURSOR_H__
 #define __CURSOR_H__
 
-extern int cursH;      // weak
-extern int icursH28;   // idb
-extern int cursW;      // idb
-extern int pcursmonst; // idb
-extern int icursW28;   // idb
+extern int cursH;
+extern int icursH28;
+extern int cursW;
+extern int pcursmonst;
+extern int icursW28;
 extern void *pCursCels;
-extern int icursH;        // weak
-extern char pcursinvitem; // weak
-extern int icursW;        // weak
-extern char pcursitem;    // weak
-extern char pcursobj;     // weak
-extern char pcursplr;     // weak
+extern int icursH;
+extern char pcursinvitem;
+extern int icursW;
+extern char pcursitem;
+extern char pcursobj;
+extern char pcursplr;
 extern int cursmx;
 extern int cursmy;
-extern int pcurstemp; // weak
-extern int pcurs;        // idb
+extern int pcurstemp;
+extern int pcurs;
 
 void InitCursor();
 void FreeCursor();

Source/debug.cpp

@@ -17,7 +17,7 @@ char dFlagDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
 void LoadDebugGFX()
 {
 	if (visiondebug)
-		pSquareCel = LoadFileInMem("Data\\Square.CEL", 0);
+		pSquareCel = LoadFileInMem("Data\\Square.CEL", NULL);
 }
 
 void FreeDebugGFX()

Source/diablo.cpp

@@ -11,7 +11,7 @@ int gnLevelTypeTbl[NUMLEVELS];
 int MouseY;             // idb
 int MouseX;             // idb
 BOOL gbGameLoopStartup; // idb
-int glSeedTbl[NUMLEVELS];
+DWORD glSeedTbl[NUMLEVELS];
 BOOL gbRunGame;
 int glMid3Seed[NUMLEVELS];
 BOOL gbRunGameResult;
@@ -1537,34 +1537,34 @@ void LoadLvlGFX()
 
 	switch ((unsigned char)leveltype) {
 	case DTYPE_TOWN:
-		pDungeonCels = LoadFileInMem("Levels\\TownData\\Town.CEL", 0);
-		pMegaTiles = LoadFileInMem("Levels\\TownData\\Town.TIL", 0);
-		pLevelPieces = LoadFileInMem("Levels\\TownData\\Town.MIN", 0);
-		pSpecialCels = LoadFileInMem("Levels\\TownData\\TownS.CEL", 0);
+		pDungeonCels = LoadFileInMem("Levels\\TownData\\Town.CEL", NULL);
+		pMegaTiles = LoadFileInMem("Levels\\TownData\\Town.TIL", NULL);
+		pLevelPieces = LoadFileInMem("Levels\\TownData\\Town.MIN", NULL);
+		pSpecialCels = LoadFileInMem("Levels\\TownData\\TownS.CEL", NULL);
 		break;
 	case DTYPE_CATHEDRAL:
-		pDungeonCels = LoadFileInMem("Levels\\L1Data\\L1.CEL", 0);
-		pMegaTiles = LoadFileInMem("Levels\\L1Data\\L1.TIL", 0);
-		pLevelPieces = LoadFileInMem("Levels\\L1Data\\L1.MIN", 0);
-		pSpecialCels = LoadFileInMem("Levels\\L1Data\\L1S.CEL", 0);
+		pDungeonCels = LoadFileInMem("Levels\\L1Data\\L1.CEL", NULL);
+		pMegaTiles = LoadFileInMem("Levels\\L1Data\\L1.TIL", NULL);
+		pLevelPieces = LoadFileInMem("Levels\\L1Data\\L1.MIN", NULL);
+		pSpecialCels = LoadFileInMem("Levels\\L1Data\\L1S.CEL", NULL);
 		break;
 	case DTYPE_CATACOMBS:
-		pDungeonCels = LoadFileInMem("Levels\\L2Data\\L2.CEL", 0);
-		pMegaTiles = LoadFileInMem("Levels\\L2Data\\L2.TIL", 0);
-		pLevelPieces = LoadFileInMem("Levels\\L2Data\\L2.MIN", 0);
-		pSpecialCels = LoadFileInMem("Levels\\L2Data\\L2S.CEL", 0);
+		pDungeonCels = LoadFileInMem("Levels\\L2Data\\L2.CEL", NULL);
+		pMegaTiles = LoadFileInMem("Levels\\L2Data\\L2.TIL", NULL);
+		pLevelPieces = LoadFileInMem("Levels\\L2Data\\L2.MIN", NULL);
+		pSpecialCels = LoadFileInMem("Levels\\L2Data\\L2S.CEL", NULL);
 		break;
 	case DTYPE_CAVES:
-		pDungeonCels = LoadFileInMem("Levels\\L3Data\\L3.CEL", 0);
-		pMegaTiles = LoadFileInMem("Levels\\L3Data\\L3.TIL", 0);
-		pLevelPieces = LoadFileInMem("Levels\\L3Data\\L3.MIN", 0);
-		pSpecialCels = LoadFileInMem("Levels\\L1Data\\L1S.CEL", 0);
+		pDungeonCels = LoadFileInMem("Levels\\L3Data\\L3.CEL", NULL);
+		pMegaTiles = LoadFileInMem("Levels\\L3Data\\L3.TIL", NULL);
+		pLevelPieces = LoadFileInMem("Levels\\L3Data\\L3.MIN", NULL);
+		pSpecialCels = LoadFileInMem("Levels\\L1Data\\L1S.CEL", NULL);
 		break;
 	case DTYPE_HELL:
-		pDungeonCels = LoadFileInMem("Levels\\L4Data\\L4.CEL", 0);
-		pMegaTiles = LoadFileInMem("Levels\\L4Data\\L4.TIL", 0);
-		pLevelPieces = LoadFileInMem("Levels\\L4Data\\L4.MIN", 0);
-		pSpecialCels = LoadFileInMem("Levels\\L2Data\\L2S.CEL", 0);
+		pDungeonCels = LoadFileInMem("Levels\\L4Data\\L4.CEL", NULL);
+		pMegaTiles = LoadFileInMem("Levels\\L4Data\\L4.TIL", NULL);
+		pLevelPieces = LoadFileInMem("Levels\\L4Data\\L4.MIN", NULL);
+		pSpecialCels = LoadFileInMem("Levels\\L2Data\\L2S.CEL", NULL);
 		break;
 	default:
 		app_fatal("LoadLvlGFX");

Source/diablo.h

@@ -90,7 +90,7 @@ extern int gnLevelTypeTbl[NUMLEVELS];
 extern int MouseY;             // idb
 extern int MouseX;             // idb
 extern BOOL gbGameLoopStartup; // idb
-extern int glSeedTbl[NUMLEVELS];
+extern DWORD glSeedTbl[NUMLEVELS];
 extern BOOL gbRunGame;
 extern int glMid3Seed[NUMLEVELS];
 extern BOOL gbRunGameResult;
@@ -151,8 +151,6 @@ void diablo_color_cyc_logic();
 
 /* data */
 
-extern int diablo_inf; // weak
-
 /* rdata */
 
 extern BOOL fullscreen;