From aed9ecc65179e8125d8f046d29dbbcad428d4fd6 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 8 Sep 2018 14:56:03 +1000 Subject: [PATCH] fix last commit, oops --- src/Game.c | 1 - src/Platform.c | 2 +- src/Program.c | 7 ++++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Game.c b/src/Game.c index 7ccc17689..ddea0e809 100644 --- a/src/Game.c +++ b/src/Game.c @@ -749,7 +749,6 @@ void Game_Run(Int32 width, Int32 height, STRING_REF String* title, struct Displa void AdvLightingBuilder_SetActive(void) { NormalBuilder_SetActive(); } #if CC_BUILD_NIX void Waitable_WaitFor(void* handle, UInt32 milliseconds) { } -STRING_PURE String Platform_GetCommandLineArgs(void) { return String_MakeNull(); } void Audio_Init(AudioHandle* handle, Int32 buffers) { } void Audio_Free(AudioHandle handle) { } diff --git a/src/Platform.c b/src/Platform.c index 14bc0ea6c..8e7e26085 100644 --- a/src/Platform.c +++ b/src/Platform.c @@ -1394,7 +1394,7 @@ Int32 Platform_GetCommandLineArgs(int argc, char** argv, STRING_TRANSIENT String Int32 i, count = min(argc, PROGRAM_MAX_CMDARGS); for (i = 0; i < count; i++) { - args[i] = String_FromReadonly(argv[i]); + args[i] = String_FromReadonly(argv[i + 1]); } return count; } diff --git a/src/Program.c b/src/Program.c index 073fe7a03..902b4601f 100644 --- a/src/Program.c +++ b/src/Program.c @@ -69,10 +69,11 @@ int main(int argc, char** argv) { // String rawArgs = String_FromConst("UnknownShadow200 fff 127.0.0.1 25565"); // argsCount = 4; String_UNSAFE_Split(&rawArgs, ' ', args, &argsCount); - if (argsCount == 1) { - String name = args[0]; - if (!name.length) name = String_FromReadonly("Singleplayer"); + if (argsCount == 0) { + String name = String_FromConst("Singleplayer"); String_Copy(&Game_Username, &name); + } else if (argsCount == 1) { + String_Copy(&Game_Username, &args[0]); } else if (argsCount < 4) { ErrorHandler_ShowDialog("Failed to start", "ClassiCube.exe is only the raw client.\n\n" \ "Use the launcher instead, or provide command line arguments");