fix last commit, oops

This commit is contained in:
UnknownShadow200 2018-09-08 14:56:03 +10:00
parent d298f3ff57
commit aed9ecc651
3 changed files with 5 additions and 5 deletions

View File

@ -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) { }

View File

@ -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;
}

View File

@ -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");