Resolved some TODOs and fixed a couple of problem spots that were

forgotten.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2344

8 files changed, 99 insertions, 108 deletions

diff --git a/src/strife/d_items.c b/src/strife/d_items.c
index 8a8547bf..66bec442 100644
--- a/src/strife/d_items.c
+++ b/src/strife/d_items.c
@@ -43,117 +43,117 @@
 // flashstate, muzzle flash
 //
 
-// villsa [STRIFE] TODO - set ammo
+// villsa [STRIFE]
 weaponinfo_t	weaponinfo[NUMWEAPONS] =
 {
     {
-	// fist
-	am_noammo,
-	S_PNCH_03,
-	S_PNCH_02,
-	S_PNCH_01,
-	S_PNCH_04,
-	S_NULL,
+        // fist
+        am_noammo,
+        S_PNCH_03,
+        S_PNCH_02,
+        S_PNCH_01,
+        S_PNCH_04,
+        S_NULL,
         1
     },	
     {
-	// electric bow
-	am_elecbolts,
-	S_XBOW_02,
-	S_XBOW_01,
-	S_XBOW_00,
-	S_XBOW_03,
-	S_NULL,
+        // electric bow
+        am_elecbolts,
+        S_XBOW_02,
+        S_XBOW_01,
+        S_XBOW_00,
+        S_XBOW_03,
+        S_NULL,
         1
     },	
     {
-	// rifle
-	am_bullets,
-	S_RIFG_02,
-	S_RIFG_01,
-	S_RIFG_00,
-	S_RIFF_00,
-	S_NULL,
+        // rifle
+        am_bullets,
+        S_RIFG_02,
+        S_RIFG_01,
+        S_RIFG_00,
+        S_RIFF_00,
+        S_NULL,
         1
     },
     {
-	// missile launcher
-	am_missiles,
-	S_MMIS_02,
-	S_MMIS_01,
-	S_MMIS_00,
-	S_MMIS_03,
-	S_NULL,
+        // missile launcher
+        am_missiles,
+        S_MMIS_02,
+        S_MMIS_01,
+        S_MMIS_00,
+        S_MMIS_03,
+        S_NULL,
         0
     },
     {
-	// grenade launcher
-	am_hegrenades,
-	S_GREN_02,
-	S_GREN_01,
-	S_GREN_00,
-	S_GREN_03,
-	S_GREF_00,
+        // grenade launcher
+        am_hegrenades,
+        S_GREN_02,
+        S_GREN_01,
+        S_GREN_00,
+        S_GREN_03,
+        S_GREF_00,
         0
     },
     {
-	// flame thrower
-	am_cell,
-	S_FLMT_03,
-	S_FLMT_02,
-	S_FLMT_00,
-	S_FLMF_00,
-	S_NULL,
+        // flame thrower
+        am_cell,
+        S_FLMT_03,
+        S_FLMT_02,
+        S_FLMT_00,
+        S_FLMF_00,
+        S_NULL,
         1
     },
     {
-	// mauler
-	am_cell,
-	S_BLST_05,
-	S_BLST_04,
-	S_BLST_00,
-	S_BLSF_00,
-	S_NULL,
+        // mauler
+        am_cell,
+        S_BLST_05,
+        S_BLST_04,
+        S_BLST_00,
+        S_BLSF_00,
+        S_NULL,
         0
     },
     {
-	// sigil
-	am_noammo,
-	S_SIGH_06,
-	S_SIGH_05,
-	S_SIGH_00,
-	S_SIGH_07,
-	S_SIGF_00,
+        // sigil
+        am_noammo,
+        S_SIGH_06,
+        S_SIGH_05,
+        S_SIGH_00,
+        S_SIGH_07,
+        S_SIGF_00,
         0
     },
     {
-	// poison bow
-	am_poisonbolts,
-	S_XBOW_15,
-	S_XBOW_14,
-	S_XBOW_13,
-	S_XBOW_16,
-	S_NULL,
+        // poison bow
+        am_poisonbolts,
+        S_XBOW_15,
+        S_XBOW_14,
+        S_XBOW_13,
+        S_XBOW_16,
+        S_NULL,
         1
     },
     {
-	// wp grenade launcher
-	am_wpgrenades,
-	S_GREN_10,
-	S_GREN_09,
-	S_GREN_08,
-	S_GREN_11,
-	S_GREF_03,
+        // wp grenade launcher
+        am_wpgrenades,
+        S_GREN_10,
+        S_GREN_09,
+        S_GREN_08,
+        S_GREN_11,
+        S_GREF_03,
         0
     },
     {
-	// torpedo
-	am_cell,
-	S_BLST_18,
-	S_BLST_17,
-	S_BLST_13,
-	S_BLST_19,
-	S_NULL,
+        // torpedo
+        am_cell,
+        S_BLST_18,
+        S_BLST_17,
+        S_BLST_13,
+        S_BLST_19,
+        S_NULL,
         0
     },	
 };
