Move "resize to nearest" grouped with other resolution-related options

The options for fullscreen and scaling mode were at the top, then there
were various other graphical options, and then the option to resize to
the nearest window size that is of an integer multiple was all the way
below that. Now that last option is moved to be right below the other
options related to window sizing.

desktop_version/src/Game.cpp

@@ -7161,11 +7161,11 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
     case Menu::graphicoptions:
         option("toggle fullscreen");
         option("toggle letterbox");
+        option("resize to nearest", graphics.screenbuffer->isWindowed);
         option("toggle filter");
         option("toggle analogue");
         option("toggle fps");
         option("toggle vsync");
-        option("resize to nearest", graphics.screenbuffer->isWindowed);
         option("return");
         menuyoff = -10;
         break;

desktop_version/src/Input.cpp

@@ -333,37 +333,8 @@ void menuactionpress()
             graphics.screenbuffer->toggleStretchMode();
             game.stretchMode = (game.stretchMode + 1) % 3;
             game.savestats();
-            game.currentmenuoption = 1;
             break;
         case 2:
-            music.playef(11);
-            graphics.screenbuffer->toggleLinearFilter();
-            game.useLinearFilter = !game.useLinearFilter;
-            game.savestats();
-            game.currentmenuoption = 2;
-            break;
-        case 3:
-            //change smoothing
-            music.playef(11);
-            game.fullScreenEffect_badSignal = !game.fullScreenEffect_badSignal;
-            graphics.screenbuffer->badSignalEffect= !graphics.screenbuffer->badSignalEffect;
-            game.savestats();
-            game.currentmenuoption = 3;
-            break;
-        case 4:
-            //toggle 30+ fps
-            music.playef(11);
-            game.over30mode = !game.over30mode;
-            game.savestats();
-            break;
-        case 5:
-            //toggle vsync
-            music.playef(11);
-            graphics.vsync = !graphics.vsync;
-            graphics.processVsync();
-            game.savestats();
-            break;
-        case 6:
             // resize to nearest multiple
             if (graphics.screenbuffer->isWindowed)
             {
@@ -376,6 +347,32 @@ void menuactionpress()
                 music.playef(2);
             }
             break;
+        case 3:
+            music.playef(11);
+            graphics.screenbuffer->toggleLinearFilter();
+            game.useLinearFilter = !game.useLinearFilter;
+            game.savestats();
+            break;
+        case 4:
+            //change smoothing
+            music.playef(11);
+            game.fullScreenEffect_badSignal = !game.fullScreenEffect_badSignal;
+            graphics.screenbuffer->badSignalEffect= !graphics.screenbuffer->badSignalEffect;
+            game.savestats();
+            break;
+        case 5:
+            //toggle 30+ fps
+            music.playef(11);
+            game.over30mode = !game.over30mode;
+            game.savestats();
+            break;
+        case 6:
+            //toggle vsync
+            music.playef(11);
+            graphics.vsync = !graphics.vsync;
+            graphics.processVsync();
+            game.savestats();
+            break;
         default:
             //back
             music.playef(11);

desktop_version/src/Render.cpp

@@ -187,6 +187,16 @@ void menurender()
             }
             break;
         case 2:
+            graphics.bigprint(-1, 30, "Resize to Nearest", tr, tg, tb, true);
+            graphics.Print(-1, 65, "Resize to the nearest window size", tr, tg, tb, true);
+            graphics.Print(-1, 75, "that is of an integer multiple.", tr, tg, tb, true);
+            if (!graphics.screenbuffer->isWindowed)
+            {
+                graphics.Print(-1, 95, "You must be in windowed mode", tr, tg, tb, true);
+                graphics.Print(-1, 105, "to use this option.", tr, tg, tb, true);
+            }
+            break;
+        case 3:
             graphics.bigprint( -1, 30, "Toggle Filter", tr, tg, tb, true);
             graphics.Print( -1, 65, "Change to nearest/linear filter.", tr, tg, tb, true);
 
@@ -197,13 +207,13 @@ void menurender()
             }
             break;
 
-        case 3:
+        case 4:
             graphics.bigprint( -1, 30, "Analogue Mode", tr, tg, tb, true);
             graphics.Print( -1, 65, "There is nothing wrong with your", tr, tg, tb, true);
             graphics.Print( -1, 75, "television set. Do not attempt to", tr, tg, tb, true);
             graphics.Print( -1, 85, "adjust the picture.", tr, tg, tb, true);
             break;
-        case 4:
+        case 5:
             graphics.bigprint(-1, 30, "Toggle 30+ FPS", tr, tg, tb, true);
             graphics.Print(-1, 65, "Change whether the game", tr, tg, tb, true);
             graphics.Print(-1, 75, "runs at 30 or over 30 FPS.", tr, tg, tb, true);
@@ -217,7 +227,7 @@ void menurender()
                 graphics.Print(-1, 95, "Current mode: Over 30 FPS", tr, tg, tb, true);
             }
             break;
-        case 5:
+        case 6:
             graphics.bigprint(-1, 30, "Toggle VSync", tr, tg, tb, true);
             graphics.Print(-1, 65, "Turn VSync on or off.", tr, tg, tb, true);
 
@@ -230,16 +240,6 @@ void menurender()
                 graphics.Print(-1, 95, "Current mode: VSYNC ON", tr, tg, tb, true);
             }
             break;
-        case 6:
-            graphics.bigprint(-1, 30, "Resize to Nearest", tr, tg, tb, true);
-            graphics.Print(-1, 65, "Resize to the nearest window size", tr, tg, tb, true);
-            graphics.Print(-1, 75, "that is of an integer multiple.", tr, tg, tb, true);
-            if (!graphics.screenbuffer->isWindowed)
-            {
-                graphics.Print(-1, 95, "You must be in windowed mode", tr, tg, tb, true);
-                graphics.Print(-1, 105, "to use this option.", tr, tg, tb, true);
-            }
-            break;
         }
         break;
     case Menu::credits: