From 3cb073a3a035516968a5f74d1393f433ab737913 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 12 Aug 2008 23:00:48 +0000 Subject: [PATCH] - Fixed: The chat sound for Strife was misnamed in the gameinfo structure. - fixed a few DECORATE bugs. SVN r1165 (trunk) --- docs/rh-log.txt | 2 ++ src/g_hexen/a_clericstaff.cpp | 17 ++++++++++------- src/g_hexen/a_hexenspecialdecs.cpp | 6 +++--- src/gi.cpp | 6 +++--- wadsrc/static/actors/actor.txt | 2 +- wadsrc/static/actors/hexen/hexenspecialdecs.txt | 2 ++ wadsrc/static/actors/raven/artitele.txt | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 5786e16157..8c340565e4 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ August 12, 2008 (Changes by Graf Zahl) +- Fixed: The chat sound for Strife was misnamed in the gameinfo structure. +- fixed a few DECORATE bugs. - Changed the action function declaration parser so that optional parameters can be given a default value. The 'optional' keyword is no longer needed and was removed, as well as 'evalnot'. diff --git a/src/g_hexen/a_clericstaff.cpp b/src/g_hexen/a_clericstaff.cpp index 48d7c5cc90..87b4691217 100644 --- a/src/g_hexen/a_clericstaff.cpp +++ b/src/g_hexen/a_clericstaff.cpp @@ -185,13 +185,16 @@ DEFINE_ACTION_FUNCTION(AActor, A_CStaffInitBlink) DEFINE_ACTION_FUNCTION(AActor, A_CStaffCheckBlink) { - if (!--self->special1) + if (self->player && self->player->ReadyWeapon) { - P_SetPsprite (self->player, ps_weapon, self->FindState ("Blink")); - self->special1 = (pr_blink()+50)>>2; - } - else - { - CALL_ACTION(A_WeaponReady, self); + if (!--self->special1) + { + P_SetPsprite (self->player, ps_weapon, self->player->ReadyWeapon->FindState ("Blink")); + self->special1 = (pr_blink()+50)>>2; + } + else + { + CALL_ACTION(A_WeaponReady, self); + } } } diff --git a/src/g_hexen/a_hexenspecialdecs.cpp b/src/g_hexen/a_hexenspecialdecs.cpp index 57f5639cf1..19c9f7d4e3 100644 --- a/src/g_hexen/a_hexenspecialdecs.cpp +++ b/src/g_hexen/a_hexenspecialdecs.cpp @@ -160,9 +160,9 @@ DEFINE_ACTION_FUNCTION(AActor, A_CorpseExplode) for (i = (pr_foo()&3)+3; i; i--) { mo = Spawn ("CorpseBit", self->x, self->y, self->z, ALLOW_REPLACE); - mo->SetState (mo->SpawnState + (pr_foo()%3)); if (mo) { + mo->SetState (mo->SpawnState + (pr_foo()%3)); mo->momz = ((pr_foo()&7)+5)*(3*FRACUNIT/4); mo->momx = pr_foo.Random2()<<(FRACBITS-6); mo->momy = pr_foo.Random2()<<(FRACBITS-6); @@ -170,9 +170,9 @@ DEFINE_ACTION_FUNCTION(AActor, A_CorpseExplode) } // Spawn a skull mo = Spawn ("CorpseBit", self->x, self->y, self->z, ALLOW_REPLACE); - mo->SetState (mo->SpawnState + 3); if (mo) { + mo->SetState (mo->SpawnState + 3); mo->momz = ((pr_foo()&7)+5)*(3*FRACUNIT/4); mo->momx = pr_foo.Random2()<<(FRACBITS-6); mo->momy = pr_foo.Random2()<<(FRACBITS-6); @@ -277,9 +277,9 @@ DEFINE_ACTION_FUNCTION(AActor, A_SoAExplode) mo = Spawn ("ZArmorChunk", self->x+((pr_soaexplode()-128)<<12), self->y+((pr_soaexplode()-128)<<12), self->z+(pr_soaexplode()*self->height/256), ALLOW_REPLACE); - mo->SetState (mo->SpawnState + i); if (mo) { + mo->SetState (mo->SpawnState + i); mo->momz = ((pr_soaexplode()&7)+5)*FRACUNIT; mo->momx = pr_soaexplode.Random2()<<(FRACBITS-6); mo->momy = pr_soaexplode.Random2()<<(FRACBITS-6); diff --git a/src/gi.cpp b/src/gi.cpp index 72231f79ca..54112b4605 100644 --- a/src/gi.cpp +++ b/src/gi.cpp @@ -311,7 +311,7 @@ gameinfo_t StrifeGameInfo = 280/35, 0, 200/35, - "Chat", + "misc/chat", "d_intro", "-NOFLAT", "CREDIT", @@ -340,7 +340,7 @@ gameinfo_t StrifeTeaserGameInfo = 280/35, 0, 200/35, - "Chat", + "misc/chat", "d_intro", "-NOFLAT", "CREDIT", @@ -369,7 +369,7 @@ gameinfo_t StrifeTeaser2GameInfo = 280/35, 0, 200/35, - "Chat", + "misc/chat", "d_intro", "-NOFLAT", "CREDIT", diff --git a/wadsrc/static/actors/actor.txt b/wadsrc/static/actors/actor.txt index f0abb67ee1..d1866264ff 100644 --- a/wadsrc/static/actors/actor.txt +++ b/wadsrc/static/actors/actor.txt @@ -19,7 +19,7 @@ ACTOR Actor native //: Thinker Gravity 1 action native A_MonsterRail(); - action native A_BFGSpray(class spraytype = "BFGSpray", int numrays = 40, int damagecount = 15); + action native A_BFGSpray(class spraytype = "BFGExtra", int numrays = 40, int damagecount = 15); action native A_Pain(); action native A_NoBlocking(); action native A_XScream(); diff --git a/wadsrc/static/actors/hexen/hexenspecialdecs.txt b/wadsrc/static/actors/hexen/hexenspecialdecs.txt index 152fef2639..0758f94d11 100644 --- a/wadsrc/static/actors/hexen/hexenspecialdecs.txt +++ b/wadsrc/static/actors/hexen/hexenspecialdecs.txt @@ -270,6 +270,7 @@ ACTOR ZCorpseSitting 110 Spawn: CPS6 A -1 Stop + Death: CPS6 A 1 A_CorpseExplode Stop } @@ -522,6 +523,7 @@ ACTOR ZSuitOfArmor 8064 Spawn: ZSUI A -1 Stop + Death: ZSUI A 1 A_SoAExplode Stop } diff --git a/wadsrc/static/actors/raven/artitele.txt b/wadsrc/static/actors/raven/artitele.txt index 86085ed7d6..5c1fa9d8fc 100644 --- a/wadsrc/static/actors/raven/artitele.txt +++ b/wadsrc/static/actors/raven/artitele.txt @@ -16,7 +16,7 @@ ACTOR ArtiTeleport : Inventory 36 native States { Spawn: - ATLP ABCD 4 + ATLP ABCB 4 Loop } }