diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt index 1eab62cc97b415f62838e695901159cf247185b3..12be1c470357d9dd844064dee523cbe2cfeb0119 100644 --- a/assets/CMakeLists.txt +++ b/assets/CMakeLists.txt @@ -14,7 +14,6 @@ set(SRB2_ASSET_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/installer" set(SRB2_ASSET_HASHED "srb2.srb;\ -patch.kart;\ gfx.kart;\ textures.kart;\ chars.kart;\ diff --git a/src/config.h.in b/src/config.h.in index 83a05688f8f0a5d784f2dd0e394d93b06c31bd3c..0ead749aea83cc0a698b0dadbdcd65cc7952ec29 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -23,7 +23,7 @@ #define ASSET_HASH_CHARS_KART "${SRB2_ASSET_chars.kart_HASH}" #define ASSET_HASH_MAPS_KART "${SRB2_ASSET_maps.kart_HASH}" #ifdef USE_PATCH_KART -#define ASSET_HASH_PATCH_KART "${SRB2_ASSET_patch.kart_HASH}" +#define ASSET_HASH_PATCH_KART "00000000000000000000000000000000" #endif #define SRB2_COMP_REVISION "${SRB2_COMP_REVISION}" diff --git a/src/mserv.c b/src/mserv.c index 1704d719301f87d882df919c717b4f527926e315..cf0a5f0d050388af70dcc23e3e9cdfedc7453448 100644 --- a/src/mserv.c +++ b/src/mserv.c @@ -591,5 +591,8 @@ Advertise_OnChange(void) DRPC_UpdatePresence(); #endif - M_PopupMasterServerRules(); + if (!dedicated) + { + M_PopupMasterServerRules(); + } } diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt index b285eed5b801d038c1bec4b62240e2b101c782e9..8f2c6c64330cf6c5301750f97c9ce9ac41bba35a 100644 --- a/src/sdl/CMakeLists.txt +++ b/src/sdl/CMakeLists.txt @@ -36,6 +36,7 @@ set(SRB2_SDL2_SOURCES i_system.c i_ttf.c i_video.c + i_threads.c #IMG_xpm.c ogl_sdl.c @@ -261,6 +262,7 @@ if(${SDL2_FOUND}) target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_SDL + -DHAVE_THREADS ) ## strip debug symbols into separate file when using gcc