Merge pull request chocolate-doom#1461 from turol/fix-warning

Fix "array subscript is above array bounds" warning in strife
kenhawkins · May 31, 2022 · f6824b1 · f6824b1
2 parents a1f5d18 + 3b1f389
commit f6824b1
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c
@@ -354,7 +354,8 @@ boolean P_GivePower(player_t* player, powertype_t power)
         return false;
 
     // villsa [STRIFE]
-    if(power == pw_targeter)
+    switch (power) {
+    case pw_targeter:
     {
         player->powers[power] = TARGTICS;
         P_SetPsprite(player, ps_targcenter, S_TRGT_00); // 10
@@ -368,7 +369,7 @@ boolean P_GivePower(player_t* player, powertype_t power)
         return true;
     }
 
-    if(power == pw_invisibility)
+    case pw_invisibility:
     {
         // if player already had this power...
         if(player->powers[power])
@@ -386,21 +387,21 @@ boolean P_GivePower(player_t* player, powertype_t power)
         return true;
     }
 
-    if(power == pw_ironfeet)
+    case pw_ironfeet:
     {
         player->powers[power] = IRONTICS;
         return true;
     }
 
-    if(power == pw_strength)
+    case pw_strength:
     {
         P_GiveBody(player, 100);
         player->powers[power] = 1;
         return true;
     }
 
     // villsa [STRIFE]
-    if(power == pw_allmap)
+    case pw_allmap:
     {
         // remember in mapstate
         if(gamemap < 40)
@@ -411,14 +412,17 @@ boolean P_GivePower(player_t* player, powertype_t power)
     }
 
     // villsa [STRIFE]
-    if(power == pw_communicator)
+    case pw_communicator:
     {
         player->powers[power] = 1;
         return true;
     }
 
-    // default behavior:
-    player->powers[power] = 1;
+    case NUMPOWERS:
+        // This should never actually happen
+        break;
+    }
+
     return true;
 }