diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 938180997..d3d60116c 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -867,7 +867,7 @@ BOOL __fastcall LeftMouseCmd(BOOL bShift)
 			NetSendCmdLocParam1(pcurs, invflag ? CMD_GOTOGETITEM : CMD_GOTOAGETITEM, cursmx, cursmy, pcursitem);
 		} else if(pcursobj != -1 && (!bShift || bNear && object[pcursobj]._oBreak == 1)) {
 			NetSendCmdLocParam1(TRUE, pcurs == CURSOR_DISARM ? CMD_DISARMXY : CMD_OPOBJXY, cursmx, cursmy, pcursobj);
-		} else if(plr[myplr]._pwtype == 1) {
+		} else if(plr[myplr]._pwtype == WT_RANGED) {
 			if(bShift) {
 				NetSendCmdLoc(TRUE, CMD_RATTACKXY, cursmx, cursmy);
 			} else if(pcursmonst != -1) {
diff --git a/Source/init.cpp b/Source/init.cpp
index 07bb0b8c8..ec126e9ff 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -324,7 +324,7 @@ void *__fastcall init_test_access(char *mpq_path, char *mpq_name, char *reg_loc,
 				return archive;
 		}
 	}
-	if (fs && init_read_test_file(v15, mpq_namea, flags, &archive)) {
+	if (fs == FS_CD && init_read_test_file(v15, mpq_namea, flags, &archive)) {
 		strcpy(v5, v15);
 		return archive;
 	}
diff --git a/Source/items.cpp b/Source/items.cpp
index 34d266ce0..755c03752 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -975,7 +975,7 @@ void __fastcall CalcPlrItemVals(int p, BOOL Loadgfx)
 	}
 
 	plr[p]._pBlockFlag = 0;
-	plr[p]._pwtype = 0;
+	plr[p]._pwtype = WT_MELEE;
 
 	g = 0;
 
@@ -999,7 +999,7 @@ void __fastcall CalcPlrItemVals(int p, BOOL Loadgfx)
 		g = ANIM_ID_AXE;
 		break;
 	case ITYPE_BOW:
-		plr[p]._pwtype = 1;
+		plr[p]._pwtype = WT_RANGED;
 		g = ANIM_ID_BOW;
 		break;
 	case ITYPE_MACE:
diff --git a/Source/player.cpp b/Source/player.cpp
index e05946f7c..3b25cfbb7 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -817,9 +817,9 @@ void __fastcall InitPlayer(int pnum, BOOL FirstTime)
 		plr[pnum]._pRSplType = RSPLTYPE_INVALID;
 		plr[pnum]._pSplType = RSPLTYPE_INVALID;
 		if ((plr[pnum]._pgfxnum & 0xF) == ANIM_ID_BOW) {
-			plr[pnum]._pwtype = TRUE;
+			plr[pnum]._pwtype = WT_RANGED;
 		} else {
-			plr[pnum]._pwtype = FALSE;
+			plr[pnum]._pwtype = WT_MELEE;
 		}
 		plr[pnum].pManaShield = 0;
 	}
diff --git a/enums.h b/enums.h
index bb2004c02..f42cd41c3 100644
--- a/enums.h
+++ b/enums.h
@@ -2667,6 +2667,11 @@ typedef enum _walk_path {
 	WALK_NONE = -1,
 } _walk_path;
 
+typedef enum player_weapon_type {
+	WT_MELEE  = 0,
+	WT_RANGED = 1,
+} player_weapon_type;
+
 typedef enum item_class {
 	ICLASS_NONE   = 0,
 	ICLASS_WEAPON = 1,