mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-24 13:21:20 +00:00
Merge branch 'fix-unmute-on-respawn' into 'next'
Fix players being unmuted after respawning Closes #1276 See merge request STJr/SRB2!2506
This commit is contained in:
commit
a09e4a88ee
1 changed files with 3 additions and 0 deletions
|
@ -2624,6 +2624,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
|
||||||
boolean spectator;
|
boolean spectator;
|
||||||
boolean outofcoop;
|
boolean outofcoop;
|
||||||
boolean removing;
|
boolean removing;
|
||||||
|
boolean muted;
|
||||||
INT16 bot;
|
INT16 bot;
|
||||||
SINT8 pity;
|
SINT8 pity;
|
||||||
INT16 rings;
|
INT16 rings;
|
||||||
|
@ -2641,6 +2642,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
|
||||||
spectator = players[player].spectator;
|
spectator = players[player].spectator;
|
||||||
outofcoop = players[player].outofcoop;
|
outofcoop = players[player].outofcoop;
|
||||||
removing = players[player].removing;
|
removing = players[player].removing;
|
||||||
|
muted = players[player].muted;
|
||||||
pflags = (players[player].pflags & (PF_FLIPCAM|PF_ANALOGMODE|PF_DIRECTIONCHAR|PF_AUTOBRAKE|PF_TAGIT|PF_GAMETYPEOVER));
|
pflags = (players[player].pflags & (PF_FLIPCAM|PF_ANALOGMODE|PF_DIRECTIONCHAR|PF_AUTOBRAKE|PF_TAGIT|PF_GAMETYPEOVER));
|
||||||
playerangleturn = players[player].angleturn;
|
playerangleturn = players[player].angleturn;
|
||||||
oldrelangleturn = players[player].oldrelangleturn;
|
oldrelangleturn = players[player].oldrelangleturn;
|
||||||
|
@ -2718,6 +2720,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
|
||||||
p->spectator = spectator;
|
p->spectator = spectator;
|
||||||
p->outofcoop = outofcoop;
|
p->outofcoop = outofcoop;
|
||||||
p->removing = removing;
|
p->removing = removing;
|
||||||
|
p->muted = muted;
|
||||||
p->angleturn = playerangleturn;
|
p->angleturn = playerangleturn;
|
||||||
p->oldrelangleturn = oldrelangleturn;
|
p->oldrelangleturn = oldrelangleturn;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue