thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fixmaster' into 'master'

Browse source 
Allow servers to start again

See merge request KartKrew/Kart!4
This commit is contained in:
Sryder 2018-07-10 15:02:43 -04:00
commit 18fcdc5d06
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_clisrv.c
View file

@ -3749,7 +3749,7 @@ static void HandlePacketFromAwayNode(SINT8 node)
/// Also, according to HandleConnect, the server will send the savegame even during intermission... /// Also, according to HandleConnect, the server will send the savegame even during intermission...
/// Sryder 2018-07-05: If we don't want to send the player config another way we need to send the gamestate /// Sryder 2018-07-05: If we don't want to send the player config another way we need to send the gamestate
/// At almost any gamestate there could be joiners... So just always send gamestate? /// At almost any gamestate there could be joiners... So just always send gamestate?
cl_mode = CL_DOWNLOADSAVEGAME; cl_mode = ((server) ? CL_CONNECTED : CL_DOWNLOADSAVEGAME);
#else #else
cl_mode = CL_CONNECTED; cl_mode = CL_CONNECTED;
#endif #endif

2
src/d_netcmd.c
View file

@ -2269,7 +2269,7 @@ static void Command_Pause(void)
if (cv_pause.value || server || (IsPlayerAdmin(consoleplayer))) if (cv_pause.value || server || (IsPlayerAdmin(consoleplayer)))
{ {
if (modeattacking || !(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_VOTING)) if (!paused && (modeattacking || !(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_VOTING || gamestate == GS_WAITINGPLAYERS)))
{ {
CONS_Printf(M_GetText("You can't pause here.\n")); CONS_Printf(M_GetText("You can't pause here.\n"));
return; return;

3
src/f_finale.c
View file

@ -1043,6 +1043,9 @@ void F_StartWaitingPlayers(void)
void F_WaitingPlayersTicker(void) void F_WaitingPlayersTicker(void)
{ {
if (paused)
return;
finalecount++; finalecount++;
// dumb hack, only start the music on the 1st tick so if you instantly go into the map you aren't hearing a tic of music // dumb hack, only start the music on the 1st tick so if you instantly go into the map you aren't hearing a tic of music