From 0a2af2162fb02c42e087ce2370acb3cfdb5e39ec Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Tue, 10 Sep 2019 20:37:50 +1000 Subject: [PATCH] fix game starting in singleplayer as -psn_0_ user if launched from a bundle on OSX --- src/Platform.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Platform.c b/src/Platform.c index 651b4aeec..af0fb9c27 100644 --- a/src/Platform.c +++ b/src/Platform.c @@ -1570,11 +1570,19 @@ void Platform_Free(void) { } #ifndef CC_BUILD_ANDROID int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, String* args) { int i, count; - argc--; /* skip executable path argument */ + argc--; argv++; /* skip executable path argument */ + +#ifdef CC_BUILD_OSX + if (argc) { + String arg0 = String_FromReadonly(argv[0]); + String psn = String_FromConst("-psn_0_"); + if (String_CaselessStarts(&arg0, &psn)) { argc--; argv++; } + } +#endif count = min(argc, GAME_MAX_CMDARGS); for (i = 0; i < count; i++) { - args[i] = String_FromReadonly(argv[i + 1]); + args[i] = String_FromReadonly(argv[i]); } return count; }