zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- get rid of KillSprite.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-06 09:40:22 +01:00
parent 431103032f
commit a57af58d4c
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/sw/src/sounds.cpp
View file

@ -733,9 +733,9 @@ void DeleteNoSoundOwner(DSWActor* actor)
//
//==========================================================================
void DeleteNoFollowSoundOwner(short spritenum)
void DeleteNoFollowSoundOwner(DSWActor* actor)
{
SPRITEp sp = &sprite[spritenum];
SPRITEp sp = &actor->s();
soundEngine->StopSound(SOURCE_Actor, sp, -1); // all non-follow sounds are SOURCE_Unattached
}

13
source/games/sw/src/sprite.cpp
View file

@ -619,12 +619,6 @@ void SetAttach(DSWActor* ownr, DSWActor* child)
void KillActor(DSWActor* actor)
{
KillSprite(actor->GetSpriteIndex());
}
void KillSprite(int16_t SpriteNum)
{
auto actor = &swActors[SpriteNum];
SPRITEp sp = &actor->s();
USERp u = actor->u();
int i;
@ -639,7 +633,7 @@ void KillSprite(int16_t SpriteNum)
//////////////////////////////////////////////
// Check sounds list to kill attached sounds
DeleteNoSoundOwner(actor);
DeleteNoFollowSoundOwner(SpriteNum);
DeleteNoFollowSoundOwner(actor);
//////////////////////////////////////////////
if (u)
@ -655,7 +649,7 @@ void KillSprite(int16_t SpriteNum)
// any Anims attached
AnimDelete(ANIM_Userz, 0, actor);
AnimDelete(ANIM_Spritez, 0, actor);
StopInterpolation(SpriteNum, Interp_Sprite_Z);
StopInterpolation(actor->GetSpriteIndex(), Interp_Sprite_Z);
//if (TEST(u->Flags2, SPR2_DONT_TARGET_OWNER))
// Zombies--;
@ -783,7 +777,7 @@ void KillSprite(int16_t SpriteNum)
{
SetSuicide(u->flameActor);
}
User[SpriteNum].Clear();
User[actor->GetSpriteIndex()].Clear();
}
FVector3 pos = GetSoundPos(&actor->s().pos);
@ -4579,7 +4573,6 @@ int NewStateGroup(DSWActor* actor, STATEp StateGroup[])
u->Rot = StateGroup;
u->State = u->StateStart = StateGroup[0];
//sprite[SpriteNum].picnum = u->State->Pic;
u->Tics = 0;