summaryrefslogtreecommitdiff
path: root/src/strife/f_finale.c
diff options
context:
space:
mode:
authorSamuel Villareal2010-08-31 03:33:46 +0000
committerSamuel Villareal2010-08-31 03:33:46 +0000
commit5e95f6d6b0515b0b853c89681516c955160c2ef9 (patch)
tree6f99a658dfb1b0124417b0cdeb27b8566c4ff146 /src/strife/f_finale.c
parentd91c6811001a66418757efed10ae9ff503a500be (diff)
downloadchocolate-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/f_finale.c')
-rw-r--r--src/strife/f_finale.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/strife/f_finale.c b/src/strife/f_finale.c
index 7facc6d9..47a9713e 100644
--- a/src/strife/f_finale.c
+++ b/src/strife/f_finale.c
@@ -369,7 +369,7 @@ void F_StartCast (void)
void F_CastTicker (void)
{
int st;
- int sfx;
+ int sfx = sfx_swish; // villsa [STRIFE] TODO - fix me!
if (--casttics > 0)
return; // not time to change state yet
@@ -389,14 +389,14 @@ void F_CastTicker (void)
else
{
// just advance to next state in animation
- if (caststate == &states[S_PLAY_ATK1])
+ if (caststate == &states[S_PLAY_05]) // villsa [STRIFE] TODO - update later
goto stopattack; // Oh, gross hack!
st = caststate->nextstate;
caststate = &states[st];
castframes++;
// sound hacks....
- switch (st)
+ /*switch (st)
{
// villsa [STRIFE] TODO - fix sounds
case S_PLAY_ATK1: sfx = sfx_swish; break;
@@ -426,7 +426,7 @@ void F_CastTicker (void)
case S_CYBER_ATK6: sfx = sfx_rlaunc; break;
case S_PAIN_ATK3: sfx = sfx_swish; break;
default: sfx = 0; break;
- }
+ }*/
if (sfx)
S_StartSound (NULL, sfx);