From 16e7d88398130138ee1c7c2f3087581c2596cf08 Mon Sep 17 00:00:00 2001 From: Harley Laue Date: Thu, 13 May 2010 18:25:02 -0500 Subject: [PATCH] Seems there were a few things I forgot when I removed FMod. Should be about it --- Source/Globals.cpp | 1 - Source/OpenGL_Windows.cpp | 2 -- Source/Person.h | 1 - Source/Skeleton.h | 1 - Source/fmod.h | 0 Source/fmod_header.h | 0 Source/openal_wrapper.h | 4 ++-- 7 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 Source/fmod.h delete mode 100644 Source/fmod_header.h diff --git a/Source/Globals.cpp b/Source/Globals.cpp index fe9c136..be2a006 100644 --- a/Source/Globals.cpp +++ b/Source/Globals.cpp @@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Quaternions.h" #include "Lights.h" #include "Skeleton.h" -#include "fmod.h" #include "Terrain.h" #include "Sprites.h" #include "Frustum.h" diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp index 1ee4964..9374b1f 100644 --- a/Source/OpenGL_Windows.cpp +++ b/Source/OpenGL_Windows.cpp @@ -127,8 +127,6 @@ extern float volume; #include #endif -#include "fmod.h" - #include "res/resource.h" using namespace std; diff --git a/Source/Person.h b/Source/Person.h index ae7390f..cde2f8f 100644 --- a/Source/Person.h +++ b/Source/Person.h @@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "gamegl.h" #include "Quaternions.h" -#include "fmod.h" #include "Skeleton.h" #include "Models.h" #include "Constants.h" diff --git a/Source/Skeleton.h b/Source/Skeleton.h index 4e3a3fc..2948b1f 100644 --- a/Source/Skeleton.h +++ b/Source/Skeleton.h @@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /**> HEADER FILES <**/ #include "gamegl.h" #include "Quaternions.h" -#include "fmod.h" #include "Objects.h" #include "Sprites.h" #include "binio.h" diff --git a/Source/fmod.h b/Source/fmod.h deleted file mode 100644 index e69de29..0000000 diff --git a/Source/fmod_header.h b/Source/fmod_header.h deleted file mode 100644 index e69de29..0000000 diff --git a/Source/openal_wrapper.h b/Source/openal_wrapper.h index f31c6c0..2b32342 100644 --- a/Source/openal_wrapper.h +++ b/Source/openal_wrapper.h @@ -101,8 +101,8 @@ AL_API signed char OPENAL_SetOutput(int outputtype); # define OPENAL_Sample_LoadEx(a, b, c, d, e) OPENAL_Sample_Load( a, ConvertFileName( b), c, d, e) # define OPENAL_Stream_OpenEx(a, b, c, d) OPENAL_Stream_Open(ConvertFileName(a), b, c, d) #elif !PLATFORM_MACOSX -# define OPENAL_Sample_LoadEx(a, b, c, d, e) FSOUND_Sample_Load( a, ConvertFileName( b), c, d, e) -# define OPENAL_Stream_OpenEx(a, b, c, d) FSOUND_Stream_Open(ConvertFileName(a), b, c, d) +# define OPENAL_Sample_LoadEx(a, b, c, d, e) OPENAL_Sample_Load( a, ConvertFileName( b), c, d, e) +# define OPENAL_Stream_OpenEx(a, b, c, d) OPENAL_Stream_Open(ConvertFileName(a), b, c, d) #endif #endif -- 2.39.5