teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-20 08:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- PlaySpriteSound.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-31 10:54:52 +01:00
parent c15da92544
commit 98fe147d7a
7 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/games/sw/src/ai.cpp
View file

@ -191,48 +191,48 @@ int DoActorNoise(ANIMATORp Action, DSWActor* actor)
if (Action == InitActorAmbientNoise) if (Action == InitActorAmbientNoise)
{ {
PlaySpriteSound(SpriteNum, attr_ambient, v3df_follow); PlaySpriteSound(actor, attr_ambient, v3df_follow);
} }
else if (Action == InitActorAlertNoise) else if (Action == InitActorAlertNoise)
{ {
if (u && !u->DidAlert) // This only allowed once if (u && !u->DidAlert) // This only allowed once
PlaySpriteSound(SpriteNum, attr_alert, v3df_follow); PlaySpriteSound(actor, attr_alert, v3df_follow);
} }
else if (Action == InitActorAttackNoise) else if (Action == InitActorAttackNoise)
{ {
PlaySpriteSound(SpriteNum, attr_attack, v3df_follow); PlaySpriteSound(actor, attr_attack, v3df_follow);
} }
else if (Action == InitActorPainNoise) else if (Action == InitActorPainNoise)
{ {
PlaySpriteSound(SpriteNum, attr_pain, v3df_follow); PlaySpriteSound(actor, attr_pain, v3df_follow);
} }
else if (Action == InitActorDieNoise) else if (Action == InitActorDieNoise)
{ {
PlaySpriteSound(SpriteNum, attr_die, v3df_none); PlaySpriteSound(actor, attr_die, v3df_none);
} }
else if (Action == InitActorExtra1Noise) else if (Action == InitActorExtra1Noise)
{ {
PlaySpriteSound(SpriteNum, attr_extra1, v3df_follow); PlaySpriteSound(actor, attr_extra1, v3df_follow);
} }
else if (Action == InitActorExtra2Noise) else if (Action == InitActorExtra2Noise)
{ {
PlaySpriteSound(SpriteNum, attr_extra2, v3df_follow); PlaySpriteSound(actor, attr_extra2, v3df_follow);
} }
else if (Action == InitActorExtra3Noise) else if (Action == InitActorExtra3Noise)
{ {
PlaySpriteSound(SpriteNum, attr_extra3, v3df_follow); PlaySpriteSound(actor, attr_extra3, v3df_follow);
} }
else if (Action == InitActorExtra4Noise) else if (Action == InitActorExtra4Noise)
{ {
PlaySpriteSound(SpriteNum, attr_extra4, v3df_follow); PlaySpriteSound(actor, attr_extra4, v3df_follow);
} }
else if (Action == InitActorExtra5Noise) else if (Action == InitActorExtra5Noise)
{ {
PlaySpriteSound(SpriteNum, attr_extra5, v3df_follow); PlaySpriteSound(actor, attr_extra5, v3df_follow);
} }
else if (Action == InitActorExtra6Noise) else if (Action == InitActorExtra6Noise)
{ {
PlaySpriteSound(SpriteNum, attr_extra6, v3df_follow); PlaySpriteSound(actor, attr_extra6, v3df_follow);
} }
return 0; return 0;
@ -1535,14 +1535,13 @@ int DoActorMoveJump(DSWActor* actor)
} }
int move_scan(DSWActor* actor, short ang, int dist, int *stopx, int *stopy, int *stopz, short *stopsect) Collision move_scan(DSWActor* actor, short ang, int dist, int *stopx, int *stopy, int *stopz, short *stopsect)
{ {
USERp u = actor->u(); USERp u = actor->u();
SPRITEp sp = &actor->s(); SPRITEp sp = &actor->s();
int nx,ny; int nx,ny;
uint32_t cliptype = CLIPMASK_ACTOR; uint32_t cliptype = CLIPMASK_ACTOR;
int ret;
short sang,ss; short sang,ss;
int x, y, z, loz, hiz; int x, y, z, loz, hiz;
@ -1571,7 +1570,7 @@ int move_scan(DSWActor* actor, short ang, int dist, int *stopx, int *stopy, int
nx = MulScale(dist, bcos(sp->ang), 14); nx = MulScale(dist, bcos(sp->ang), 14);
ny = MulScale(dist, bsin(sp->ang), 14); ny = MulScale(dist, bsin(sp->ang), 14);
ret = move_sprite(u->SpriteNum, nx, ny, 0, u->ceiling_dist, u->floor_dist, cliptype, 1); Collision ret(move_sprite(u->SpriteNum, nx, ny, 0, u->ceiling_dist, u->floor_dist, cliptype, 1));
// move_sprite DOES do a getzrange point? // move_sprite DOES do a getzrange point?
// should I look down with a FAFgetzrange to see where I am? // should I look down with a FAFgetzrange to see where I am?
@ -1630,7 +1629,6 @@ int FindNewAngle(DSWActor* actor, signed char dir, int DistToMove)
short new_ang, oang; short new_ang, oang;
short save_ang = -1; short save_ang = -1;
unsigned short ret;
int set; int set;
int dist, stopx, stopy, stopz; int dist, stopx, stopy, stopz;
@ -1687,9 +1685,9 @@ int FindNewAngle(DSWActor* actor, signed char dir, int DistToMove)
#endif #endif
// check to see how far we can move // check to see how far we can move
ret = move_scan(actor, new_ang, DistToMove, &stopx, &stopy, &stopz, &stopsect); auto ret = move_scan(actor, new_ang, DistToMove, &stopx, &stopy, &stopz, &stopsect);
if (ret == 0) if (ret.type == kHitNone)
{ {
// cleanly moved in new direction without hitting something // cleanly moved in new direction without hitting something
u->TargetDist = Distance(sp->x, sp->y, stopx, stopy); u->TargetDist = Distance(sp->x, sp->y, stopx, stopy);

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

@ -573,7 +573,7 @@ int SpawnCoolg(DSWActor* actor)
NewCoolg(actor); NewCoolg(actor);
PlaySpriteSound(SpriteNum,attr_extra1,v3df_follow); PlaySpriteSound(actor,attr_extra1,v3df_follow);
return 0; return 0;
} }

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

@ -542,7 +542,7 @@ int DoSkelInitTeleport(DSWActor* actor)
RESET(sp->cstat, CSTAT_SPRITE_BLOCK|CSTAT_SPRITE_BLOCK_HITSCAN); RESET(sp->cstat, CSTAT_SPRITE_BLOCK|CSTAT_SPRITE_BLOCK_HITSCAN);
PlaySpriteSound(SpriteNum,attr_extra3,v3df_follow); PlaySpriteSound(actor,attr_extra3,v3df_follow);
return 0; return 0;
} }

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

@ -452,7 +452,7 @@ int DoSkullSpawnShrap(DSWActor* actor)
{ {
SpawnShrap(actor, nullptr); SpawnShrap(actor, nullptr);
//PlaySpriteSound(SpriteNum,attr_extra1,v3df_none); //PlaySpriteSound(actor,attr_extra1,v3df_none);
return 0; return 0;
} }
@ -865,7 +865,7 @@ int DoBettyBob(DSWActor* actor)
int DoBettySpawnShrap(DSWActor* actor) int DoBettySpawnShrap(DSWActor* actor)
{ {
SpawnShrap(actor, nullptr); SpawnShrap(actor, nullptr);
//PlaySpriteSound(SpriteNum,attr_extra1,v3df_none); //PlaySpriteSound(actor,attr_extra1,v3df_none);
return 0; return 0;
} }

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

@ -778,14 +778,10 @@ void Set3DSoundOwner(short spritenum)
// //
//========================================================================== //==========================================================================
void PlaySpriteSound(short spritenum, int attrib_ndx, Voc3D_Flags flags) void PlaySpriteSound(DSWActor* actor, int attrib_ndx, Voc3D_Flags flags)
{ {
SPRITEp sp = &sprite[spritenum]; if (actor->hasU())
USERp u = User[spritenum].Data(); PlaySound(actor->u()->Attrib->Sounds[attrib_ndx], &actor->s(), flags);
ASSERT(u);
PlaySound(u->Attrib->Sounds[attrib_ndx], sp, flags);
} }
//========================================================================== //==========================================================================

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

@ -73,8 +73,10 @@ typedef struct ambientstruct AMB_INFO, *AMB_INFOp;
void Terminate3DSounds(void); void Terminate3DSounds(void);
class DSWActor;
void Set3DSoundOwner(short spritenum); void Set3DSoundOwner(short spritenum);
void PlaySpriteSound(short spritenum, int attrib_ndx, Voc3D_Flags flags); void PlaySpriteSound(DSWActor* actor, int attrib_ndx, Voc3D_Flags flags);
void DeleteNoSoundOwner(short spritenum); void DeleteNoSoundOwner(short spritenum);
void DeleteNoFollowSoundOwner(short spritenum); void DeleteNoFollowSoundOwner(short spritenum);

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

@ -5009,7 +5009,7 @@ ActorChooseDeath(short SpriteNum, short Weapon)
UpdateSinglePlayKills(actor); UpdateSinglePlayKills(actor);
if (u->Attrib) if (u->Attrib)
PlaySpriteSound(SpriteNum,attr_die,v3df_follow); PlaySpriteSound(actor,attr_die,v3df_follow);
switch (u->ID) switch (u->ID)
{ {
@ -5311,7 +5311,7 @@ ActorHealth(short SpriteNum, short amt)
} }
if (u->Attrib && RANDOM_P2(1024) > 850) if (u->Attrib && RANDOM_P2(1024) > 850)
PlaySpriteSound(SpriteNum,attr_pain,v3df_follow|v3df_dontpan); PlaySpriteSound(actor,attr_pain,v3df_follow|v3df_dontpan);
// keep track of the last damage // keep track of the last damage
if (amt < 0) if (amt < 0)
@ -5878,7 +5878,7 @@ DoDamage(short SpriteNum, short Weapon)
return 0; return 0;
if (u->Attrib && RANDOM_P2(1024) > 850) if (u->Attrib && RANDOM_P2(1024) > 850)
PlaySpriteSound(SpriteNum,attr_pain,v3df_follow); PlaySpriteSound(actor,attr_pain,v3df_follow);
if (TEST(u->Flags, SPR_DEAD)) if (TEST(u->Flags, SPR_DEAD))
{ {