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

forgotten.

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

1 files changed, 78 insertions, 78 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
     },	
 };