From 17333436188f63319625b007489c7b70029bfaba Mon Sep 17 00:00:00 2001
From: James Haley
Date: Sun, 6 Feb 2011 17:38:54 +0000
Subject: Numerous fixes/adjustments: removed bodyque, restored "is turbo"
 (found it in there after all), removed some dead code in p_dialog, added a
 'default: break;' case in EV_VerticalDoor, initialize player_t::allegiance in
 P_SetupLevel, minor changes to EV_Teleport, 2nd-pass verification for p_tick,
 and big fixes in p_user.c including noclip cheat, viewz clipping against
 floor, air control thrust amount, and missing/incorrect else's.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2250
---
 src/strife/p_dialog.c | 76 +++------------------------------------------------
 1 file changed, 4 insertions(+), 72 deletions(-)

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

diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c
index a3a3b6e3..77d48c0e 100644
--- a/src/strife/p_dialog.c
+++ b/src/strife/p_dialog.c
@@ -2,7 +2,6 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1996 Rogue Entertainment / Velocity, Inc.
 // Copyright(C) 2010 James Haley, Samuel Villareal
 //
 // This program is free software; you can redistribute it and/or
@@ -138,7 +137,7 @@ typedef struct dialogstateset_s
 
 static dialogstateset_t dialogstatesets[] =
 {
-    { MT_PLAYER,       S_NULL,     S_NULL,   S_NULL    },
+    { MT_PLAYER,       S_NULL,    S_NULL,    S_NULL    },
     { MT_SHOPKEEPER_W, S_MRGT_00, S_MRYS_00, S_MRNO_00 },
     { MT_SHOPKEEPER_B, S_MRGT_00, S_MRYS_00, S_MRNO_00 },
     { MT_SHOPKEEPER_A, S_MRGT_00, S_MRYS_00, S_MRNO_00 },
@@ -558,7 +557,6 @@ mapdialog_t *P_DialogFind(mobjtype_t type, int jumptoconv)
 // [STRIFE] New function
 // haleyjd 09/03/10: Find the set of special dialog states (greetings, yes, no)
 // for a particular thing type.
-// STRIFE-TODO: Or is it a conversation ID?
 //
 static dialogstateset_t *P_DialogGetStates(mobjtype_t type)
 {
@@ -984,75 +982,6 @@ boolean P_GiveItemToPlayer(player_t *player, int sprnum, mobjtype_t type)
         S_StartSound(NULL, sound);
 
     return true;
-
-    // check for other types
-    /*
-    switch(type)
-    {
-    // severed hand
-
-    // 300 gold
-
-    // ammo refill (at training)
-
-    // health refill (at front HQ)
-
-    // alarm
-
-    // door special 1
-
-    // door special 2
-
-    // door special 3
-
-    // door special 4
-
-    // stamina upgrade
-
-    // slideshow
-
-    default:
-        // check for sprites if no specific type is found
-        switch(sprnum)
-        {
-            // bullets
-
-            // box of bullets
-
-            // missile
-
-            // box of missiles
-
-            // battery
-
-
-
-            // backpack
-
-            // communicator
-
-
-            // rifle
-
-            // flame thrower
-
-            // missile launcher
-
-            // mauler
-
-
-            // misc item
-        default:
-            if(!P_GiveInventoryItem(player, sprnum, type))
-                return false;
-            break;
-        }
-        break;
-    }
-
-    S_StartSound(player->mo, sfx_itemup);
-    return true;
-    */
 }
 
 //
@@ -1479,3 +1408,6 @@ void P_DialogStart(player_t *player)
                  "%d) %s", i + 1, byetext);
 }
 
+// EOF
+
+
-- 
cgit v1.2.3