diff --git a/src/strife/g_game.c b/src/strife/g_game.c
index c9d49c18..43fe827b 100644
--- a/src/strife/g_game.c
+++ b/src/strife/g_game.c
@@ -570,8 +570,8 @@ void G_BuildTiccmd (ticcmd_t* cmd)
     // buttons
     cmd->chatchar = HU_dequeueChatChar(); 
 
-    // villsa [STRIFE] TODO - add mouse button support for jump
-    if(gamekeydown[key_jump] /*|| mousebuttons[mousebjump]*/)
+    // villsa [STRIFE] - add mouse button support for jump
+    if(gamekeydown[key_jump] || mousebuttons[mousebjump])
         cmd->buttons2 |= BT2_JUMP;
  
     // villsa [STRIFE]: Moved mousebuttons[mousebfire] to below
@@ -1558,7 +1558,7 @@ void G_DoCompleted (void)
     {
         if(playeringame[i])
         {
-            // STRIFE-TODO: not quite sure why it does this
+            // [STRIFE] restore pw_allmap power from mapstate cache
             if(destmap < 40)
                 players[i].powers[pw_allmap] = players[i].mapstate[destmap];
 
@@ -2484,8 +2484,6 @@ void G_TimeDemo (char* name)
 
     nodrawers = M_CheckParm ("-nodraw"); 
 
-    // haleyjd: STRIFE-TODO: where's -noblit?
-
     timingdemo = true; 
     singletics = true; 
 
diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c
index 972e5b75..1fb3eeaf 100644
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -993,8 +993,7 @@ void M_VoiceVol(int choice)
         break;
     }
 
-    // STRIFE-TODO: Voice volume setting
-    //S_SetVoiceVolume(voiceVolume * 8);
+    S_SetVoiceVolume(voiceVolume * 8);
 }
 
 void M_MusicVol(int choice)
diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c
index 01887686..88c01f16 100644
--- a/src/strife/p_dialog.c
+++ b/src/strife/p_dialog.c
@@ -2,7 +2,7 @@
 //-----------------------------------------------------------------------------

 //

 // Copyright(C) 1993-1996 Id Software, Inc.

-// Copyright(C) 2010 James Haley, Samuel Villareal

+// Copyright(C) 2010 James Haley, Samuel Villarreal

 //

 // This program is free software; you can redistribute it and/or

 // modify it under the terms of the GNU General Public License

@@ -99,22 +99,22 @@ static int numscript0dialogs;
 

 // The player engaged in dialog. This is always player 1, though, since Rogue

 // never completed the ability to use dialog outside of single-player mode.

-player_t *dialogplayer;

+static player_t *dialogplayer;

 

 // The object to which the player is speaking.

-mobj_t   *dialogtalker;

+static mobj_t   *dialogtalker;

 

 // The talker's current angle

-angle_t dialogtalkerangle;

+static angle_t dialogtalkerangle;

 

 // The currently active mapdialog object.

 static mapdialog_t *currentdialog;

 

 // Text at the end of the choices

-char dialoglastmsgbuffer[48];

+static char dialoglastmsgbuffer[48];

 

 // Item to display to player when picked up or recieved

-char pickupstring[46];

+static char pickupstring[46];

 

 // Health based on gameskill given by the front's medic

 static const int healthamounts[] = { -100 , -75, -50, -50, -100 };

@@ -1371,8 +1371,8 @@ void P_DialogStart(player_t *player)
 

     // setup dialog menu

     M_StartControlPanel();

-    menupause = 0;

-    menuindialog = 1;

+    menupause = false;

+    menuindialog = true;

     menupausetime = gametic + 17;

     currentMenu = &dialogmenu;

 

