diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt index 445f125857f928aaaa4521d34c908d21824fee4d..8c5bde5491119d4621ec662736a9ce1ec10d9fc7 100644 --- a/src/sdl/CMakeLists.txt +++ b/src/sdl/CMakeLists.txt @@ -91,9 +91,6 @@ endif() target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MIXER -DSOUND=SOUND_MIXER) 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 #### if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin) install(TARGETS SRB2SDL2 diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index e65e873aee37929eccd76de01b9560d3e01c88e9..d1188e95a439157709664ff62b1646442d63f8b2 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -1350,7 +1350,7 @@ static void I_SetupMumble(void) if(shmfd < 0) 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) mumble = NULL; #endif @@ -1366,7 +1366,7 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) return; 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); mumble->uiVersion = 2; }