mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-14 08:30:35 +00:00
- Duke: Fix bad setup for stopping Duke's scream when putting the jetpack on.
This commit is contained in:
parent
5e2991acc7
commit
9a27cf025f
2 changed files with 2 additions and 7 deletions
|
@ -423,7 +423,7 @@ void hud_input(int plnum)
|
|||
{
|
||||
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);
|
||||
FTA(QUOTE_JETPACK_ON, p);
|
||||
}
|
||||
|
|
|
@ -1648,11 +1648,6 @@ static void operateJetpack(int snum, ESyncBits actions, int psectlotag, double f
|
|||
p->pycount &= 2047;
|
||||
p->pyoff = BobVal(p->pycount);
|
||||
|
||||
if (p->jetpack_on && S_CheckActorSoundPlaying(pact, DUKE_SCREAM))
|
||||
{
|
||||
S_StopSound(DUKE_SCREAM, pact);
|
||||
}
|
||||
|
||||
if (p->jetpack_on < 11)
|
||||
{
|
||||
p->jetpack_on++;
|
||||
|
@ -1804,7 +1799,7 @@ static void movement(int snum, ESyncBits actions, sectortype* psect, double floo
|
|||
else
|
||||
{
|
||||
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)
|
||||
p->hard_landing = uint8_t(p->vel.Z / 4. );
|
||||
|
|
Loading…
Reference in a new issue