From 3cfa409ba7d33aa9ffaa224c481651b28f39f1d2 Mon Sep 17 00:00:00 2001
From: Colin Cornaby <colin.cornaby@mac.com>
Date: Sat, 12 Aug 2023 21:05:26 -0700
Subject: [PATCH] Catching up with skip preload changes

---
 .../Plasma/Apps/plClient/Mac-Cocoa/main.mm    | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/Sources/Plasma/Apps/plClient/Mac-Cocoa/main.mm b/Sources/Plasma/Apps/plClient/Mac-Cocoa/main.mm
index d949bdef8e..5812cefc3b 100644
--- a/Sources/Plasma/Apps/plClient/Mac-Cocoa/main.mm
+++ b/Sources/Plasma/Apps/plClient/Mac-Cocoa/main.mm
@@ -76,7 +76,8 @@
 void PumpMessageQueueProc();
 
 extern bool gDataServerLocal;
-extern bool gSkipPreload;
+extern bool gPythonLocal;
+extern bool gSDLLocal;
 
 bool NeedsResolutionUpdate = false;
 
@@ -132,7 +133,8 @@ @interface AppDelegate : NSWindowController <NSApplicationDelegate,
     kArgSkipLoginDialog,
     kArgServerIni,
     kArgLocalData,
-    kArgSkipPreload,
+    kArgLocalPython,
+    kArgLocalSDL,
     kArgPlayerId,
     kArgStartUpAgeName,
     kArgPvdFile,
@@ -141,15 +143,16 @@ @interface AppDelegate : NSWindowController <NSApplicationDelegate,
 };
 
 static const plCmdArgDef s_cmdLineArgs[] = {
-    {kCmdArgFlagged | kCmdTypeBool, "SkipLoginDialog", kArgSkipLoginDialog},
-    {kCmdArgFlagged | kCmdTypeString, "ServerIni", kArgServerIni},
-    {kCmdArgFlagged | kCmdTypeBool, "LocalData", kArgLocalData},
-    {kCmdArgFlagged | kCmdTypeBool, "SkipPreload", kArgSkipPreload},
-    {kCmdArgFlagged | kCmdTypeInt, "PlayerId", kArgPlayerId},
-    {kCmdArgFlagged | kCmdTypeString, "Age", kArgStartUpAgeName},
-    {kCmdArgFlagged | kCmdTypeString, "PvdFile", kArgPvdFile},
-    {kCmdArgFlagged | kCmdTypeBool, "SkipIntroMovies", kArgSkipIntroMovies},
-    {kCmdArgFlagged | kCmdTypeString, "Renderer", kArgRenderer},
+    { kCmdArgFlagged  | kCmdTypeBool,       "SkipLoginDialog", kArgSkipLoginDialog },
+    { kCmdArgFlagged  | kCmdTypeString,     "ServerIni",       kArgServerIni },
+    { kCmdArgFlagged  | kCmdTypeBool,       "LocalData",       kArgLocalData   },
+    { kCmdArgFlagged  | kCmdTypeBool,       "LocalPython",     kArgLocalPython },
+    { kCmdArgFlagged  | kCmdTypeBool,       "LocalSDL",        kArgLocalSDL },
+    { kCmdArgFlagged  | kCmdTypeInt,        "PlayerId",        kArgPlayerId },
+    { kCmdArgFlagged  | kCmdTypeString,     "Age",             kArgStartUpAgeName },
+    { kCmdArgFlagged  | kCmdTypeString,     "PvdFile",         kArgPvdFile },
+    { kCmdArgFlagged  | kCmdTypeBool,       "SkipIntroMovies", kArgSkipIntroMovies },
+    { kCmdArgFlagged  | kCmdTypeString,     "Renderer",        kArgRenderer },
 };
 
 plCmdParser cmdParser(s_cmdLineArgs, std::size(s_cmdLineArgs));
@@ -308,9 +311,12 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
 
     if (cmdParser.IsSpecified(kArgLocalData)) {
         gDataServerLocal = true;
-        gSkipPreload = true;
+        gPythonLocal = true;
     }
-    if (cmdParser.IsSpecified(kArgSkipPreload)) gSkipPreload = true;
+    if (cmdParser.IsSpecified(kArgLocalPython))
+        gPythonLocal = true;
+    if (cmdParser.IsSpecified(kArgLocalSDL))
+        gSDLLocal = true;
 
 #ifndef PLASMA_EXTERNAL_RELEASE
     // if (cmdParser.IsSpecified(kArgSkipLoginDialog))
@@ -330,7 +336,7 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
     NetCommConnect();
     [[PLSServerStatus sharedStatus] loadServerStatus];
 
-    if (gSkipPreload) {
+    if (gDataServerLocal) {
         [self initializeClient];
     } else {
         [self prepatch];