teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SpawnBreakFlames

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-31 18:13:10 +01:00
parent 8daa825aa1
commit aa13619087
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -976,7 +976,7 @@ int AutoBreakSprite(DSWActor* breakActor, short type)
if (TEST(break_info->flags, BF_KILL) || break_info->breaknum == -1)
{
if (TEST(break_info->flags, BF_FIRE_FALL))
SpawnBreakFlames(BreakSprite);
SpawnBreakFlames(breakActor);
RESET(bp->cstat, CSTAT_SPRITE_BLOCK|CSTAT_SPRITE_BLOCK_HITSCAN);
SET(bp->cstat, CSTAT_SPRITE_INVISIBLE);

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

@ -10815,16 +10815,15 @@ void SpawnFireballFlames(int16_t SpriteNum, int16_t enemy)
int
SpawnBreakFlames(int16_t SpriteNum)
SpawnBreakFlames(DSWActor* actor)
{
SPRITEp sp = &sprite[SpriteNum];
USERp u = User[SpriteNum].Data();
SPRITEp sp = &actor->s();
USERp u = actor->u();
SPRITEp np;
USERp nu;
short New;
New = SpawnSprite(STAT_MISSILE, FIREBALL_FLAMES+1, s_BreakFlames, sp->sectnum,
sp->x, sp->y, sp->z, sp->ang, 0);
New = SpawnSprite(STAT_MISSILE, FIREBALL_FLAMES+1, s_BreakFlames, sp->sectnum, sp->x, sp->y, sp->z, sp->ang, 0);
auto actorNew = &swActors[New];
np = &actorNew->s();
nu = actorNew->u();

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

@ -85,7 +85,7 @@ int DoShrapVelocity(int16_t SpriteNum);
int ShrapKillSprite(short SpriteNum);
bool MissileSetPos(short Weapon,ANIMATORp DoWeapon,int dist);
int ActorPain(short SpriteNum);
int SpawnBreakFlames(int16_t SpriteNum);
int SpawnBreakFlames(DSWActor*);
bool PlayerTakeDamage(PLAYERp pp, DSWActor* weapActor);
const char *DeathString(short SpriteNum);