zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-04-22 08:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint' of https://github.com/rheit/zdoom into maint

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-08 19:44:35 +01:00
commit ce9d91be7b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_heretic/a_ironlich.cpp
View file

@ -20,6 +20,10 @@ class AWhirlwind : public AActor
DECLARE_CLASS (AWhirlwind, AActor)
public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype);
void BeginPlay()
{
special1 = 60;
}
};
IMPLEMENT_CLASS(AWhirlwind)
@ -129,7 +133,6 @@ DEFINE_ACTION_FUNCTION(AActor, A_LichAttack)
{
mo->AddZ(-32*FRACUNIT, false);
mo->tracer = target;
mo->special1 = 60;
mo->special2 = 50; // Timer for active sound
mo->health = 20*TICRATE; // Duration
S_Sound (self, CHAN_BODY, "ironlich/attack3", 1, ATTN_NORM);