diff options
| author | Samuel Villareal | 2010-08-31 03:33:46 +0000 |
|---|---|---|
| committer | Samuel Villareal | 2010-08-31 03:33:46 +0000 |
| commit | 5e95f6d6b0515b0b853c89681516c955160c2ef9 (patch) | |
| tree | 6f99a658dfb1b0124417b0cdeb27b8566c4ff146 /src/strife/p_inter.c | |
| parent | d91c6811001a66418757efed10ae9ff503a500be (diff) | |
| download | chocolate-doom-5e95f6d6b0515b0b853c89681516c955160c2ef9.tar.gz chocolate-doom-5e95f6d6b0515b0b853c89681516c955160c2ef9.tar.bz2 chocolate-doom-5e95f6d6b0515b0b853c89681516c955160c2ef9.zip | |
+ Stripped out all doom states/sprites and added strife states/sprites.
All strife codepointers are set as placeholders
+ Strife weapons implemented
+ All state references commented out
+ All weapon references commented out
Subversion-branch: /branches/strife-branch
Subversion-revision: 1984
Diffstat (limited to 'src/strife/p_inter.c')
| -rw-r--r-- | src/strife/p_inter.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c index f549c348..0f0ca797 100644 --- a/src/strife/p_inter.c +++ b/src/strife/p_inter.c @@ -116,7 +116,9 @@ P_GiveAmmo // We were down to zero, // so select a new weapon. // Preferences are not user selectable. - switch (ammo) + + // villsa [STRIFE] TODO - BEWARE! NO WEAPON PREFERENCE MUST FIX + /*switch (ammo) { case am_clip: if (player->readyweapon == wp_fist) @@ -154,7 +156,7 @@ P_GiveAmmo } default: break; - } + }*/ return true; } @@ -366,7 +368,8 @@ P_TouchSpecialThing // Identify by sprite. switch (special->sprite) { - // armor + // villsa [STRIFE] TODO - update actual strife sprite pickups +/* // armor case SPR_ARM1: if (!P_GiveArmor (player, deh_green_armor_class)) return; @@ -650,7 +653,7 @@ P_TouchSpecialThing return; player->message = DEH_String(GOTSHOTGUN2); sound = sfx_wpnup; - break; + break;*/ default: I_Error ("P_SpecialThing: Unknown gettable thing"); @@ -818,7 +821,7 @@ P_DamageMobj && !(target->flags & MF_NOCLIP) && (!source || !source->player - || source->player->readyweapon != wp_chainsaw)) + /*|| source->player->readyweapon != wp_chainsaw*/)) // villsa [STRIFE] unused { ang = R_PointToAngle2 ( inflictor->x, inflictor->y, |