diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 4db61130a..d6bf2c3d0 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -58,7 +58,7 @@ int frameend;
 int framerate;
 int framestart;
 #endif
-int FriendlyMode = 1; // weak
+BOOL FriendlyMode = TRUE;
 char *spszMsgTbl[4] =
 {
   "I need help! Come Here!",
diff --git a/Source/diablo.h b/Source/diablo.h
index 954edd970..e15c8543a 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -95,7 +95,7 @@ extern int frameend;
 extern int framerate;
 extern int framestart;
 #endif
-extern int FriendlyMode; // weak
+extern BOOL FriendlyMode;
 extern char *spszMsgTbl[4]; // weak
 extern char *spszMsgKeyTbl[4]; // weak
 
diff --git a/Source/monster.cpp b/Source/monster.cpp
index a78f29122..6ab684a4e 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -8783,21 +8783,17 @@ void __fastcall SpawnGolum(int i, int x, int y, int mi)
 	}
 }
 
-bool __fastcall CanTalkToMonst(int m)
+BOOL __fastcall CanTalkToMonst(int m)
 {
-	int v1; // esi
-	char v2; // al
-	bool result; // al
-
-	v1 = m;
-	if ( (unsigned int)m >= MAXMONSTERS )
+	if ( (DWORD)m >= MAXMONSTERS ) {
 		TermMsg("CanTalkToMonst: Invalid monster %d", m);
-	v2 = monster[v1]._mgoal;
-	if ( v2 == 6 )
-		result = 1;
-	else
-		result = v2 == 7;
-	return result;
+	}
+
+	if (monster[m]._mgoal == 6) {
+		return TRUE;
+	}
+
+	return monster[m]._mgoal == 7;
 }
 
 BOOL __fastcall CheckMonsterHit(int m, BOOL *ret)
diff --git a/Source/monster.h b/Source/monster.h
index 783a0ae8f..89507c09f 100644
--- a/Source/monster.h
+++ b/Source/monster.h
@@ -158,7 +158,7 @@ bool __fastcall SpawnSkeleton(int ii, int x, int y);
 int __cdecl PreSpawnSkeleton();
 void __fastcall TalktoMonster(int i);
 void __fastcall SpawnGolum(int i, int x, int y, int mi);
-bool __fastcall CanTalkToMonst(int m);
+BOOL __fastcall CanTalkToMonst(int m);
 BOOL __fastcall CheckMonsterHit(int m, BOOL *ret);
 int __fastcall encode_enemy(int m);
 void __fastcall decode_enemy(int m, int enemy);
diff --git a/Source/player.cpp b/Source/player.cpp
index 022683f5f..1cb10a36c 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -2474,7 +2474,7 @@ BOOL __fastcall WeaponDur(int pnum, int durrnd)
 	return FALSE;
 }
 
