From 808f6fd842f581f31aa0d91617a759af46fdc732 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Mon, 7 Feb 2011 01:50:40 +0000
Subject: Added graphical intro loading screen, and -nograph parameter which
 disables it. Made most D_DoomMain messages dependent on -devparm.
 wipegamestate should start == 1, which is currently GS_UNKNOWN. Changed -wart
 behavior. Verified *no* changes in Strife to p_sight.c.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2251
---
 src/strife/p_inter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c
index a2d1dcc2..10559d8f 100644
--- a/src/strife/p_inter.c
+++ b/src/strife/p_inter.c
@@ -1209,8 +1209,8 @@ void P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source, int damage)
     if (inflictor
         && !(target->flags & MF_NOCLIP)
         && (!source
-        || !source->player
-        || source->player->readyweapon != wp_flame))
+         || !source->player
+         || source->player->readyweapon != wp_flame))
     {
         ang = R_PointToAngle2(inflictor->x,
                               inflictor->y,
-- 
cgit v1.2.3