summaryrefslogtreecommitdiff
path: root/src/strife/d_items.c
diff options
context:
space:
mode:
authorSamuel Villareal2010-09-04 04:06:10 +0000
committerSamuel Villareal2010-09-04 04:06:10 +0000
commit583406a2ba2a10bfe0e654a0ede285da46c9bd88 (patch)
tree1451231cce840aafdb8e3a6f10290bac81e40a39 /src/strife/d_items.c
parent8761422d31fdceb685b292a780727f3ad1d950db (diff)
downloadchocolate-doom-583406a2ba2a10bfe0e654a0ede285da46c9bd88.tar.gz
chocolate-doom-583406a2ba2a10bfe0e654a0ede285da46c9bd88.tar.bz2
chocolate-doom-583406a2ba2a10bfe0e654a0ede285da46c9bd88.zip
+ Map flags for things added (MTF_*)
+ A_FireGrenade and A_MissileTick codepointers added + Step up height changed to 16*FRACUNIT (non-human things are excluded) + Fixed bug in P_MovePlayer where player cannot climb over things when pressing forward and jumping. Missed a line of code for this + P_SpawnSubMissile renamed to P_SpawnFaceMissile + P_SpawnMortar added + Ammo types added + Fixed some inaccuracies in P_SpawnBlood Subversion-branch: /branches/strife-branch Subversion-revision: 2008
Diffstat (limited to 'src/strife/d_items.c')
-rw-r--r--src/strife/d_items.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/strife/d_items.c b/src/strife/d_items.c
index d9da946e..8a8547bf 100644
--- a/src/strife/d_items.c
+++ b/src/strife/d_items.c
@@ -58,7 +58,7 @@ weaponinfo_t weaponinfo[NUMWEAPONS] =
},
{
// electric bow
- am_clip,
+ am_elecbolts,
S_XBOW_02,
S_XBOW_01,
S_XBOW_00,
@@ -68,7 +68,7 @@ weaponinfo_t weaponinfo[NUMWEAPONS] =
},
{
// rifle
- am_shell,
+ am_bullets,
S_RIFG_02,
S_RIFG_01,
S_RIFG_00,
@@ -78,7 +78,7 @@ weaponinfo_t weaponinfo[NUMWEAPONS] =
},
{
// missile launcher
- am_clip,
+ am_missiles,
S_MMIS_02,
S_MMIS_01,
S_MMIS_00,
@@ -88,12 +88,12 @@ weaponinfo_t weaponinfo[NUMWEAPONS] =
},
{
// grenade launcher
- am_misl,
+ am_hegrenades,
S_GREN_02,
S_GREN_01,
S_GREN_00,
S_GREN_03,
- 103,
+ S_GREF_00,
0
},
{
@@ -128,7 +128,7 @@ weaponinfo_t weaponinfo[NUMWEAPONS] =
},
{
// poison bow
- am_shell,
+ am_poisonbolts,
S_XBOW_15,
S_XBOW_14,
S_XBOW_13,
@@ -138,7 +138,7 @@ weaponinfo_t weaponinfo[NUMWEAPONS] =
},
{
// wp grenade launcher
- am_shell,
+ am_wpgrenades,
S_GREN_10,
S_GREN_09,
S_GREN_08,
@@ -148,7 +148,7 @@ weaponinfo_t weaponinfo[NUMWEAPONS] =
},
{
// torpedo
- am_shell,
+ am_cell,
S_BLST_18,
S_BLST_17,
S_BLST_13,