zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-07 15:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SpawnFireballFlames

Browse source 
# Conflicts:
#	source/games/sw/src/weapon.cpp
#	source/games/sw/src/weapon.h
This commit is contained in:
Christoph Oelckers 2021-11-05 16:54:28 +01:00
parent b863901037
commit 151306d763
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/sw/src/jweapon.cpp
View file

@ -636,7 +636,7 @@ int DoPhosphorus(DSWActor* actor)
hu = SpawnUser(hitActor, hsp->picnum, nullptr); hu = SpawnUser(hitActor, hsp->picnum, nullptr);
SpawnFireballExp(actor); SpawnFireballExp(actor);
if (hu) if (hu)
SpawnFireballFlames(actor->GetSpriteIndex(), hitActor->GetSpriteIndex()); SpawnFireballFlames(actor, hitActor);
DoFlamesDamageTest(actor->GetSpriteIndex()); DoFlamesDamageTest(actor->GetSpriteIndex());
} }
u->xchange = u->ychange = 0; u->xchange = u->ychange = 0;

34
source/games/sw/src/weapon.cpp
View file

@ -5033,7 +5033,7 @@ ActorChooseDeath(short SpriteNum, short Weapon)
// For the Nuke, do residual radiation if he gibs // For the Nuke, do residual radiation if he gibs
if (wu->Radius == NUKE_RADIUS) if (wu->Radius == NUKE_RADIUS)
SpawnFireballFlames(actor->GetSpriteIndex(), -1); SpawnFireballFlames(actor, nullptr);
// Random chance of taunting the AI's here // Random chance of taunting the AI's here
if (RandomRange(1000) > 400) if (RandomRange(1000) > 400)
@ -6995,7 +6995,7 @@ DoDamage(short SpriteNum, short Weapon)
if (wp->owner >= 0) // For SerpGod Ring if (wp->owner >= 0) // For SerpGod Ring
User[wp->owner]->Counter--; User[wp->owner]->Counter--;
SpawnFireballFlames(weapActor->GetSpriteIndex(), actor->GetSpriteIndex()); SpawnFireballFlames(weapActor, actor);
SetSuicide(weapActor); SetSuicide(weapActor);
break; break;
@ -10493,18 +10493,18 @@ SpawnBasicExp(int16_t Weapon)
return explosion; return explosion;
} }
void SpawnFireballFlames(int16_t SpriteNum, int16_t enemy) void SpawnFireballFlames(DSWActor* actor, DSWActor* enemyActor)
{ {
SPRITEp sp = &sprite[SpriteNum], ep = nullptr; SPRITEp sp = &actor->s(), ep;
USERp u = User[SpriteNum].Data(), eu = nullptr; USERp u = actor->u(), eu = nullptr;
if (TEST(u->Flags, SPR_UNDERWATER)) if (TEST(u->Flags, SPR_UNDERWATER))
return; return;
if (enemy >= 0) if (enemyActor != nullptr)
{ {
ep = &sprite[enemy]; ep = &enemyActor->s();
eu = User[enemy].Data(); eu = enemyActor->u();
// test for already burned // test for already burned
if (TEST(ep->extra, SPRX_BURNABLE) && ep->shade > 40) if (TEST(ep->extra, SPRX_BURNABLE) && ep->shade > 40)
@ -10557,12 +10557,12 @@ void SpawnFireballFlames(int16_t SpriteNum, int16_t enemy)
np->hitag = LUMINOUS; //Always full brightness np->hitag = LUMINOUS; //Always full brightness
if (enemy >= 0) if (enemyActor != nullptr)
eu->flameActor = actorNew; eu->flameActor = actorNew;
np->xrepeat = 16; np->xrepeat = 16;
np->yrepeat = 16; np->yrepeat = 16;
if (enemy >= 0) if (enemyActor != nullptr)
{ {
// large flame for trees and such // large flame for trees and such
if (TEST(ep->extra, SPRX_BURNABLE)) if (TEST(ep->extra, SPRX_BURNABLE))
@ -10580,7 +10580,7 @@ void SpawnFireballFlames(int16_t SpriteNum, int16_t enemy)
nu->Counter = 48; // max flame size nu->Counter = 48; // max flame size
} }
SetOwner(sp->owner, actorNew->GetSpriteIndex()); SetOwner(GetOwner(actor), actorNew);
np->shade = -40; np->shade = -40;
np->pal = nu->spal = u->spal; np->pal = nu->spal = u->spal;
SET(np->cstat, CSTAT_SPRITE_YCENTER); SET(np->cstat, CSTAT_SPRITE_YCENTER);
@ -10589,9 +10589,9 @@ void SpawnFireballFlames(int16_t SpriteNum, int16_t enemy)
//nu->Radius = DamageData[DMG_FIREBALL_FLAMES].radius; //nu->Radius = DamageData[DMG_FIREBALL_FLAMES].radius;
nu->Radius = 200; nu->Radius = 200;
if (enemy >= 0) if (enemyActor != nullptr)
{ {
SetAttach(&swActors[enemy], actorNew); SetAttach(enemyActor, actorNew);
} }
else else
{ {
@ -10608,7 +10608,7 @@ void SpawnFireballFlames(int16_t SpriteNum, int16_t enemy)
DoBeginJump(actorNew); DoBeginJump(actorNew);
} }
PlaySound(DIGI_FIRE1,np,v3df_dontpan|v3df_doppler); PlaySound(DIGI_FIRE1,actorNew,v3df_dontpan|v3df_doppler);
} }
@ -10721,7 +10721,7 @@ void SpawnFireballExp(DSWActor* actor)
SpawnExpZadjust(actor->GetSpriteIndex(), exp, Z(15), Z(15)); SpawnExpZadjust(actor->GetSpriteIndex(), exp, Z(15), Z(15));
if (RANDOM_P2(1024) < 150) if (RANDOM_P2(1024) < 150)
SpawnFireballFlames(actorNew->GetSpriteIndex(),-1); SpawnFireballFlames(actorNew, nullptr);
} }
void SpawnGoroFireballExp(DSWActor* actor) void SpawnGoroFireballExp(DSWActor* actor)
@ -11562,7 +11562,7 @@ int DoFireball(DSWActor* actor)
{ {
if (!hu) if (!hu)
hu = SpawnUser(actor, hsp->picnum, nullptr); hu = SpawnUser(actor, hsp->picnum, nullptr);
SpawnFireballFlames(actor->GetSpriteIndex(), u->coll.actor->GetSpriteIndex()); SpawnFireballFlames(actor, u->coll.actor);
hit_burn = true; hit_burn = true;
} }
@ -13459,7 +13459,7 @@ int InitMiniSumoClap(DSWActor* actor)
if (FAFcansee(tsp->x, tsp->y, ActorMid(u->targetActor), tsp->sectnum, sp->x, sp->y, SPRITEp_MID(sp), sp->sectnum)) if (FAFcansee(tsp->x, tsp->y, ActorMid(u->targetActor), tsp->sectnum, sp->x, sp->y, SPRITEp_MID(sp), sp->sectnum))
{ {
PlaySound(DIGI_30MMEXPLODE, actor, v3df_none); PlaySound(DIGI_30MMEXPLODE, actor, v3df_none);
SpawnFireballFlames(actor->GetSpriteIndex(), u->targetActor->GetSpriteIndex()); SpawnFireballFlames(actor, u->targetActor);
} }
} }

2
source/games/sw/src/weapon.h
View file

@ -82,7 +82,7 @@ bool SlopeBounce(DSWActor*, bool *hit_wall);
int SpawnSwordSparks(PLAYERp pp, short hit_sect, short hit_wall, int hit_x, int hit_y, int hit_z, short hit_ang); int SpawnSwordSparks(PLAYERp pp, short hit_sect, short hit_wall, int hit_x, int hit_y, int hit_z, short hit_ang);
DSWActor* SpawnBubble(DSWActor*); DSWActor* SpawnBubble(DSWActor*);
void SpawnFireballExp(DSWActor*); void SpawnFireballExp(DSWActor*);
void SpawnFireballFlames(int16_t SpriteNum,int16_t enemy); void SpawnFireballFlames(DSWActor* actor, DSWActor* enemyActor);
int SpawnRadiationCloud(DSWActor* actor); int SpawnRadiationCloud(DSWActor* actor);
void SpawnGrenadeExp(DSWActor*); void SpawnGrenadeExp(DSWActor*);
DSWActor* SpawnSectorExp(DSWActor*); DSWActor* SpawnSectorExp(DSWActor*);