X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=6ff358a13adb6bca67711d17c0eb71e2bb765e8d;hb=3c8f67c3c66a86fc9e45469ce2fed4222d486c9f;hp=790ddc375918bd19ccc6cfdcc9a451a61e8829c4;hpb=c95576958a42b797cda09eb8935db8fd96783e52;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 790ddc3..6ff358a 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -1844,9 +1844,11 @@ void 	Game::Tick()
 
 				if(newdetail>2)newdetail=detail;
 				if(newdetail<0)newdetail=detail;
+#if !USE_SDL  // we'll take anything that works.
 				if(newscreenwidth>3000)newscreenwidth=screenwidth;
-				if(newscreenwidth<0)newscreenwidth=screenwidth;
 				if(newscreenheight>3000)newscreenheight=screenheight;
+#endif
+				if(newscreenwidth<0)newscreenwidth=screenwidth;
 				if(newscreenheight<0)newscreenheight=screenheight;
 
 				ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
@@ -2106,6 +2108,52 @@ void 	Game::Tick()
 				FSOUND_Sample_SetMinMaxDistance(samp[firestartsound], 8.0f, 2000.0f);	
 			}
 			if(Button()&&!oldbutton&&selected==0){
+				#if USE_SDL
+				extern SDL_Rect **resolutions;
+				bool isCustomResolution = true;
+				bool found = false;
+				for (int i = 0; (!found) && (resolutions[i]); i++)
+				{
+					if ((resolutions[i]->w == screenwidth) && (resolutions[i]->h == screenwidth))
+						isCustomResolution = false;
+
+					if ((resolutions[i]->w == newscreenwidth) && (resolutions[i]->h == newscreenheight))
+					{
+						i++;
+						if (resolutions[i] != NULL)
+						{
+							newscreenwidth = (int) resolutions[i]->w;
+							newscreenheight = (int) resolutions[i]->h;
+						}
+						else if (isCustomResolution)
+						{
+							if ((screenwidth == newscreenwidth) && (screenheight == newscreenheight))
+							{
+								newscreenwidth = (int) resolutions[0]->w;
+								newscreenheight = (int) resolutions[0]->h;
+							}
+							else
+							{
+								newscreenwidth = screenwidth;
+								newscreenheight = screenheight;
+							}
+						}
+						else
+						{
+							newscreenwidth = (int) resolutions[0]->w;
+							newscreenheight = (int) resolutions[0]->h;
+						}
+						found = true;
+					}
+				}
+
+				if (!found)
+				{
+					newscreenwidth = (int) resolutions[0]->w;
+					newscreenheight = (int) resolutions[0]->h;
+				}
+
+				#else
 				int whichres;
 				whichres=-1;
 				if(newscreenwidth==640&&newscreenheight==480)whichres=0;
@@ -2154,6 +2202,7 @@ void 	Game::Tick()
 					newscreenwidth=1920;
 					newscreenheight=1200;
 				}
+				#endif
 			}
 			if(Button()&&!oldbutton&&selected==1){
 				newdetail++;
@@ -2244,9 +2293,11 @@ void 	Game::Tick()
 
 				if(newdetail>2)newdetail=detail;
 				if(newdetail<0)newdetail=detail;
+#if !USE_SDL  // we'll take anything that works.
 				if(newscreenwidth>3000)newscreenwidth=screenwidth;
-				if(newscreenwidth<0)newscreenwidth=screenwidth;
 				if(newscreenheight>3000)newscreenheight=screenheight;
+#endif
+				if(newscreenwidth<0)newscreenwidth=screenwidth;
 				if(newscreenheight<0)newscreenheight=screenheight;
 
 
@@ -2990,9 +3041,11 @@ void 	Game::Tick()
 			if(mainmenu==3){
 				if(newdetail>2)newdetail=detail;
 				if(newdetail<0)newdetail=detail;
+#if !USE_SDL  // we'll take anything that works.
 				if(newscreenwidth>3000)newscreenwidth=screenwidth;
-				if(newscreenwidth<0)newscreenwidth=screenwidth;
 				if(newscreenheight>3000)newscreenheight=screenheight;
+#endif
+				if(newscreenwidth<0)newscreenwidth=screenwidth;
 				if(newscreenheight<0)newscreenheight=screenheight;
 
 				ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
@@ -3174,7 +3227,13 @@ void 	Game::Tick()
 							if(displaychars[0]){
 								char serialstring[256];
 								char tempstring[256];
+								#if defined(__APPLE__)
+								sprintf (tempstring, "%s", registrationname);
+								#elif defined(_MSC_VER) || defined(__linux__)
 								sprintf (tempstring, "%s-windows", registrationname);
+								#else
+								#error Please make sure you have the right registration key stuff here!
+								#endif
 								long num1;
 								long num2;
 								long num3;
@@ -5628,9 +5687,11 @@ void 	Game::Tick()
 			if(mainmenu==3){
 				if(newdetail>2)newdetail=detail;
 				if(newdetail<0)newdetail=detail;
+#if !USE_SDL  // we'll take anything that works.
 				if(newscreenwidth>3000)newscreenwidth=screenwidth;
-				if(newscreenwidth<0)newscreenwidth=screenwidth;
 				if(newscreenheight>3000)newscreenheight=screenheight;
+#endif
+				if(newscreenwidth<0)newscreenwidth=screenwidth;
 				if(newscreenheight<0)newscreenheight=screenheight;
 
 				ofstream opstream(ConvertFileName(":Data:config.txt", "w"));