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 'reenablemumble' into 'master'

Browse source 
Re-enable Mumble support

See merge request KartKrew/RingRacers!109
This commit is contained in:
Eidolon 2025-04-09 03:24:30 +00:00
commit a3de1dcfc1
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/sdl/CMakeLists.txt
View file

@ -91,9 +91,6 @@ endif()
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MIXER -DSOUND=SOUND_MIXER) target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MIXER -DSOUND=SOUND_MIXER)
target_compile_definitions(SRB2SDL2 PRIVATE -DDIRECTFULLSCREEN -DHAVE_SDL) target_compile_definitions(SRB2SDL2 PRIVATE -DDIRECTFULLSCREEN -DHAVE_SDL)
# NOMUMBLE till WRITE* macros are fixed for C++ or mumble integration is rewritten
target_compile_definitions(SRB2SDL2 PRIVATE -DNOMUMBLE)
#### Installation #### #### Installation ####
if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin) if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin)
install(TARGETS SRB2SDL2 install(TARGETS SRB2SDL2

4
src/sdl/i_system.cpp
View file

@ -1350,7 +1350,7 @@ static void I_SetupMumble(void)
if(shmfd < 0) if(shmfd < 0)
return; return;
mumble = mmap(NULL, sizeof(*mumble), PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, 0); mumble = static_cast<mumble_s*>(mmap(NULL, sizeof(*mumble), PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, 0));
if (mumble == MAP_FAILED) if (mumble == MAP_FAILED)
mumble = NULL; mumble = NULL;
#endif #endif
@ -1366,7 +1366,7 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
return; return;
if(mumble->uiVersion != 2) { if(mumble->uiVersion != 2) {
wcsncpy(mumble->name, L"Dr. Robotnik's Ring Racers "VERSIONSTRINGW, 256); wcsncpy(mumble->name, L"Dr. Robotnik's Ring Racers " VERSIONSTRINGW, 256);
wcsncpy(mumble->description, L"Dr. Robotnik's Ring Racers with integrated Mumble Link support.", 2048); wcsncpy(mumble->description, L"Dr. Robotnik's Ring Racers with integrated Mumble Link support.", 2048);
mumble->uiVersion = 2; mumble->uiVersion = 2;
} }