diff --git a/src/d_netcmd.c b/src/d_netcmd.c index d790f324a..e095bad38 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -4601,7 +4601,7 @@ static void Command_GLocalSkin (void) char* fuck; // local skin name - if (!( first_option = COM_FirstOption() )) + if (!(first_option = COM_FirstOption())) first_option = COM_Argc(); if (first_option < 2) @@ -4609,14 +4609,14 @@ static void Command_GLocalSkin (void) /* holy fucking shit */ CONS_Printf("localskin [-player ] [-display ] [-all]:\n"); CONS_Printf(M_GetText("Set a localskin via its internal name (usually printed on the console).\n\n\ -* Using \"-player\" will set a localskin to a specified player.\n\ - Defaults to yourself.\n\ -* Using \"-display\" will set a localskin to the displayed player.\n\ - Defaults to 0, which is the first player displayed.\n\ - Can go up to 3 for splitscreen.\n\ -* Using \"-all\" will set a localskin to ALL players.\n\ -* \"localskin none\" removes the localskin, just like how\n\ - \"forceskin none\" does.\n")); + * Using \"-player\" will set a localskin to a specified player.\n\ + Defaults to yourself.\n\ + * Using \"-display\" will set a localskin to the displayed player.\n\ + Defaults to 0, which is the first player displayed.\n\ + Can go up to 3 for splitscreen.\n\ + * Using \"-all\" will set a localskin to ALL players.\n\ + * \"localskin none\" removes the localskin, just like how\n\ + \"forceskin none\" does.\n")); return; } diff --git a/src/r_things.c b/src/r_things.c index 847b3aa5b..527f77e7b 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -3712,7 +3712,6 @@ next_token: numallskins++; } -#undef lskin #undef lnumskins //sortSkinGrid(); diff --git a/src/w_wad.c b/src/w_wad.c index 69f6a7c64..cdd96b259 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -897,8 +897,10 @@ INT32 W_InitMultipleFiles(char **filenames, boolean addons) //CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames); rc = W_InitFile(*filenames, false); + if (rc == INT16_MAX) CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), *filenames); + overallrc &= (rc != INT16_MAX) ? 1 : 0; } @@ -917,8 +919,10 @@ INT32 W_AddAutoloadedLocalFiles(char **filenames) for (; *filenames; filenames++) { rc = P_PartialAddWadFile(*filenames, true); + if (rc == UINT16_MAX) CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), *filenames); + overallrc &= (rc != UINT16_MAX) ? 1 : 0; } @@ -927,6 +931,7 @@ INT32 W_AddAutoloadedLocalFiles(char **filenames) if (P_PartialAddGetStage() >= 0) P_MultiSetupWadFiles(true); + return overallrc; }