From 24dcb9cc4f6a13c50fe415c0c47dc85a1c389086 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Sun, 17 Apr 2016 01:06:39 +0200 Subject: [PATCH 1/2] Don't #include on Linux, only on Windows Linux, FreeBSD and OSX should use stdlib.h instead. --- Sources/Ecc/StdH.h | 2 +- Sources/Engine/Engine.h | 5 +---- Sources/Engine/StdH.h | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Sources/Ecc/StdH.h b/Sources/Ecc/StdH.h index 1b048a09d..ea0cdca1a 100644 --- a/Sources/Ecc/StdH.h +++ b/Sources/Ecc/StdH.h @@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include -#if !defined(PLATFORM_MACOSX) && !defined(PLATFORM_FREEBSD) +#ifdef PLATFORM_WIN32 #include #endif diff --git a/Sources/Engine/Engine.h b/Sources/Engine/Engine.h index d63fae404..538a294b3 100644 --- a/Sources/Engine/Engine.h +++ b/Sources/Engine/Engine.h @@ -38,12 +38,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include // for qsort #include // for FPU control -#if !defined(PLATFORM_MACOSX) && !defined(PLATFORM_FREEBSD) -#include -#endif - /* rcg10042001 !!! FIXME: Move these somewhere. */ #if (defined PLATFORM_WIN32) +#include #include #include #include diff --git a/Sources/Engine/StdH.h b/Sources/Engine/StdH.h index d889b87b6..8547abf81 100644 --- a/Sources/Engine/StdH.h +++ b/Sources/Engine/StdH.h @@ -27,11 +27,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include // for qsort #include // for FPU control -#if !defined(PLATFORM_MACOSX) && !defined(PLATFORM_FREEBSD) -#include -#endif - #ifdef PLATFORM_WIN32 +#include #include #include #include From b934fa1945c035e7b81d9570d1fd28501d9059ee Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Sun, 17 Apr 2016 01:07:14 +0200 Subject: [PATCH 2/2] Increase SDL soundbuffer for smoother sound playback before it sounded shitty on my system, no it sounds good. --- Sources/Engine/Sound/SoundLibrary.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Engine/Sound/SoundLibrary.cpp b/Sources/Engine/Sound/SoundLibrary.cpp index 4ff9f38d4..1965024de 100644 --- a/Sources/Engine/Sound/SoundLibrary.cpp +++ b/Sources/Engine/Sound/SoundLibrary.cpp @@ -258,7 +258,7 @@ static BOOL StartUp_SDLaudio( CSoundLibrary &sl, BOOL bReport=TRUE) } sdl_silence = obtained.silence; - sdl_backbuffer_allocation = (obtained.size * 2); + sdl_backbuffer_allocation = (obtained.size * 4); sdl_backbuffer = (Uint8 *)AllocMemory(sdl_backbuffer_allocation); sdl_backbuffer_remain = 0; sdl_backbuffer_pos = 0;