-bool __fastcall PlrHitMonst(int pnum, int m)
+BOOL __fastcall PlrHitMonst(int pnum, int m)
 {
 	int v2; // ebx
 	unsigned int v3; // esi
@@ -2817,116 +2817,87 @@ BOOL __fastcall PlrHitObj(int pnum, int mx, int my)
 
 BOOL __fastcall PM_DoAttack(int pnum)
 {
-	int v1; // esi
-	int v2; // esi
-	int v3; // ecx
-	int v4; // eax
-	int v5; // eax
-	int v6; // ebx
-	int v7; // edi
-	int v8; // eax
-	int v9; // edx
-	int v10; // ecx
-	//int v11; // eax
-	int v12; // edx
-	int v13; // eax
-	bool v14; // eax
-	int v15; // edx
-	char v16; // al
-	//int v17; // eax
-	int v19; // [esp+Ch] [ebp-8h]
-	int arglist; // [esp+10h] [ebp-4h]
-
-	v1 = pnum;
-	arglist = pnum;
-	if ( (unsigned int)pnum >= MAX_PLRS )
+	if ( (DWORD)pnum >= MAX_PLRS ) {
 		TermMsg("PM_DoAttack: illegal player %d", pnum);
-	v2 = v1;
-	v3 = plr[v2]._pIFlags;
-	v4 = plr[v2]._pAnimFrame;
-	if ( v3 & 0x20000 && v4 == 1 ) // quick attack
-		plr[v2]._pAnimFrame = 2;
-	if ( v3 & 0x40000 && (v4 == 1 || v4 == 3) ) // fast attack
-		++plr[v2]._pAnimFrame;
-	if ( v3 & 0x80000 && (v4 == 1 || v4 == 3 || v4 == 5) ) // faster attack
-		++plr[v2]._pAnimFrame;
-	if ( v3 & 0x100000 && (v4 == 1 || v4 == 4) ) // fastest attack
-		plr[v2]._pAnimFrame += 2;
-	if ( plr[v2]._pAnimFrame == plr[v2]._pAFNum - 1 )
-		PlaySfxLoc(PS_SWING, plr[v2].WorldX, plr[v2].WorldY);
-	if ( plr[v2]._pAnimFrame != plr[v2]._pAFNum )
-		goto LABEL_49;
-	v5 = plr[v2]._pdir;
-	v6 = plr[v2].WorldX + offset_x[v5];
-	v7 = plr[v2].WorldY + offset_y[v5];
-	v8 = v7 + 112 * v6;
-	v19 = v8;
-	v9 = dMonster[0][v8];
-	if ( !v9 )
-	{
-LABEL_29:
-		if ( plr[v2]._pIFlags & 0x10 )
-		{
-			AddMissile(v6, v7, 1, 0, 0, MIS_WEAPEXP, 0, arglist, 0, 0);
-			v8 = v19;
+	}
+
+	int frame = plr[pnum]._pAnimFrame;
+	if ( plr[pnum]._pIFlags & ISPL_QUICKATTACK && frame == 1 ) {
+		plr[pnum]._pAnimFrame++;
+	}
+	if ( plr[pnum]._pIFlags & ISPL_FASTATTACK && (frame == 1 || frame == 3) ) {
+		plr[pnum]._pAnimFrame++;
+	}
+	if ( plr[pnum]._pIFlags & ISPL_FASTERATTACK && (frame == 1 || frame == 3 || frame == 5) ) {
+		plr[pnum]._pAnimFrame++;
+	}
+	if ( plr[pnum]._pIFlags & ISPL_FASTESTATTACK && (frame == 1 || frame == 4) ) {
+		plr[pnum]._pAnimFrame += 2;
+	}
+	if ( plr[pnum]._pAnimFrame == plr[pnum]._pAFNum - 1 ) {
+		PlaySfxLoc(PS_SWING, plr[pnum].WorldX, plr[pnum].WorldY);
+	}
+
+	if ( plr[pnum]._pAnimFrame == plr[pnum]._pAFNum ) {
+		int dir = plr[pnum]._pdir;
+		int dx = plr[pnum].WorldX + offset_x[dir];
+		int dy = plr[pnum].WorldY + offset_y[dir];
+
+		int m;
+		if (dMonster[dx][dy]) {
+			if ( dMonster[dx][dy] > 0 ) {
+				m = dMonster[dx][dy] - 1;
+			} else {
+				m = -(dMonster[dx][dy] + 1);
+			}
+			if ( CanTalkToMonst(m) ) {
+				plr[pnum]._pVar1 = 0;
+				return FALSE;
+			}
 		}
-		if ( plr[v2]._pIFlags & 0x20 )
-		{
-			AddMissile(v6, v7, 2, 0, 0, MIS_WEAPEXP, 0, arglist, 0, 0);
-			v8 = v19;
+
+		if ( plr[pnum]._pIFlags & ISPL_FIREDAM ) {
+			AddMissile(dx, dy, 1, 0, 0, MIS_WEAPEXP, 0, pnum, 0, 0);
 		}
-		v12 = dMonster[0][v8];
-		if ( v12 )
-		{
-			if ( v12 <= 0 )
-				v13 = -1 - v12;
-			else
-				v13 = v12 - 1;
-			v14 = PlrHitMonst(arglist, v13);
-			goto LABEL_46;
+		if ( plr[pnum]._pIFlags & ISPL_LIGHTDAM ) {
+			AddMissile(dx, dy, 2, 0, 0, MIS_WEAPEXP, 0, pnum, 0, 0);
 		}
-		v15 = (unsigned char)dPlayer[0][v8];
-		if ( (_BYTE)v15 && !FriendlyMode )
-		{
-			if ( (char)v15 <= 0 )
-				v16 = -1 - v15;
-			else
-				v16 = v15 - 1;
-			v14 = PlrHitPlr(arglist, v16);
-LABEL_46:
-			if ( v14 )
-			{
-				//_LOBYTE(v17) = WeaponDur(arglist, 30);
-				if ( WeaponDur(arglist, 30) )
-					goto LABEL_48;
+
+		BOOL didhit = FALSE;
+		if ( dMonster[dx][dy] ) {
+			m = dMonster[dx][dy];
+			if ( dMonster[dx][dy] > 0 ) {
+				m = dMonster[dx][dy] - 1;
+			} else {
+				m = -(dMonster[dx][dy] + 1);
 			}
-			goto LABEL_49;
+			didhit = PlrHitMonst(pnum, m);
+		} else if ( dPlayer[dx][dy] && !FriendlyMode ) {
+			UCHAR p = dPlayer[dx][dy];
+			if ( dPlayer[dx][dy] > 0 ) {
+				p = dPlayer[dx][dy] - 1;
+			} else {
+				p = -(dPlayer[dx][dy] + 1);
+			}
+			didhit = PlrHitPlr(pnum, p);
+		} else if ( dObject[dx][dy] > 0 ) {
+			didhit = PlrHitObj(pnum, dx, dy);
 		}
-		if ( dObject[0][v8] > 0 )
-		{
-			v14 = PlrHitObj(arglist, v6, v7);
-			goto LABEL_46;
+
+		if ( didhit && WeaponDur(pnum, 30) ) {
+			StartStand(pnum, plr[pnum]._pdir);
+			ClearPlrPVars(pnum);
+			return TRUE;
 		}
-LABEL_49:
-		if ( plr[v2]._pAnimFrame != plr[v2]._pAFrames )
-			return 0;
-LABEL_48:
-		StartStand(arglist, plr[v2]._pdir);
-		ClearPlrPVars(arglist);
-		return 1;
-	}
-	if ( v9 <= 0 )
-		v10 = -1 - v9;
-	else
-		v10 = v9 - 1;
-	//_LOBYTE(v11) = CanTalkToMonst(v10);
-	if ( !CanTalkToMonst(v10) )
-	{
-		v8 = v19;
-		goto LABEL_29;
 	}
-	plr[v2]._pVar1 = 0;
-	return 0;
+
+	if ( plr[pnum]._pAnimFrame == plr[pnum]._pAFrames ) {
+		StartStand(pnum, plr[pnum]._pdir);
+		ClearPlrPVars(pnum);
+		return TRUE;
+	} else {
+		return FALSE;
+	}
 }
 // 484368: using guessed type int FriendlyMode;
 
@@ -2981,7 +2952,6 @@ BOOL __fastcall PM_DoRangeAttack(int pnum)
 	} else {
 		return FALSE;
 	}
-
 }
 
 void __fastcall ShieldDur(int pnum)
diff --git a/Source/player.h b/Source/player.h
index 0adccbeb9..72bf16b29 100644
--- a/Source/player.h
+++ b/Source/player.h
@@ -74,7 +74,7 @@ BOOL __fastcall PM_DoWalk(int pnum);
 BOOL __fastcall PM_DoWalk2(int pnum);
 BOOL __fastcall PM_DoWalk3(int pnum);
 BOOL __fastcall WeaponDur(int pnum, int durrnd);
-bool __fastcall PlrHitMonst(int pnum, int m);
+BOOL __fastcall PlrHitMonst(int pnum, int m);
 BOOL __fastcall PlrHitPlr(int pnum, char p);
 BOOL __fastcall PlrHitObj(int pnum, int mx, int my);
 BOOL __fastcall PM_DoAttack(int pnum);