zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- made the bounce flags accessible after verifying that the code works for 16 bit variables.

Browse source 
- fixed a deprecation warning with the Heresiarch by replacing A_ChangeFlag.
This commit is contained in:
Christoph Oelckers 2016-10-25 11:38:02 +02:00
parent 656b8cb16e
commit e39bf9eaeb
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wadsrc/static/zscript/constants.txt
View file

@ -1,5 +1,5 @@
// for flag changer functions. // for flag changer functions.
const int FLAG_NO_CHANGE = -1; const FLAG_NO_CHANGE = -1;
// Flags for A_PainAttack // Flags for A_PainAttack
enum EPainAttackFlags enum EPainAttackFlags

15
wadsrc/static/zscript/hexen/heresiarch.txt
View file

@ -96,6 +96,12 @@ class SorcBall native
native void A_SorcBallOrbit(); native void A_SorcBallOrbit();
native void A_SorcBallPop(); native void A_SorcBallPop();
native void A_BounceCheck (); native void A_BounceCheck ();
void A_SorcBallExplode()
{
bNOBOUNCESOUND = true;
A_Explode(255, 255);
}
} }
// First ball (purple) - fires projectiles ---------------------------------- // First ball (purple) - fires projectiles ----------------------------------
@ -112,8 +118,7 @@ class SorcBall1 : SorcBall native
SBMP B 2 A_BounceCheck; SBMP B 2 A_BounceCheck;
Wait; Wait;
Death: Death:
SBS4 D 0 A_ChangeFlag("NOBOUNCESOUND", 1); SBS4 D 5 A_SorcBallExplode;
SBS4 D 5 A_Explode(255,255);
SBS4 E 5; SBS4 E 5;
SBS4 FGH 6; SBS4 FGH 6;
Stop; Stop;
@ -135,8 +140,7 @@ class SorcBall2 : SorcBall native
SBMB B 2 A_BounceCheck; SBMB B 2 A_BounceCheck;
Wait; Wait;
Death: Death:
SBS4 D 0 A_ChangeFlag("NOBOUNCESOUND", 1); SBS3 D 5 A_SorcBallExplode;
SBS3 D 5 A_Explode(255,255);
SBS3 E 5; SBS3 E 5;
SBS3 FGH 6; SBS3 FGH 6;
Stop; Stop;
@ -157,8 +161,7 @@ class SorcBall3 : SorcBall native
SBMG B 2 A_BounceCheck; SBMG B 2 A_BounceCheck;
Wait; Wait;
Death: Death:
SBS4 D 0 A_ChangeFlag("NOBOUNCESOUND", 1); SBS3 D 5 A_SorcBallExplode;
SBS3 D 5 A_Explode(255,255);
SBS3 E 5; SBS3 E 5;
SBS3 FGH 6; SBS3 FGH 6;
Stop; Stop;