diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index dfd4f46f2..1d1a1330f 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -517,18 +517,18 @@ glabel var7f1b90a0 /* f19a298: 00000000 */ sll $zero,$zero,0x0 ); -bool func0f19a29c(u32 value, bool fallback) +bool func0f19a29c(u32 weaponnum, bool is_secondary) { - switch (value) { - case 14: - case 15: - case 26: - return fallback; - case 30: - case 31: - case 32: - case 33: - case 34: + switch (weaponnum) { + case WEAPON_LAPTOPGUN: + case WEAPON_DRAGON: + case WEAPON_COMBATKNIFE: + return is_secondary; + case WEAPON_GRENADE: + case WEAPON_NBOMB: + case WEAPON_TIMEDMINE: + case WEAPON_PROXIMITYMINE: + case WEAPON_REMOTEMINE: return true; } diff --git a/src/include/game/game_1999b0.h b/src/include/game/game_1999b0.h index 400521a3d..0d3fe7330 100644 --- a/src/include/game/game_1999b0.h +++ b/src/include/game/game_1999b0.h @@ -12,7 +12,7 @@ s32 func0f199d70(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 qty); void aibotGiveAmmoByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 qty); void aibotGiveAmmoByType(struct aibot *aibot, u32 ammotype, s32 quantity); u32 func0f199f84(void); -bool func0f19a29c(u32 value, bool fallback); +bool func0f19a29c(u32 weaponnum, bool is_secondary); u32 func0f19a2dc(u32 value); u32 ammotypeGetWeapon(u32 ammotype); u32 func0f19a37c(void);