shithub: choc

Download patch

ref: 096b0da08c268da2077585398c7bb3d62453c69f
parent: ea3f2823472f3e68d6e0eba7e5acaf8fd4456337
parent: d88369c62e20083d42befda7e9ec9e1eac61ba71
author: Simon Howard <fraggle+github@gmail.com>
date: Tue Oct 21 16:48:19 EDT 2014 

Merge pull request #447 from chungy/master

allow -geometry to specify fullscreen or windowed modes, like PrBoom


--- a/src/i_video.c
+++ b/src/i_video.c
@@ -1691,21 +1691,33 @@
 
     //!
     // @category video
-    // @arg <WxY>
+    // @arg <WxY>[wf]
     //
-    // Specify the screen mode (when running fullscreen) or the window
-    // dimensions (when running in windowed mode).
+    // Specify the dimensions of the window or fullscreen mode.  An
+    // optional letter of w or f appended to the dimensions selects
+    // windowed or fullscreen mode.
 
     i = M_CheckParmWithArgs("-geometry", 1);
 
     if (i > 0)
     {
-        int w, h;
+        int w, h, s;
+        char f;
 
-        if (sscanf(myargv[i + 1], "%ix%i", &w, &h) == 2)
+        s = sscanf(myargv[i + 1], "%ix%i%1c", &w, &h, &f);
+        if (s == 2 || s == 3)
         {
             screen_width = w;
             screen_height = h;
+
+            if (s == 3 && f == 'f')
+            {
+                fullscreen = true;
+            }
+            else if (s == 3 && f == 'w')
+            {
+                fullscreen = false;
+            }
         }
     }