X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=23a5f1a407b58f56b6df81c3c2a07d55ef929491;hb=e9f84306368c14e5cc9f5b58ea305ae863516290;hp=37ad22fa433718097152721b9e28cc14cf621a65;hpb=92988d26b0a3342e9934570d896311c38d94f4fd;p=lugaru.git

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 37ad22f..23a5f1a 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -54,25 +54,15 @@ static bool save_png(const char * fname);
 
 #include "openal_wrapper.h"
 
-// ADDED GWC
-#ifdef _MSC_VER
-#pragma comment(lib, "opengl32.lib")
-#pragma comment(lib, "glu32.lib")
-#pragma comment(lib, "glaux.lib")
-#endif
-
 extern float multiplier;
 extern float sps;
 extern float realmultiplier;
 extern int slomo;
 extern bool cellophane;
-extern float terraindetail;
 extern float texdetail;
 
 extern bool osx;
-extern int numplayers;
 extern bool freeze;
-extern Person player[maxplayers];
 extern bool stillloading;
 extern int mainmenu;
 /*extern*/ bool gameFocused;
@@ -233,7 +223,6 @@ Boolean SetUp (Game & game)
 	osx = 0;
 	cellophane=0;
 	texdetail=4;
-	terraindetail=2;
 	slomospeed=0.25;
 	slomofreq=8012;
 	numplayers=1;
@@ -307,6 +296,9 @@ Boolean SetUp (Game & game)
 
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
     SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
+#if SDL_VERSION_ATLEAST(1, 2, 10)
+    SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, vblsync);
+#endif
     
     if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
     {
@@ -413,7 +405,7 @@ Boolean SetUp (Game & game)
 static void DoMouse(Game & game)
 {
 
-	if(mainmenu||(abs(game.deltah)<10*realmultiplier*1000&&abs(game.deltav)<10*realmultiplier*1000))
+	if(mainmenu|| ( (abs(game.deltah)<10*realmultiplier*1000) && (abs(game.deltav)<10*realmultiplier*1000) ))
 	{
 		game.deltah *= usermousesensitivity;
 		game.deltav *= usermousesensitivity;
@@ -480,7 +472,6 @@ void DoUpdate (Game & game)
 
 	count = multiplier*sps;
 	if(count<2)count=2;
-	//if(count>10)count=10;
 
 	realmultiplier=multiplier;
 	multiplier*=gamespeed;
@@ -488,9 +479,7 @@ void DoUpdate (Game & game)
 	if(difficulty==0)multiplier*=.8;
 
 	if(game.loading==4)multiplier*=.00001;
-	//multiplier*.9;
 	if(slomo&&!mainmenu)multiplier*=slomospeed;
-	//if(freeze)multiplier*=0.00001;
 	oldmult=multiplier;
 	multiplier/=(float)count;
 
@@ -567,29 +556,6 @@ static bool IsFocused()
 }
 
 
-static void launch_web_browser(const char *url)
-{
-#ifdef WIN32
-    ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
-
-#elif (defined(__APPLE__) && defined(__MACH__))
-    const char *fmt = "open '%s'";
-    const size_t len = strlen(fmt) + strlen(url) + 16;
-    char *buf = new char[len];
-    snprintf(buf, len, fmt, url);
-    system(buf);
-    delete[] buf;
-
-#elif PLATFORM_LINUX
-    const char *fmt = "PATH=$PATH:. xdg-open '%s'";
-    const size_t len = strlen(fmt) + strlen(url) + 16;
-    char *buf = new char[len];
-    snprintf(buf, len, fmt, url);
-    system(buf);
-    delete[] buf;
-#endif
-}
-
 
 #ifndef WIN32
 // (code lifted from physfs: http://icculus.org/physfs/ ... zlib license.)
@@ -709,7 +675,6 @@ int main(int argc, char **argv)
 
 	try
 	{
-		bool regnow = false;
 		{
 			Game game;
 			pgame = &game;
@@ -768,7 +733,6 @@ int main(int argc, char **argv)
 				}
 			}
 
-			regnow = game.registernow;
 		}
 		pgame = 0;
 
@@ -797,62 +761,6 @@ int main(int argc, char **argv)
 
 // --------------------------------------------------------------------------
 
-extern int channels[100];
-extern OPENAL_SAMPLE * samp[100];
-extern OPENAL_STREAM * strm[20];
-
-extern "C" void PlaySoundEx(int chan, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused)
-{
-	const OPENAL_SAMPLE * currSample = OPENAL_GetCurrentSample(channels[chan]);
-	if (currSample && currSample == samp[chan])
-	{
-		if (OPENAL_GetPaused(channels[chan]))
-		{
-			OPENAL_StopSound(channels[chan]);
-			channels[chan] = OPENAL_FREE;
-		}
-		else if (OPENAL_IsPlaying(channels[chan]))
-		{
-			int loop_mode = OPENAL_GetLoopMode(channels[chan]);
-			if (loop_mode & OPENAL_LOOP_OFF)
-			{
-				channels[chan] = OPENAL_FREE;
-			}
-		}
-	}
-	else
-	{
-		channels[chan] = OPENAL_FREE;
-	}
-
-	channels[chan] = OPENAL_PlaySoundEx(channels[chan], sptr, dsp, startpaused);
-	if (channels[chan] < 0)
-	{
-		channels[chan] = OPENAL_PlaySoundEx(OPENAL_FREE, sptr, dsp, startpaused);
-	}
-}
-
-extern "C" void PlayStreamEx(int chan, OPENAL_STREAM *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused)
-{
-	const OPENAL_SAMPLE * currSample = OPENAL_GetCurrentSample(channels[chan]);
-	if (currSample && currSample == OPENAL_Stream_GetSample(sptr))
-	{
-			OPENAL_StopSound(channels[chan]);
-			OPENAL_Stream_Stop(sptr);
-	}
-	else
-	{
-		OPENAL_Stream_Stop(sptr);
-		channels[chan] = OPENAL_FREE;
-	}
-
-	channels[chan] = OPENAL_Stream_PlayEx(channels[chan], sptr, dsp, startpaused);
-	if (channels[chan] < 0)
-	{
-		channels[chan] = OPENAL_Stream_PlayEx(OPENAL_FREE, sptr, dsp, startpaused);
-	}
-}
-
 
 bool LoadImage(const char * fname, TGAImageRec & tex)
 {