From d8a26fa2211d9ffeead8894a23ca3b4f1b2be0dd Mon Sep 17 00:00:00 2001
From: fgsfds <derp.primus@gmail.com>
Date: Tue, 14 May 2024 10:56:50 +0200
Subject: [PATCH] port: clean up whitespace

---
 src/game/cheats.c      |  2 +-
 src/game/game_0b0fd0.c | 14 ++++++++------
 src/game/inv.c         | 14 +++++++-------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/game/cheats.c b/src/game/cheats.c
index 260a390b3..4567f5e30 100644
--- a/src/game/cheats.c
+++ b/src/game/cheats.c
@@ -101,7 +101,7 @@ struct cheat g_Cheats[] = {
 	{ L_MPWEAPONS_115, WEAPON_AR53,       0,                             0,       CHEATFLAG_FIRINGRANGE                        }, // AR53
 	{ L_MPWEAPONS_116, WEAPON_RCP45,      0,                             0,       CHEATFLAG_FIRINGRANGE                        }, // RC-P45
 #ifndef PLATFORM_N64
-	{ L_MPWEAPONS_215, 0,                 SOLOSTAGEINDEX_EXTRACTION,     DIFF_A,  CHEATFLAG_COMPLETION                         }, // dual wield all guns cheat
+	{ L_MPWEAPONS_215, 0,                 SOLOSTAGEINDEX_EXTRACTION,     DIFF_A,  CHEATFLAG_COMPLETION                         }, // Dual wield all guns
 #endif
 };
 
diff --git a/src/game/game_0b0fd0.c b/src/game/game_0b0fd0.c
index d30a54946..3747c37a4 100644
--- a/src/game/game_0b0fd0.c
+++ b/src/game/game_0b0fd0.c
@@ -286,16 +286,18 @@ void currentPlayerZoomIn(f32 fovpersec)
 bool weaponHasFlag(s32 itemid, u32 flag)
 {
 	struct weapon *weapon = weaponFindById(itemid);
-#ifndef PLATFORM_N64 //always return, that weapon is dual-wieldable if player sets the cheat. 
-	if (cheatIsActive(CHEAT_DUALWIELDALLGUNS) && (flag == WEAPONFLAG_DUALWIELD))
-	{
-		return true;
-	}
-#endif
+
 	if (!weapon) {
 		return false;
 	}
 
+#ifndef PLATFORM_N64
+	// always dual-wieldable if cheat is enabled
+	if (cheatIsActive(CHEAT_DUALWIELDALLGUNS) && (flag == WEAPONFLAG_DUALWIELD)) {
+		return true;
+	}
+#endif
+
 	return (weapon->flags & flag) != 0;
 }
 
diff --git a/src/game/inv.c b/src/game/inv.c
index 3cba713e1..04fce4a8a 100644
--- a/src/game/inv.c
+++ b/src/game/inv.c
@@ -510,14 +510,14 @@ s32 invGiveWeaponsByProp(struct prop *prop)
 			weapon = prop->weapon;
 			weaponnum = weapon->weaponnum;
 			otherweaponnum;
+
 #ifndef PLATFORM_N64
-			//This piece of code makes the cheat work in singleplayer. 
-			if (cheatIsActive(CHEAT_DUALWIELDALLGUNS) && !g_Vars.normmplayerisrunning)
-			{
-				if(invHasSingleWeaponExcAllGuns(weaponnum) && (invHasDoubleWeaponExcAllGuns(weapon->weaponnum, weapon->weaponnum)==0))
-				{
-					invGiveDoubleWeapon(weaponnum, weaponnum);
-					numgiven = 2;
+			// always allow picking up a second gun if dual wield cheat is on
+			if (!g_Vars.normmplayerisrunning && cheatIsActive(CHEAT_DUALWIELDALLGUNS)) {
+				if (invHasSingleWeaponExcAllGuns(weaponnum) && !invHasDoubleWeaponExcAllGuns(weaponnum, weaponnum)) {
+					if (invGiveDoubleWeapon(weaponnum, weaponnum)) {
+						return 2;
+					}
 				}
 			}
 #endif