From 5f9fe97f7cfedec45fb8cf599d2c52eb69e76027 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Mon, 27 Sep 2010 17:40:54 +0000
Subject: Code for line types 196 and 212 (thought I committed that already
 o_O), and code to transfer leveltime across map changes in G_DoWorldDone.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2144
---
 src/strife/p_pspr.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/strife/p_pspr.c')

diff --git a/src/strife/p_pspr.c b/src/strife/p_pspr.c
index ce03b6b7..fb6d3990 100644
--- a/src/strife/p_pspr.c
+++ b/src/strife/p_pspr.c
@@ -560,11 +560,8 @@ void A_FireGrenade(player_t* player, pspdef_t* pspr)
     // decide on what type of grenade to spawn
     if(player->readyweapon == wp_hegrenade)
         type = MT_HEGRENADE;
-    else
-    {
-        if(player->readyweapon == wp_wpgrenade)
-            type = MT_PGRENADE;
-    }
+    else if(player->readyweapon == wp_wpgrenade)
+        type = MT_PGRENADE;
 
     player->ammo[weaponinfo[player->readyweapon].ammo]--;
 
@@ -749,8 +746,8 @@ void A_FireMauler1(player_t* player, pspdef_t* pspr)
             t = P_Random();
             angle += (t - P_Random()) << 19;
             t = P_Random();
-            P_LineAttack(player->mo, angle, (2112*FRACUNIT),
-                bulletslope + ((t - P_Random())<<5), damage);
+            P_LineAttack(player->mo, angle, 2112*FRACUNIT,
+                         bulletslope + ((t - P_Random())<<5), damage);
         }
     }
 }
-- 
cgit v1.2.3