diff --git a/src/strife/p_enemy.c b/src/strife/p_enemy.c
index 631ca58b..79e6ffb8 100644
--- a/src/strife/p_enemy.c
+++ b/src/strife/p_enemy.c
@@ -2595,7 +2595,7 @@ void A_ZombieInSpecialSector(mobj_t* actor)
     int tagval;
 
     sector = actor->subsector->sector;
-    if(actor->z != sector->floorheight) // [STRIFE] TODO - verify
+    if(actor->z != sector->floorheight)
         return;
 
     if(sector->special <= 15)
diff --git a/src/strife/p_spec.c b/src/strife/p_spec.c
index e26d9144..e59a5b05 100644
--- a/src/strife/p_spec.c
+++ b/src/strife/p_spec.c
@@ -622,9 +622,9 @@ P_CrossSpecialLine
         switch(line->special)
         {
         case 97:        // TELEPORT RETRIGGER
-        case 185:       // haleyjd: STRIFE-TODO: Identify type
-        case 195:       // haleyjd: STRIFE-TODO: Identify type
-        case 231:       // haleyjd: STRIFE-TODO: Identify type
+        case 185:       // haleyjd: [STRIFE] Silent Teleport (used for Converter)
+        case 195:       // haleyjd: [STRIFE] Silent Teleport and Change Zombie
+        case 231:       // haleyjd: [STRIFE] WR Teleport (Silent at Source)
         case 125:       // TELEPORT MONSTERONLY TRIGGER
         case 126:       // TELEPORT MONSTERONLY RETRIGGER
         case 182:       // haleyjd: [STRIFE] Break glass - it's a W1 type too!
@@ -1978,7 +1978,7 @@ void P_SpawnSpecials (void)
         switch(lines[i].special)
         {
         case 48:  // EFFECT FIRSTCOL SCROLL+
-        case 142: // [STRIFE] TODO: verify scroll types
+        case 142:
         case 143:
         case 149:
             linespeciallist[numlinespecials] = &lines[i];
diff --git a/src/strife/p_user.c b/src/strife/p_user.c
index 718eb119..af03e81f 100644
--- a/src/strife/p_user.c
+++ b/src/strife/p_user.c
@@ -494,7 +494,7 @@ void P_PlayerThink (player_t* player)
                         player->pendingweapon = wp_wpgrenade;
                     }
 
-                    // villsa [STRIFE] TODO - no check for mauler/torpedo??
+                    // villsa [STRIFE] - no check for mauler/torpedo??
                 }
             }
         }
diff --git a/src/strife/st_stuff.c b/src/strife/st_stuff.c
index 7ba3bcec..b43ed09d 100644
--- a/src/strife/st_stuff.c
+++ b/src/strife/st_stuff.c
@@ -226,7 +226,7 @@ static patch_t*         invfontg[10];
 // 0-9, yellow numbers
 static patch_t*         invfonty[10];
 
-// 3 key-cards, 3 skulls -- STRIFE-TODO: This is handled differently
+// 3 key-cards, 3 skulls -- [STRIFE] has a lot more keys than 3 :P
 static patch_t*         keys[NUMCARDS]; 
 
 // ready-weapon widget
@@ -432,7 +432,6 @@ boolean ST_Responder(event_t* ev)
                 st_showinvpop = netgame;
                 st_keypage = -1;
 
-                // villsa [STRIFE] TODO - verify this logic
                 st_popupdisplaytics = ev->data2 ^ key_mission;
 
                 st_showobjective = true;
@@ -1109,10 +1108,7 @@ void ST_doRefresh(void)
     }
 }
 
-void ST_diffDraw(void)
-{
-    // haleyjd: STRIFE-TODO: Needed?
-}
+// haleyjd [STRIFE]: Removed ST_diffDraw
 
 void ST_Drawer (boolean fullscreen, boolean refresh)
 {
@@ -1122,12 +1118,10 @@ void ST_Drawer (boolean fullscreen, boolean refresh)
     // Do red-/gold-shifts from damage/items
     ST_doPaletteStuff();
 
-    // haleyjd 09/01/10: STRIFE-TODO: work out statbar details
-
     // If just after ST_Start(), refresh all
     ST_doRefresh();
     // Otherwise, update as little as possible
-    ST_diffDraw();
+    //ST_diffDraw(); [STRIFE]: nope
 }
 
 //