X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=89e665bc4b8579345139203bbe2b86cdf235c8f8;hb=a041e0c6375bd5f86d77f88f400b933d764b033e;hp=15a71f327276818069a4cdaa280385533152c5d9;hpb=13744c4559f89a66a6353823c4c90ed03ac20555;p=lugaru.git

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 15a71f3..89e665b 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -58,6 +58,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
     static bool save_png(const char * fname);
 #endif
 
+#include "openal_wrapper.h"
+
 // ADDED GWC
 #ifdef _MSC_VER
 #pragma comment(lib, "opengl32.lib")
@@ -125,8 +127,6 @@ extern float volume;
 #include <shellapi.h>
 #endif
 
-#include "fmod.h"
-
 #include "res/resource.h"
 
 using namespace std;
@@ -283,7 +283,7 @@ bool cmdline(const char *cmd)
         char *arg = _argv[i];
         while (*arg == '-')
             arg++;
-        if (stricmp(arg, cmd) == 0)
+        if (strcasecmp(arg, cmd) == 0)
             return true;
     }
 
@@ -1165,7 +1165,7 @@ void DoUpdate (Game & game)
 	AbsoluteTime currTime = UpTime ();
 	static int num_channels = 0;
 	
-	num_channels += FSOUND_GetChannelsPlaying();
+	num_channels += OPENAL_GetChannelsPlaying();
 	double deltaTime = (float) AbsoluteDeltaToDuration (currTime, start);
 
 	if (0 > deltaTime)	// if negative microseconds
@@ -1314,12 +1314,12 @@ char *calcBaseDir(const char *argv0)
     char *retval;
     char *envr;
 
-    char *ptr = strrchr((char *)argv0, '/');
+    const char *ptr = strrchr((char *)argv0, '/');
     if (strchr(argv0, '/'))
     {
         retval = strdup(argv0);
         if (retval)
-            *(strrchr(retval, '/')) = '\0';
+            *((char *) strrchr(retval, '/')) = '\0';
         return(retval);
     }
 
@@ -1589,58 +1589,58 @@ int main(int argc, char **argv)
 	}
 
 	extern int channels[100];
-	extern FSOUND_SAMPLE * samp[100];
-	extern FSOUND_STREAM * strm[20];
+	extern OPENAL_SAMPLE * samp[100];
+	extern OPENAL_STREAM * strm[20];
 
-	extern "C" void PlaySoundEx(int chan, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused)
+	extern "C" void PlaySoundEx(int chan, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused)
 	{
-		const FSOUND_SAMPLE * currSample = FSOUND_GetCurrentSample(channels[chan]);
+		const OPENAL_SAMPLE * currSample = OPENAL_GetCurrentSample(channels[chan]);
 		if (currSample && currSample == samp[chan])
 		{
-			if (FSOUND_GetPaused(channels[chan]))
+			if (OPENAL_GetPaused(channels[chan]))
 			{
-				FSOUND_StopSound(channels[chan]);
-				channels[chan] = FSOUND_FREE;
+				OPENAL_StopSound(channels[chan]);
+				channels[chan] = OPENAL_FREE;
 			}
-			else if (FSOUND_IsPlaying(channels[chan]))
+			else if (OPENAL_IsPlaying(channels[chan]))
 			{
-				int loop_mode = FSOUND_GetLoopMode(channels[chan]);
-				if (loop_mode & FSOUND_LOOP_OFF)
+				int loop_mode = OPENAL_GetLoopMode(channels[chan]);
+				if (loop_mode & OPENAL_LOOP_OFF)
 				{
-					channels[chan] = FSOUND_FREE;
+					channels[chan] = OPENAL_FREE;
 				}
 			}
 		}
 		else
 		{
-			channels[chan] = FSOUND_FREE;
+			channels[chan] = OPENAL_FREE;
 		}
 
-		channels[chan] = FSOUND_PlaySoundEx(channels[chan], sptr, dsp, startpaused);
+		channels[chan] = OPENAL_PlaySoundEx(channels[chan], sptr, dsp, startpaused);
 		if (channels[chan] < 0)
 		{
-			channels[chan] = FSOUND_PlaySoundEx(FSOUND_FREE, sptr, dsp, startpaused);
+			channels[chan] = OPENAL_PlaySoundEx(OPENAL_FREE, sptr, dsp, startpaused);
 		}
 	}
 
-	extern "C" void PlayStreamEx(int chan, FSOUND_STREAM *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused)
+	extern "C" void PlayStreamEx(int chan, OPENAL_STREAM *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused)
 	{
-		const FSOUND_SAMPLE * currSample = FSOUND_GetCurrentSample(channels[chan]);
-		if (currSample && currSample == FSOUND_Stream_GetSample(sptr))
+		const OPENAL_SAMPLE * currSample = OPENAL_GetCurrentSample(channels[chan]);
+		if (currSample && currSample == OPENAL_Stream_GetSample(sptr))
 		{
-				FSOUND_StopSound(channels[chan]);
-				FSOUND_Stream_Stop(sptr);
+				OPENAL_StopSound(channels[chan]);
+				OPENAL_Stream_Stop(sptr);
 		}
 		else
 		{
-			FSOUND_Stream_Stop(sptr);
-			channels[chan] = FSOUND_FREE;
+			OPENAL_Stream_Stop(sptr);
+			channels[chan] = OPENAL_FREE;
 		}
 
-		channels[chan] = FSOUND_Stream_PlayEx(channels[chan], sptr, dsp, startpaused);
+		channels[chan] = OPENAL_Stream_PlayEx(channels[chan], sptr, dsp, startpaused);
 		if (channels[chan] < 0)
 		{
-			channels[chan] = FSOUND_Stream_PlayEx(FSOUND_FREE, sptr, dsp, startpaused);
+			channels[chan] = OPENAL_Stream_PlayEx(OPENAL_FREE, sptr, dsp, startpaused);
 		}
 	}
 
@@ -1746,12 +1746,12 @@ int main(int argc, char **argv)
 #if !USE_DEVIL
 static bool load_image(const char *file_name, TGAImageRec &tex)
 {
-    char *ptr = strrchr((char *)file_name, '.');
+    const char *ptr = strrchr((char *)file_name, '.');
     if (ptr)
     {
-        if (stricmp(ptr+1, "png") == 0)
+        if (strcasecmp(ptr+1, "png") == 0)
             return load_png(file_name, tex);
-        else if (stricmp(ptr+1, "jpg") == 0)
+        else if (strcasecmp(ptr+1, "jpg") == 0)
             return load_jpg(file_name, tex);
     }
 
@@ -1910,10 +1910,10 @@ png_done:
 
 static bool save_image(const char *file_name)
 {
-    char *ptr = strrchr((char *)file_name, '.');
+    const char *ptr = strrchr((char *)file_name, '.');
     if (ptr)
     {
-        if (stricmp(ptr+1, "png") == 0)
+        if (strcasecmp(ptr+1, "png") == 0)
             return save_png(file_name);
     }