From 6648246662382a5d4a6d7315686a681f5332616e Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Sun, 21 Jun 2020 18:37:44 -0700
Subject: [PATCH] Fix -playx/y/rx/ry/gc/music looking at wrong argument

In my previous PR, I wrongly assumed that I could just replace the `i`
handling code of those options with an `i++;` at the beginning, and thus
I could put all blocks' `i++;` into ARG_INNER(). Well I was wrong,
because the code was written the original way for a reason, namely that
we still need `i` to point to the -playx/y/rx/ry/gc/music argv so we can
re-compare which argument led us into this code block.
---
 desktop_version/src/main.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index ab38f211..9e481981 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -79,7 +79,6 @@ int main(int argc, char *argv[])
 #define ARG_INNER(code) \
     if (i + 1 < argc) \
     { \
-        i++; \
         code \
     } \
     else \
@@ -91,24 +90,28 @@ int main(int argc, char *argv[])
         if (ARG("-renderer"))
         {
             ARG_INNER({
+                i++;
                 SDL_SetHintWithPriority(SDL_HINT_RENDER_DRIVER, argv[i], SDL_HINT_OVERRIDE);
             })
         }
         else if (ARG("-basedir"))
         {
             ARG_INNER({
+                i++;
                 baseDir = argv[i];
             })
         }
         else if (ARG("-assets"))
         {
             ARG_INNER({
+                i++;
                 assetsPath = argv[i];
             })
         }
         else if (ARG("-playing") || ARG("-p"))
         {
             ARG_INNER({
+                i++;
                 startinplaytest = true;
                 playtestname = std::string("levels/");
                 playtestname.append(argv[i]);
@@ -121,19 +124,21 @@ int main(int argc, char *argv[])
         {
             ARG_INNER({
                 savefileplaytest = true;
-                int v = std::atoi(argv[i]);
+                int v = std::atoi(argv[i+1]);
                 if (ARG("-playx")) savex = v;
                 else if (ARG("-playy")) savey = v;
                 else if (ARG("-playrx")) saverx = v;
                 else if (ARG("-playry")) savery = v;
                 else if (ARG("-playgc")) savegc = v;
                 else if (ARG("-playmusic")) savemusic = v;
+                i++;
             })
         }
         else if (ARG("-playassets"))
         {
-            // Even if this is a directory, FILESYSTEM_mountassets() expects '.vvvvvv' on the end
             ARG_INNER({
+                i++;
+                // Even if this is a directory, FILESYSTEM_mountassets() expects '.vvvvvv' on the end
                 playassets = "levels/" + std::string(argv[i]) + ".vvvvvv";
             })
         }