From f884ba5340fbff8e14ff19dc5860cf022ab23740 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Thu, 29 Apr 2021 20:48:58 +0200
Subject: [PATCH] :fire: Remove more miniwin dependencies

---
 Source/codec.cpp             |  4 ++--
 Source/diablo.cpp            |  2 +-
 Source/diablo.h              |  2 +-
 Source/drlg_l1.cpp           | 18 +++++++-----------
 Source/drlg_l1.h             |  3 +--
 Source/drlg_l2.cpp           |  2 +-
 Source/drlg_l2.h             |  3 +--
 Source/drlg_l3.cpp           |  2 +-
 Source/drlg_l3.h             |  3 +--
 Source/drlg_l4.cpp           |  2 +-
 Source/drlg_l4.h             |  3 +--
 Source/gendung.cpp           |  6 +++---
 Source/inv.cpp               |  8 ++++----
 Source/inv.h                 |  8 ++++----
 Source/items.cpp             | 12 ++++++------
 Source/items.h               | 12 ++++++------
 Source/miniwin/miniwin.h     |  5 +----
 Source/monster.cpp           |  6 +++---
 Source/movie.h               |  2 --
 Source/msg.cpp               | 14 +++++++-------
 Source/msg.h                 | 14 +++++++-------
 Source/multi.cpp             |  2 +-
 Source/multi.h               |  2 +-
 Source/nthread.cpp           | 14 ++++++--------
 Source/objects.cpp           | 13 ++++++-------
 Source/pack.cpp              |  2 +-
 Source/palette.cpp           |  6 ++----
 Source/palette.h             |  4 +---
 Source/scrollrt.cpp          |  4 ++--
 Source/scrollrt.h            |  3 +--
 Source/storm/storm.h         |  2 +-
 Source/sync.cpp              |  1 -
 Source/utils/soundsample.cpp |  2 +-
 Source/utils/soundsample.h   |  2 +-
 34 files changed, 83 insertions(+), 105 deletions(-)

diff --git a/Source/codec.cpp b/Source/codec.cpp
index 67bff9af5..4297038bc 100644
--- a/Source/codec.cpp
+++ b/Source/codec.cpp
@@ -17,7 +17,7 @@ struct CodecSignature {
 	DWORD checksum;
 	BYTE error;
 	BYTE last_chunk_size;
-	WORD unused;
+	uint16_t unused;
 };
 
 #define BLOCKSIZE 64
@@ -111,7 +111,7 @@ void codec_encode(BYTE *pbSrcDst, std::size_t size, std::size_t size_64, const c
 	char tmp[SHA1HashSize];
 	char dst[SHA1HashSize];
 	DWORD chunk;
-	WORD last_chunk;
+	uint16_t last_chunk;
 	CodecSignature *sig;
 
 	if (size_64 != codec_get_encoded_len(size))
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 9079ef62b..76f157c31 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -107,7 +107,7 @@ bool gbBarbarian;
 int sgnTimeoutCurs;
 clicktype sgbMouseDown;
 int color_cycle_timer;
-WORD gnTickDelay = 50;
+uint16_t gnTickDelay = 50;
 /** Game options */
 Options sgOptions;
 
diff --git a/Source/diablo.h b/Source/diablo.h
index b27e46e86..ba14c8a0c 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -46,7 +46,7 @@ extern bool gbNestArt;
 extern bool gbBard;
 extern bool gbBarbarian;
 extern clicktype sgbMouseDown;
-extern WORD gnTickDelay;
+extern uint16_t gnTickDelay;
 
 void FreeGameMem();
 bool StartGame(bool bNewGame, bool bSinglePlayer);
diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index df7a53e38..ed8b33b27 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -1053,13 +1053,10 @@ static int DRLG_PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, in
 
 static void DRLG_L1Floor()
 {
-	int i, j;
-	LONG rv;
-
-	for (j = 0; j < DMAXY; j++) {
-		for (i = 0; i < DMAXX; i++) {
+	for (int j = 0; j < DMAXY; j++) {
+		for (int i = 0; i < DMAXX; i++) {
 			if (L5dflags[i][j] == 0 && dungeon[i][j] == 13) {
-				rv = GenerateRnd(3);
+				int rv = GenerateRnd(3);
 
 				if (rv == 1)
 					dungeon[i][j] = 162;
@@ -1072,7 +1069,7 @@ static void DRLG_L1Floor()
 
 void DRLG_LPass3(int lv)
 {
-	WORD *MegaTiles = (WORD *)&pMegaTiles[lv * 8];
+	auto *MegaTiles = (uint16_t *)&pMegaTiles[lv * 8];
 	int v1 = SDL_SwapLE16(*(MegaTiles + 0)) + 1;
 	int v2 = SDL_SwapLE16(*(MegaTiles + 1)) + 1;
 	int v3 = SDL_SwapLE16(*(MegaTiles + 2)) + 1;
@@ -1093,7 +1090,7 @@ void DRLG_LPass3(int lv)
 		for (int i = 0; i < DMAXX; i++) {
 			lv = dungeon[i][j] - 1;
 			if (lv >= 0) {
-				MegaTiles = (WORD *)&pMegaTiles[lv * 8];
+				MegaTiles = (uint16_t *)&pMegaTiles[lv * 8];
 				v1 = SDL_SwapLE16(*(MegaTiles + 0)) + 1;
 				v2 = SDL_SwapLE16(*(MegaTiles + 1)) + 1;
 				v3 = SDL_SwapLE16(*(MegaTiles + 2)) + 1;
@@ -2516,8 +2513,7 @@ static void DRLG_L5CornerFix()
 
 static void DRLG_L5(lvl_entry entry)
 {
-	int i, j;
-	LONG minarea;
+	int i, j, minarea;
 	bool doneflag;
 
 	switch (currlevel) {
@@ -2742,7 +2738,7 @@ static void DRLG_L5(lvl_entry entry)
 	DRLG_CheckQuests(setpc_x, setpc_y);
 }
 
-void CreateL5Dungeon(DWORD rseed, lvl_entry entry)
+void CreateL5Dungeon(uint32_t rseed, lvl_entry entry)
 {
 	int i, j;
 
diff --git a/Source/drlg_l1.h b/Source/drlg_l1.h
index 65d05dd89..60852dad3 100644
--- a/Source/drlg_l1.h
+++ b/Source/drlg_l1.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin/miniwin.h"
 
 namespace devilution {
 
@@ -24,7 +23,7 @@ void DRLG_LPass3(int lv);
 void DRLG_Init_Globals();
 void LoadL1Dungeon(const char *sFileName, int vx, int vy);
 void LoadPreL1Dungeon(const char *sFileName);
-void CreateL5Dungeon(DWORD rseed, lvl_entry entry);
+void CreateL5Dungeon(uint32_t rseed, lvl_entry entry);
 void drlg_l1_set_crypt_room(int rx1, int ry1);
 void drlg_l1_set_corner_room(int rx1, int ry1);
 void drlg_l1_crypt_pattern1(int rndper);
diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp
index 991c8ffbf..beac724ac 100644
--- a/Source/drlg_l2.cpp
+++ b/Source/drlg_l2.cpp
@@ -3369,7 +3369,7 @@ void LoadPreL2Dungeon(const char *sFileName)
 	}
 }
 
-void CreateL2Dungeon(DWORD rseed, lvl_entry entry)
+void CreateL2Dungeon(uint32_t rseed, lvl_entry entry)
 {
 	if (!gbIsMultiplayer) {
 		if (currlevel == 7 && quests[Q_BLIND]._qactive == QUEST_NOTAVAIL) {
diff --git a/Source/drlg_l2.h b/Source/drlg_l2.h
index 41065f49d..a265fea42 100644
--- a/Source/drlg_l2.h
+++ b/Source/drlg_l2.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin/miniwin.h"
 
 namespace devilution {
 
@@ -32,6 +31,6 @@ extern BYTE predungeon[DMAXX][DMAXY];
 void InitDungeon();
 void LoadL2Dungeon(const char *sFileName, int vx, int vy);
 void LoadPreL2Dungeon(const char *sFileName);
-void CreateL2Dungeon(DWORD rseed, lvl_entry entry);
+void CreateL2Dungeon(uint32_t rseed, lvl_entry entry);
 
 } // namespace devilution
diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp
index d5f43b07d..c92382333 100644
--- a/Source/drlg_l3.cpp
+++ b/Source/drlg_l3.cpp
@@ -2578,7 +2578,7 @@ static void DRLG_L3Pass3()
 	DRLG_LPass3(8 - 1);
 }
 
-void CreateL3Dungeon(DWORD rseed, lvl_entry entry)
+void CreateL3Dungeon(uint32_t rseed, lvl_entry entry)
 {
 	int i, j;
 
diff --git a/Source/drlg_l3.h b/Source/drlg_l3.h
index 5541aedf9..85299f8a4 100644
--- a/Source/drlg_l3.h
+++ b/Source/drlg_l3.h
@@ -6,12 +6,11 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin/miniwin.h"
 
 namespace devilution {
 
 void AddFenceDoors();
-void CreateL3Dungeon(DWORD rseed, lvl_entry entry);
+void CreateL3Dungeon(uint32_t rseed, lvl_entry entry);
 void LoadL3Dungeon(const char *sFileName, int vx, int vy);
 void LoadPreL3Dungeon(const char *sFileName);
 
diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp
index 7d2ffd4a3..6936aab0a 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/drlg_l4.cpp
@@ -1751,7 +1751,7 @@ static void DRLG_L4Pass3()
 	DRLG_LPass3(30 - 1);
 }
 
-void CreateL4Dungeon(DWORD rseed, lvl_entry entry)
+void CreateL4Dungeon(uint32_t rseed, lvl_entry entry)
 {
 	SetRndSeed(rseed);
 
diff --git a/Source/drlg_l4.h b/Source/drlg_l4.h
index ed572d78e..4182fdbf7 100644
--- a/Source/drlg_l4.h
+++ b/Source/drlg_l4.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin/miniwin.h"
 
 namespace devilution {
 
@@ -20,6 +19,6 @@ extern int diabquad4x;
 extern int diabquad4y;
 bool IsDURWall(char d);
 bool IsDLLWall(char dd);
-void CreateL4Dungeon(DWORD rseed, lvl_entry entry);
+void CreateL4Dungeon(uint32_t rseed, lvl_entry entry);
 
 } // namespace devilution
diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index 3a1682339..811e14c9b 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -189,7 +189,7 @@ void FillSolidBlockTbls()
 void SetDungeonMicros()
 {
 	int i, x, y, lv, blocks;
-	WORD *pPiece;
+	uint16_t *pPiece;
 	MICROS *pMap;
 
 	if (leveltype == DTYPE_TOWN) {
@@ -210,9 +210,9 @@ void SetDungeonMicros()
 			if (lv != 0) {
 				lv--;
 				if (leveltype != DTYPE_HELL && leveltype != DTYPE_TOWN)
-					pPiece = (WORD *)&pLevelPieces[20 * lv];
+					pPiece = (uint16_t *)&pLevelPieces[20 * lv];
 				else
-					pPiece = (WORD *)&pLevelPieces[32 * lv];
+					pPiece = (uint16_t *)&pLevelPieces[32 * lv];
 				for (i = 0; i < blocks; i++)
 					pMap->mt[i] = SDL_SwapLE16(pPiece[(i & 1) + blocks - 2 - (i & 0xE)]);
 			} else {
diff --git a/Source/inv.cpp b/Source/inv.cpp
index b2c432017..aa83fdc5e 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -1244,7 +1244,7 @@ void CheckInvPaste(int pnum, int mx, int my)
 	}
 }
 
-void CheckInvSwap(int pnum, BYTE bLoc, int idx, WORD wCI, int seed, bool bId, uint32_t dwBuff)
+void CheckInvSwap(int pnum, BYTE bLoc, int idx, uint16_t wCI, int seed, bool bId, uint32_t dwBuff)
 {
 	PlayerStruct *p;
 
@@ -1784,7 +1784,7 @@ void AutoGetItem(int pnum, ItemStruct *item, int ii)
 	plr[pnum].HoldItem._itype = ITYPE_NONE;
 }
 
-int FindGetItem(int idx, WORD ci, int iseed)
+int FindGetItem(int idx, uint16_t ci, int iseed)
 {
 	if (numitems <= 0)
 		return -1;
@@ -1805,7 +1805,7 @@ int FindGetItem(int idx, WORD ci, int iseed)
 	return ii;
 }
 
-void SyncGetItem(int x, int y, int idx, WORD ci, int iseed)
+void SyncGetItem(int x, int y, int idx, uint16_t ci, int iseed)
 {
 	int ii;
 
@@ -1993,7 +1993,7 @@ int InvPutItem(int pnum, Point position)
 	return ii;
 }
 
-int SyncPutItem(int pnum, Point position, int idx, WORD icreateinfo, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, DWORD ibuff, int to_hit, int max_dam, int min_str, int min_mag, int min_dex, int ac)
+int SyncPutItem(int pnum, Point position, int idx, uint16_t icreateinfo, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, DWORD ibuff, int to_hit, int max_dam, int min_str, int min_mag, int min_dex, int ac)
 {
 	if (!PutItem(pnum, position))
 		return -1;
diff --git a/Source/inv.h b/Source/inv.h
index 99f549aa0..9d9409cd6 100644
--- a/Source/inv.h
+++ b/Source/inv.h
@@ -93,7 +93,7 @@ bool AutoPlaceItemInInventory(int playerNumber, const ItemStruct &item, bool per
 bool AutoPlaceItemInInventorySlot(int playerNumber, int slotIndex, const ItemStruct &item, bool persistItem);
 bool AutoPlaceItemInBelt(int playerNumber, const ItemStruct &item, bool persistItem = false);
 bool GoldAutoPlace(int pnum);
-void CheckInvSwap(int pnum, BYTE bLoc, int idx, WORD wCI, int seed, bool bId, uint32_t dwBuff);
+void CheckInvSwap(int pnum, BYTE bLoc, int idx, uint16_t wCI, int seed, bool bId, uint32_t dwBuff);
 void inv_update_rem_item(int pnum, BYTE iv);
 
 /**
@@ -110,13 +110,13 @@ void CheckInvScrn(bool isShiftHeld);
 void CheckItemStats(int pnum);
 void InvGetItem(int pnum, ItemStruct *item, int ii);
 void AutoGetItem(int pnum, ItemStruct *item, int ii);
-int FindGetItem(int idx, WORD ci, int iseed);
-void SyncGetItem(int x, int y, int idx, WORD ci, int iseed);
+int FindGetItem(int idx, uint16_t ci, int iseed);
+void SyncGetItem(int x, int y, int idx, uint16_t ci, int iseed);
 bool CanPut(int x, int y);
 bool TryInvPut();
 void DrawInvMsg(const char *msg);
 int InvPutItem(int pnum, Point position);
-int SyncPutItem(int pnum, Point position, int idx, WORD icreateinfo, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, DWORD ibuff, int to_hit, int max_dam, int min_str, int min_mag, int min_dex, int ac);
+int SyncPutItem(int pnum, Point position, int idx, uint16_t icreateinfo, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, DWORD ibuff, int to_hit, int max_dam, int min_str, int min_mag, int min_dex, int ac);
 char CheckInvHLight();
 void RemoveScroll(int pnum);
 bool UseScroll();
diff --git a/Source/items.cpp b/Source/items.cpp
index 5d0b69833..9880ddbc4 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -2702,7 +2702,7 @@ void CreateTypeItem(int x, int y, bool onlygood, int itype, int imisc, bool send
 	SetupBaseItem(x, y, idx, onlygood, sendmsg, delta);
 }
 
-void RecreateItem(int ii, int idx, WORD icreateinfo, int iseed, int ivalue, bool isHellfire)
+void RecreateItem(int ii, int idx, uint16_t icreateinfo, int iseed, int ivalue, bool isHellfire)
 {
 	bool _gbIsHellfire = gbIsHellfire;
 	gbIsHellfire = isHellfire;
@@ -2754,7 +2754,7 @@ void RecreateItem(int ii, int idx, WORD icreateinfo, int iseed, int ivalue, bool
 	gbIsHellfire = _gbIsHellfire;
 }
 
-void RecreateEar(int ii, WORD ic, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, int ibuff)
+void RecreateEar(int ii, uint16_t ic, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, int ibuff)
 {
 	SetPlrHandItem(&items[ii], IDI_EAR);
 	tempstr[0] = (ic >> 8) & 0x7F;
@@ -5000,7 +5000,7 @@ void RecreateHealerItem(int ii, int idx, int lvl, int iseed)
 	items[ii]._iIdentified = true;
 }
 
-void RecreateTownItem(int ii, int idx, WORD icreateinfo, int iseed)
+void RecreateTownItem(int ii, int idx, uint16_t icreateinfo, int iseed)
 {
 	if ((icreateinfo & CF_SMITH) != 0)
 		RecreateSmithItem(ii, icreateinfo & CF_LEVEL, iseed);
@@ -5142,7 +5142,7 @@ static void NextItemRecord(int i)
 	itemrecord[i].nIndex = itemrecord[gnNumGetRecords].nIndex;
 }
 
-bool GetItemRecord(int nSeed, WORD wCI, int nIndex)
+bool GetItemRecord(int nSeed, uint16_t wCI, int nIndex)
 {
 	int i;
 	DWORD dwTicks;
@@ -5161,7 +5161,7 @@ bool GetItemRecord(int nSeed, WORD wCI, int nIndex)
 	return true;
 }
 
-void SetItemRecord(int nSeed, WORD wCI, int nIndex)
+void SetItemRecord(int nSeed, uint16_t wCI, int nIndex)
 {
 	DWORD dwTicks;
 
@@ -5178,7 +5178,7 @@ void SetItemRecord(int nSeed, WORD wCI, int nIndex)
 	gnNumGetRecords++;
 }
 
-void PutItemRecord(int nSeed, WORD wCI, int nIndex)
+void PutItemRecord(int nSeed, uint16_t wCI, int nIndex)
 {
 	int i;
 	DWORD dwTicks;
diff --git a/Source/items.h b/Source/items.h
index 84e511637..d20459f54 100644
--- a/Source/items.h
+++ b/Source/items.h
@@ -396,8 +396,8 @@ void SpawnItem(int m, int x, int y, bool sendmsg);
 void CreateRndItem(int x, int y, bool onlygood, bool sendmsg, bool delta);
 void CreateRndUseful(int x, int y, bool sendmsg);
 void CreateTypeItem(int x, int y, bool onlygood, int itype, int imisc, bool sendmsg, bool delta);
-void RecreateItem(int ii, int idx, WORD icreateinfo, int iseed, int ivalue, bool isHellfire);
-void RecreateEar(int ii, WORD ic, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, int ibuff);
+void RecreateItem(int ii, int idx, uint16_t icreateinfo, int iseed, int ivalue, bool isHellfire);
+void RecreateEar(int ii, uint16_t ic, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, int ibuff);
 void items_427A72();
 void items_427ABA(Point position);
 void SpawnQuestItem(int itemid, int x, int y, int randarea, int selflag);
@@ -429,16 +429,16 @@ void SpawnWitch(int lvl);
 void SpawnBoy(int lvl);
 void SpawnHealer(int lvl);
 void SpawnStoreGold();
-void RecreateTownItem(int ii, int idx, WORD icreateinfo, int iseed);
+void RecreateTownItem(int ii, int idx, uint16_t icreateinfo, int iseed);
 void RecalcStoreStats();
 int ItemNoFlippy();
 void CreateSpellBook(int x, int y, spell_id ispell, bool sendmsg, bool delta);
 void CreateMagicArmor(int x, int y, int imisc, int icurs, bool sendmsg, bool delta);
 void CreateAmulet(int x, int y, int curlv, bool sendmsg, bool delta);
 void CreateMagicWeapon(int x, int y, int imisc, int icurs, bool sendmsg, bool delta);
-bool GetItemRecord(int nSeed, WORD wCI, int nIndex);
-void SetItemRecord(int nSeed, WORD wCI, int nIndex);
-void PutItemRecord(int nSeed, WORD wCI, int nIndex);
+bool GetItemRecord(int nSeed, uint16_t wCI, int nIndex);
+void SetItemRecord(int nSeed, uint16_t wCI, int nIndex);
+void PutItemRecord(int nSeed, uint16_t wCI, int nIndex);
 
 /* data */
 
diff --git a/Source/miniwin/miniwin.h b/Source/miniwin/miniwin.h
index f248501cd..9f9f0a3fa 100644
--- a/Source/miniwin/miniwin.h
+++ b/Source/miniwin/miniwin.h
@@ -29,11 +29,8 @@ namespace devilution {
 #define DVL_PRINTF_ATTRIBUTE(fmtargnum)
 #endif
 
-typedef int32_t LONG;
-
 typedef uint32_t DWORD;
 typedef unsigned char BYTE;
-typedef unsigned short WORD;
 
 //
 // Handles
@@ -42,7 +39,7 @@ typedef void *HANDLE;
 
 typedef void (*WNDPROC)(uint32_t, int32_t, int32_t);
 
-typedef struct tagMSG {
+struct tagMSG {
 	uint32_t message;
 	int32_t wParam;
 	int32_t lParam;
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 5224c9cad..38f6509b9 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -1183,8 +1183,8 @@ void InitMonsters()
 
 void SetMapMonsters(BYTE *pMap, int startx, int starty)
 {
-	WORD rw, rh;
-	WORD *lm;
+	uint16_t rw, rh;
+	uint16_t *lm;
 	int i, j;
 	int mtype;
 
@@ -1201,7 +1201,7 @@ void SetMapMonsters(BYTE *pMap, int startx, int starty)
 		PlaceUniqueMonst(UMT_RED_VEX, 0, 0);
 		PlaceUniqueMonst(UMT_BLACKJADE, 0, 0);
 	}
-	lm = (WORD *)pMap;
+	lm = (uint16_t *)pMap;
 	rw = SDL_SwapLE16(*lm++);
 	rh = SDL_SwapLE16(*lm++);
 	lm += rw * rh;
diff --git a/Source/movie.h b/Source/movie.h
index b3f605816..de0d4a692 100644
--- a/Source/movie.h
+++ b/Source/movie.h
@@ -5,8 +5,6 @@
  */
 #pragma once
 
-#include "miniwin/miniwin.h"
-
 namespace devilution {
 
 extern bool movie_playing;
diff --git a/Source/msg.cpp b/Source/msg.cpp
index 83f231a0c..a7abeca0d 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -883,7 +883,7 @@ void NetSendCmdLoc(int playerId, bool bHiPri, _cmd_id bCmd, Point position)
 		NetSendLoPri(playerId, (BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1)
+void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, Point position, uint16_t wParam1)
 {
 	TCmdLocParam1 cmd;
 
@@ -897,7 +897,7 @@ void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1
 		NetSendLoPri(myplr, (BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1, WORD wParam2)
+void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, Point position, uint16_t wParam1, uint16_t wParam2)
 {
 	TCmdLocParam2 cmd;
 
@@ -912,7 +912,7 @@ void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1
 		NetSendLoPri(myplr, (BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1, WORD wParam2, WORD wParam3)
+void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, Point position, uint16_t wParam1, uint16_t wParam2, uint16_t wParam3)
 {
 	TCmdLocParam3 cmd;
 
@@ -928,7 +928,7 @@ void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1
 		NetSendLoPri(myplr, (BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdParam1(bool bHiPri, _cmd_id bCmd, WORD wParam1)
+void NetSendCmdParam1(bool bHiPri, _cmd_id bCmd, uint16_t wParam1)
 {
 	TCmdParam1 cmd;
 
@@ -940,7 +940,7 @@ void NetSendCmdParam1(bool bHiPri, _cmd_id bCmd, WORD wParam1)
 		NetSendLoPri(myplr, (BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdParam2(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2)
+void NetSendCmdParam2(bool bHiPri, _cmd_id bCmd, uint16_t wParam1, uint16_t wParam2)
 {
 	TCmdParam2 cmd;
 
@@ -953,7 +953,7 @@ void NetSendCmdParam2(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2)
 		NetSendLoPri(myplr, (BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdParam3(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2, WORD wParam3)
+void NetSendCmdParam3(bool bHiPri, _cmd_id bCmd, uint16_t wParam1, uint16_t wParam2, uint16_t wParam3)
 {
 	TCmdParam3 cmd;
 
@@ -1232,7 +1232,7 @@ void NetSendCmdDamage(bool bHiPri, BYTE bPlr, DWORD dwDam)
 		NetSendLoPri(myplr, (BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdMonDmg(bool bHiPri, WORD wMon, DWORD dwDam)
+void NetSendCmdMonDmg(bool bHiPri, uint16_t wMon, DWORD dwDam)
 {
 	TCmdMonDamage cmd;
 
diff --git a/Source/msg.h b/Source/msg.h
index e41e5c4ea..9e6f687a8 100644
--- a/Source/msg.h
+++ b/Source/msg.h
@@ -435,12 +435,12 @@ void DeltaLoadLevel();
 void NetSendCmd(bool bHiPri, _cmd_id bCmd);
 void NetSendCmdGolem(BYTE mx, BYTE my, direction dir, BYTE menemy, int hp, BYTE cl);
 void NetSendCmdLoc(int playerId, bool bHiPri, _cmd_id bCmd, Point position);
-void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1);
-void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1, WORD wParam2);
-void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1, WORD wParam2, WORD wParam3);
-void NetSendCmdParam1(bool bHiPri, _cmd_id bCmd, WORD wParam1);
-void NetSendCmdParam2(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2);
-void NetSendCmdParam3(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2, WORD wParam3);
+void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, Point position, uint16_t wParam1);
+void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, Point position, uint16_t wParam1, uint16_t wParam2);
+void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, Point position, uint16_t wParam1, uint16_t wParam2, uint16_t wParam3);
+void NetSendCmdParam1(bool bHiPri, _cmd_id bCmd, uint16_t wParam1);
+void NetSendCmdParam2(bool bHiPri, _cmd_id bCmd, uint16_t wParam1, uint16_t wParam2);
+void NetSendCmdParam3(bool bHiPri, _cmd_id bCmd, uint16_t wParam1, uint16_t wParam2, uint16_t wParam3);
 void NetSendCmdQuest(bool bHiPri, BYTE q);
 void NetSendCmdGItem(bool bHiPri, _cmd_id bCmd, BYTE mast, BYTE pnum, BYTE ii);
 void NetSendCmdPItem(bool bHiPri, _cmd_id bCmd, Point position);
@@ -448,7 +448,7 @@ void NetSendCmdChItem(bool bHiPri, BYTE bLoc);
 void NetSendCmdDelItem(bool bHiPri, BYTE bLoc);
 void NetSendCmdDItem(bool bHiPri, int ii);
 void NetSendCmdDamage(bool bHiPri, BYTE bPlr, DWORD dwDam);
-void NetSendCmdMonDmg(bool bHiPri, WORD bMon, DWORD dwDam);
+void NetSendCmdMonDmg(bool bHiPri, uint16_t bMon, DWORD dwDam);
 void NetSendCmdString(uint32_t pmask, const char *pszStr);
 void delta_close_portal(int pnum);
 DWORD ParseCmd(int pnum, TCmd *pCmd);
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 7cf4b3b1e..33a020528 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -25,7 +25,7 @@ namespace devilution {
 bool gbSomebodyWonGameKludge;
 TBuffer sgHiPriBuf;
 char szPlayerDescript[128];
-WORD sgwPackPlrOffsetTbl[MAX_PLRS];
+uint16_t sgwPackPlrOffsetTbl[MAX_PLRS];
 PkPlayerStruct netplr[MAX_PLRS];
 bool sgbPlayerTurnBitTbl[MAX_PLRS];
 bool sgbPlayerLeftGameTbl[MAX_PLRS];
diff --git a/Source/multi.h b/Source/multi.h
index 5325b9f1b..18762f9c4 100644
--- a/Source/multi.h
+++ b/Source/multi.h
@@ -37,7 +37,7 @@ struct GameData {
 
 extern bool gbSomebodyWonGameKludge;
 extern char szPlayerDescript[128];
-extern WORD sgwPackPlrOffsetTbl[MAX_PLRS];
+extern uint16_t sgwPackPlrOffsetTbl[MAX_PLRS];
 extern BYTE gbActivePlayers;
 extern bool gbGameDestroyed;
 extern GameData sgGameInitInfo;
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index d81a3daaa..c437d6146 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -49,20 +49,18 @@ void nthread_terminate_game(const char *pszFcn)
 	}
 }
 
-DWORD nthread_send_and_recv_turn(DWORD cur_turn, int turn_delta)
+uint32_t nthread_send_and_recv_turn(uint32_t cur_turn, int turn_delta)
 {
-	DWORD new_cur_turn;
 	int turn, turn_tmp;
 	DWORD curTurnsInTransit;
 
-	new_cur_turn = cur_turn;
 	if (!SNetGetTurnsInTransit(&curTurnsInTransit)) {
 		nthread_terminate_game("SNetGetTurnsInTransit");
 		return 0;
 	}
 	while (curTurnsInTransit++ < gdwTurnsInTransit) {
 
-		turn_tmp = turn_upper_bit | (new_cur_turn & 0x7FFFFFFF);
+		turn_tmp = turn_upper_bit | (cur_turn & 0x7FFFFFFF);
 		turn_upper_bit = 0;
 		turn = turn_tmp;
 
@@ -71,11 +69,11 @@ DWORD nthread_send_and_recv_turn(DWORD cur_turn, int turn_delta)
 			return 0;
 		}
 
-		new_cur_turn += turn_delta;
-		if (new_cur_turn >= 0x7FFFFFFF)
-			new_cur_turn &= 0xFFFF;
+		cur_turn += turn_delta;
+		if (cur_turn >= 0x7FFFFFFF)
+			cur_turn &= 0xFFFF;
 	}
-	return new_cur_turn;
+	return cur_turn;
 }
 
 bool nthread_recv_turns(bool *pfSendAsync)
diff --git a/Source/objects.cpp b/Source/objects.cpp
index 49a3e5254..c395e2266 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -2255,7 +2255,7 @@ void ProcessObjects()
 
 void ObjSetMicro(int dx, int dy, int pn)
 {
-	WORD *v;
+	uint16_t *v;
 	MICROS *defs;
 	int i;
 
@@ -2263,12 +2263,12 @@ void ObjSetMicro(int dx, int dy, int pn)
 	pn--;
 	defs = &dpiece_defs_map_2[dx][dy];
 	if (leveltype != DTYPE_HELL) {
-		v = (WORD *)pLevelPieces + 10 * pn;
+		v = (uint16_t *)pLevelPieces + 10 * pn;
 		for (i = 0; i < 10; i++) {
 			defs->mt[i] = SDL_SwapLE16(v[(i & 1) - (i & 0xE) + 8]);
 		}
 	} else {
-		v = (WORD *)pLevelPieces + 16 * pn;
+		v = (uint16_t *)pLevelPieces + 16 * pn;
 		for (i = 0; i < 16; i++) {
 			defs->mt[i] = SDL_SwapLE16(v[(i & 1) - (i & 0xE) + 14]);
 		}
@@ -2282,8 +2282,8 @@ void objects_set_door_piece(int x, int y)
 
 	pn = dPiece[x][y] - 1;
 
-	v1 = *((WORD *)pLevelPieces + 10 * pn + 8);
-	v2 = *((WORD *)pLevelPieces + 10 * pn + 9);
+	v1 = *((uint16_t *)pLevelPieces + 10 * pn + 8);
+	v2 = *((uint16_t *)pLevelPieces + 10 * pn + 9);
 	dpiece_defs_map_2[x][y].mt[0] = SDL_SwapLE16(v1);
 	dpiece_defs_map_2[x][y].mt[1] = SDL_SwapLE16(v2);
 }
@@ -2292,9 +2292,8 @@ void ObjSetMini(int x, int y, int v)
 {
 	int xx, yy;
 	long v1, v2, v3, v4;
-	WORD *MegaTiles;
 
-	MegaTiles = (WORD *)&pMegaTiles[((WORD)v - 1) * 8];
+	uint16_t *MegaTiles = (uint16_t *)&pMegaTiles[((uint16_t)v - 1) * 8];
 	v1 = SDL_SwapLE16(*(MegaTiles + 0)) + 1;
 	v2 = SDL_SwapLE16(*(MegaTiles + 1)) + 1;
 	v3 = SDL_SwapLE16(*(MegaTiles + 2)) + 1;
diff --git a/Source/pack.cpp b/Source/pack.cpp
index f7c3415f3..95ffe5327 100644
--- a/Source/pack.cpp
+++ b/Source/pack.cpp
@@ -140,7 +140,7 @@ void PackPlayer(PkPlayerStruct *pPack, int pnum, bool manashield)
  */
 void UnPackItem(const PkItemStruct *is, ItemStruct *id, bool isHellfire)
 {
-	WORD idx = SDL_SwapLE16(is->idx);
+	uint16_t idx = SDL_SwapLE16(is->idx);
 	if (idx == 0xFFFF) {
 		id->_itype = ITYPE_NONE;
 		return;
diff --git a/Source/palette.cpp b/Source/palette.cpp
index 0c87c8ab3..15d6fecd4 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -209,11 +209,9 @@ int UpdateGamma(int gamma)
 	return 130 - sgOptions.Graphics.nGammaCorrection;
 }
 
-void SetFadeLevel(DWORD fadeval)
+void SetFadeLevel(int fadeval)
 {
-	int i;
-
-	for (i = 0; i < 256; i++) { // BUGFIX: should be 256 (fixed)
+	for (int i = 0; i < 256; i++) {
 		system_palette[i].r = (fadeval * logical_palette[i].r) / 256;
 		system_palette[i].g = (fadeval * logical_palette[i].g) / 256;
 		system_palette[i].b = (fadeval * logical_palette[i].b) / 256;
diff --git a/Source/palette.h b/Source/palette.h
index 5ba85ddfa..ec013f3b2 100644
--- a/Source/palette.h
+++ b/Source/palette.h
@@ -5,8 +5,6 @@
  */
 #pragma once
 
-#include "miniwin/miniwin.h"
-
 namespace devilution {
 
 // Diablo uses a 256 color palette
@@ -44,7 +42,7 @@ void ApplyGamma(SDL_Color *dst, const SDL_Color *src, int n);
 void DecreaseGamma();
 int UpdateGamma(int gamma);
 void BlackPalette();
-void SetFadeLevel(DWORD fadeval);
+void SetFadeLevel(int fadeval);
 /**
  * @brief Fade screen from black
  * @param fr Steps per 50ms
diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp
index 86feaf270..4352b1ce4 100644
--- a/Source/scrollrt.cpp
+++ b/Source/scrollrt.cpp
@@ -36,7 +36,7 @@ namespace devilution {
  * Specifies the current light entry.
  */
 int light_table_index;
-DWORD sgdwCursWdtOld;
+uint32_t sgdwCursWdtOld;
 int sgdwCursX;
 int sgdwCursY;
 /**
@@ -50,7 +50,7 @@ uint32_t sgdwCursHgt;
  * frameNum  := block & 0x0FFF
  * frameType := block & 0x7000 >> 12
  */
-DWORD level_cel_block;
+uint32_t level_cel_block;
 int sgdwCursXOld;
 int sgdwCursYOld;
 bool AutoMapShowItems;
diff --git a/Source/scrollrt.h b/Source/scrollrt.h
index edad1e6bf..5534778e5 100644
--- a/Source/scrollrt.h
+++ b/Source/scrollrt.h
@@ -8,7 +8,6 @@
 #include <cstdint>
 
 #include "engine.h"
-#include "miniwin/miniwin.h"
 
 namespace devilution {
 
@@ -31,7 +30,7 @@ extern bool sgbControllerActive;
 extern bool IsMovingMouseCursorWithController();
 
 extern int light_table_index;
-extern DWORD level_cel_block;
+extern uint32_t level_cel_block;
 extern char arch_draw_type;
 extern bool cel_transparency_active;
 extern bool cel_foliage_active;
diff --git a/Source/storm/storm.h b/Source/storm/storm.h
index db6057aa9..7e627f756 100644
--- a/Source/storm/storm.h
+++ b/Source/storm/storm.h
@@ -247,7 +247,7 @@ bool SFileOpenFile(const char *filename, HANDLE *phFile);
 bool WINAPI SFileOpenArchive(const char *szMpqName, DWORD dwPriority, DWORD dwFlags, HANDLE *phMpq);
 bool WINAPI SFileCloseArchive(HANDLE hArchive);
 bool WINAPI SFileOpenFileEx(HANDLE hMpq, const char *szFileName, DWORD dwSearchScope, HANDLE *phFile);
-bool WINAPI SFileReadFile(HANDLE hFile, void *buffer, DWORD nNumberOfBytesToRead, DWORD *read, LONG *lpDistanceToMoveHigh);
+bool WINAPI SFileReadFile(HANDLE hFile, void *buffer, DWORD nNumberOfBytesToRead, DWORD *read, int *lpDistanceToMoveHigh);
 DWORD WINAPI SFileGetFileSize(HANDLE hFile, uint32_t *lpFileSizeHigh);
 DWORD WINAPI SFileSetFilePointer(HANDLE, int, int *, int);
 bool WINAPI SFileCloseFile(HANDLE hFile);
diff --git a/Source/sync.cpp b/Source/sync.cpp
index fe151c98b..3f4885087 100644
--- a/Source/sync.cpp
+++ b/Source/sync.cpp
@@ -6,7 +6,6 @@
 #include <climits>
 
 #include "gendung.h"
-#include "miniwin/miniwin.h"
 #include "monster.h"
 #include "player.h"
 
diff --git a/Source/utils/soundsample.cpp b/Source/utils/soundsample.cpp
index ccf6e247e..12260f6bd 100644
--- a/Source/utils/soundsample.cpp
+++ b/Source/utils/soundsample.cpp
@@ -79,7 +79,7 @@ int SoundSample::SetChunkStream(HANDLE stormHandle)
 	return 0;
 }
 
-int SoundSample::SetChunk(std::unique_ptr<std::uint8_t[]> fileData, DWORD dwBytes)
+int SoundSample::SetChunk(std::unique_ptr<std::uint8_t[]> fileData, size_t dwBytes)
 {
 	file_data_ = std::move(fileData);
 	SDL_RWops *buf = SDL_RWFromConstMem(file_data_.get(), dwBytes);
diff --git a/Source/utils/soundsample.h b/Source/utils/soundsample.h
index 7192627ba..255ada5d9 100644
--- a/Source/utils/soundsample.h
+++ b/Source/utils/soundsample.h
@@ -24,7 +24,7 @@ public:
 	 * @param dwBytes Length of buffer
 	 * @return 0 on success, -1 otherwise
 	 */
-	int SetChunk(std::unique_ptr<std::uint8_t[]> file_data, DWORD dwBytes);
+	int SetChunk(std::unique_ptr<std::uint8_t[]> file_data, size_t dwBytes);
 
 	int GetLength();