Allow user to set any reasonable resolution.

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index c92bcf9a1b65358549da7a6d06e2a0be11fe6e09..6ff358a13adb6bca67711d17c0eb71e2bb765e8d 100644 (file)
--- 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"));
@@ -5634,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"));

diff --git a/Source/OpenGL_Full_Screen.cpp b/Source/OpenGL_Full_Screen.cpp
index 7a932388493b1d578e216e3394b14c147bb0b4a4..873cf00bc6e529cdebdcc6aa612a1b89b67b7e5e 100644 (file)
--- a/Source/OpenGL_Full_Screen.cpp
+++ b/Source/OpenGL_Full_Screen.cpp
@@ -956,10 +956,12 @@ Boolean SetUp (void)
            
            if(detail>2)detail=2;
            if(detail<0)detail=0;
-           if(screenwidth>3000)screenwidth=640;
                if(screenwidth<0)screenwidth=640;
-               if(screenheight>3000)screenheight=480;
                if(screenheight<0)screenheight=480;
+#if !USE_SDL  // we'll take anything that works.
+           if(screenwidth>3000)screenwidth=640;
+               if(screenheight>3000)screenheight=480;
+#endif
        }
 
        

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 2937fefc3948994ab0af8bd9aaf803c729c209c5..226025a7a7a9dba7a193da91fc4cf2ad112cc088 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -103,6 +103,20 @@ extern float volume;
 using namespace std;
 
 
+#if USE_SDL
+SDL_Rect **resolutions = NULL;
+static SDL_Rect rect_1024_768 = { 0, 0, 1024, 768 };
+static SDL_Rect rect_800_600  = { 0, 0, 800,  600 };
+static SDL_Rect rect_640_480  = { 0, 0, 640,  480 };
+static SDL_Rect *hardcoded_resolutions[] = {
+    &rect_1024_768,
+    &rect_800_600,
+    &rect_640_480,
+    NULL
+};
+#endif
+
+
 unsigned int resolutionDepths[8][2] = {0};
 
 bool selectDetail(int & width, int & height, int & bpp, int & detail);
@@ -845,10 +859,12 @@ Boolean SetUp (Game & game)
 
                if(detail>2)detail=2;
                if(detail<0)detail=0;
-               if(screenwidth>3000)screenwidth=640;
                if(screenwidth<0)screenwidth=640;
-               if(screenheight>3000)screenheight=480;
                if(screenheight<0)screenheight=480;
+#if !USE_SDL  // we'll take anything that works.
+               if(screenwidth>3000)screenwidth=640;
+               if(screenheight>3000)screenheight=480;
+#endif
        }
        if(kBitsPerPixel!=32&&kBitsPerPixel!=16){
                kBitsPerPixel=16;
@@ -874,6 +890,42 @@ Boolean SetUp (Game & game)
             SDL_Quit();
             return false;
         }
+
+        SDL_Rect **res = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_OPENGL);
+        if ( (res == NULL) || (res == ((SDL_Rect **)-1)) || (res[0] == NULL) || (res[0]->w < 640) || (res[0]->h < 480) )
+            res = hardcoded_resolutions;
+
+        // reverse list (it was sorted biggest to smallest by SDL)...
+        int count;
+        for (count = 0; res[count]; count++)
+        {
+            if ((res[count]->w < 640) || (res[count]->h < 480))
+                break;   // sane lower limit.
+        }
+
+        static SDL_Rect *resolutions_block = NULL;
+        resolutions_block = (SDL_Rect*) realloc(resolutions_block, sizeof (SDL_Rect) * count);
+        resolutions = (SDL_Rect**) realloc(resolutions, sizeof (SDL_Rect *) * (count + 1));
+        if ((resolutions_block == NULL) || (resolutions == NULL))
+        {
+            SDL_Quit();
+            fprintf(stderr, "Out of memory!\n");
+            return false;
+        }
+
+        resolutions[count--] = NULL;
+        for (int i = 0; count >= 0; i++, count--)
+        {
+            memcpy(&resolutions_block[count], res[i], sizeof (SDL_Rect));
+            resolutions[count] = &resolutions_block[count];
+        }
+
+        if (cmdline("showresolutions"))
+        {
+            printf("Resolutions we think are okay:\n");
+            for (int i = 0; resolutions[i]; i++)
+                printf("  %d x %d\n", (int) resolutions[i]->w, (int) resolutions[i]->h);
+        }
     }
 
     Uint32 sdlflags = SDL_OPENGL;
@@ -2158,6 +2210,7 @@ int main(int argc, char **argv)
        }
 #endif
 
+#if !USE_SDL
        int resolutionID(int width, int height)
        {
                int whichres;
@@ -2191,10 +2244,15 @@ int main(int argc, char **argv)
 
                return whichres;
        }
+#endif
 
        bool selectDetail(int & width, int & height, int & bpp, int & detail)
        {
                bool res = true;
+
+               // currently with SDL, we just use whatever is requested
+               //  and don't care.  --ryan.
+               #if !USE_SDL
                int whichres = closestResolution(width, height);
 
                while (true)
@@ -2237,12 +2295,6 @@ int main(int argc, char **argv)
                                height=1200;
                        }
 
-            // currently with SDL, we just use whatever the native bitdepth
-            //  of the display is and don't care.
-            #if USE_SDL
-            break;
-            #endif
-
                        if ((detail != 0) && (resolutionDepths[whichres][1] != 0))
                        {
                                break;
@@ -2268,6 +2320,7 @@ int main(int argc, char **argv)
                }
 
                bpp = resolutionDepths[whichres][(detail != 0)];
+               #endif
 
                return res;
        }