Minor tweaks

bradharding · Sep 5, 2015 · f554998 · f554998
1 parent c6791b7
commit f554998
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/d_deh.c b/src/d_deh.c
@@ -1715,7 +1715,7 @@ static const deh_bexptr deh_bexptrs[] =
   { A_Stop,            "A_Stop"            },
 
   // This NULL entry must be the last in the list
-  { NULL,            "A_NULL"          }        // Ty 05/16/98
+  { NULL,              "A_NULL"            }    // Ty 05/16/98
 };
 
 // to hold startup code pointers from INFO.C
@@ -2210,15 +2210,13 @@ void deh_procPointer(DEHFILE *fpin, char *line)
 
             // Write BEX-oriented line to match:
             for (i = 0; i < sizeof(deh_bexptrs) / sizeof(*deh_bexptrs); i++)
-            {
                 if (!memcmp(&deh_bexptrs[i].cptr, &deh_codeptr[value], sizeof(actionf_t)))
                 {
                     if (devparm)
                         C_Output("BEX [CODEPTR] -> FRAME %d = %s",
                             indexnum, &deh_bexptrs[i].lookup[2]);
                     break;
                 }
-            }
         }
         else
             C_Warning("Invalid frame pointer index for \"%s\" at %ld, xref %p.",

diff --git a/src/p_pspr.c b/src/p_pspr.c
@@ -638,8 +638,7 @@ void A_FireCGun(player_t *player, pspdef_t *psp)
 {
     if (player->ammo[weaponinfo[player->readyweapon].ammo])
         S_StartSound(player->mo, sfx_pistol);
-
-    if (!player->ammo[weaponinfo[player->readyweapon].ammo])
+    else
         return;
 
     P_SetMobjState(player->mo, S_PLAY_ATK2);