zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-25 21:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Fix bad setup for stopping Duke's scream when putting the jetpack on.

Browse source
This commit is contained in:
Mitchell Richters 2023-01-06 22:17:14 +11:00 committed by Christoph Oelckers
parent 6fd0827d24
commit 67f63ca4fb
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/input.cpp
View file

@ -423,7 +423,7 @@ void hud_input(int plnum)
{ {
p->inven_icon = 4; p->inven_icon = 4;
S_StopSound(-1, pact, CHAN_VOICE); // this will stop the falling scream S_StopSound(DUKE_SCREAM, pact); // this will stop the falling scream
S_PlayActorSound(DUKE_JETPACK_ON, pact); S_PlayActorSound(DUKE_JETPACK_ON, pact);
FTA(QUOTE_JETPACK_ON, p); FTA(QUOTE_JETPACK_ON, p);
} }

7
source/games/duke/src/player_d.cpp
View file

@ -1681,11 +1681,6 @@ static void operateJetpack(int snum, ESyncBits actions, int psectlotag, double f
p->pycount &= 2047; p->pycount &= 2047;
p->pyoff = BobVal(p->pycount); p->pyoff = BobVal(p->pycount);
if (p->jetpack_on && S_CheckActorSoundPlaying(pact, DUKE_SCREAM))
{
S_StopSound(DUKE_SCREAM, pact);
}
if (p->jetpack_on < 11) if (p->jetpack_on < 11)
{ {
p->jetpack_on++; p->jetpack_on++;
@ -1837,7 +1832,7 @@ static void movement(int snum, ESyncBits actions, sectortype* psect, double floo
else else
{ {
p->falling_counter = 0; p->falling_counter = 0;
S_StopSound(-1, pact, CHAN_VOICE); S_StopSound(DUKE_SCREAM, pact);
if (psectlotag != ST_1_ABOVE_WATER && psectlotag != ST_2_UNDERWATER && p->on_ground == 0 && p->vel.Z > 12) if (psectlotag != ST_1_ABOVE_WATER && psectlotag != ST_2_UNDERWATER && p->on_ground == 0 && p->vel.Z > 12)
p->hard_landing = uint8_t(p->vel.Z / 4. ); p->hard_landing = uint8_t(p->vel.Z / 4. );