thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 19:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'music-new-fixes' into 'master'

Browse source 
Small fixes for new music handling

See merge request KartKrew/Kart!1374
This commit is contained in:
James R 2023-08-12 00:45:03 +00:00
commit 9732b185ca
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_clisrv.c
View file

@ -2750,7 +2750,11 @@ static void Command_connect(void)
restoreMenu = &PLAY_MP_OptSelectDef; restoreMenu = &PLAY_MP_OptSelectDef;
Music_Remap("menu", "NETMD2"); Music_Remap("menu", "NETMD2");
Music_Play("menu");
if (stricmp(Music_CurrentSong(), "NETMD2"))
{
Music_Play("menu");
}
if (setup_numplayers == 0) if (setup_numplayers == 0)
{ {

8
src/music_manager.cpp
View file

@ -20,6 +20,7 @@
#include "music_manager.hpp" #include "music_manager.hpp"
#include "music_tune.hpp" #include "music_tune.hpp"
#include "d_clisrv.h"
#include "doomtype.h" #include "doomtype.h"
#include "i_sound.h" #include "i_sound.h"
#include "i_time.h" #include "i_time.h"
@ -173,6 +174,13 @@ bool TuneManager::resync()
return false; return false;
} }
if (hu_stopped)
{
// The server is not sending updates. Don't resync
// because we know game logic is not moving anyway.
return false;
}
long d_local = I_GetTime() - time_local_; long d_local = I_GetTime() - time_local_;
long d_sync = detail::tic_time() - time_sync_; long d_sync = detail::tic_time() - time_sync_;