diff --git a/src/d_main.c b/src/d_main.c index 992289116..e073623af 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -103,10 +103,8 @@ static char *startuppwads[MAX_WADFILES]; // autoloading static char *autoloadwadfiles[MAX_WADFILES]; static char *autoloadwadfilespost[MAX_WADFILES]; -boolean autoloading; -boolean autoloaded; +static boolean autoloaded = false; boolean postautoloaded = false; -boolean wasautoloaded = false; // boolean devparm = false; // started game with -devparm @@ -1163,7 +1161,7 @@ static void D_FindAddonsToAutoload(void) // If the file is found, run our shit if (!autoloadconfigfile) // nope outta here { - wasautoloaded = postautoloaded = true; // so D_AddAutoloadFiles can skip everything since nothings there to autoload + autoloaded = postautoloaded = true; // so D_AddAutoloadFiles can skip everything since nothings there to autoload return; } @@ -1211,7 +1209,7 @@ static void D_FindAddonsToAutoload(void) static void D_AddAutoloadFiles(void) { - if (wasautoloaded) + if (autoloaded) return; CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n"); @@ -1219,7 +1217,7 @@ static void D_AddAutoloadFiles(void) CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n"); D_CleanFile(autoloadwadfiles); - wasautoloaded = true; + autoloaded = true; } void D_AddPostloadFiles(void) diff --git a/src/d_main.h b/src/d_main.h index 86c79a63c..deeca4c07 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -61,8 +61,6 @@ extern boolean minilighticon; // mkwii-style minimap headlight // // autoload stuff -extern boolean autoloading; -extern boolean autoloaded; extern boolean postautoloaded; void D_AddPostloadFiles(void); diff --git a/src/m_menu.c b/src/m_menu.c index d70ec6d57..e3416ea97 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6935,9 +6935,9 @@ static void M_ConnectMenuModChecks(INT32 choice) (void)choice; // okay never mind we want to COMMUNICATE to the player pre-emptively instead of letting them try and then get confused when it doesn't work - if (modifiedgame || autoloaded) + if (modifiedgame) { - M_StartMessage(M_GetText("You have addons loaded.\nYou won't be able to join netgames!\n\nTo play online, restart the game\nand don't load any addons.\nSRB2Kart will automatically add\neverything you need when you join.\n\n(Press a key)\n"),M_ConnectMenu,MM_EVENTHANDLER); + M_StartMessage("You have addons loaded.\nYou won't be able to join netgames!\n\nTo play online, restart the game\nand don't load any addons.\nSRB2Kart will automatically add\neverything you need when you join.\n\n(Press a key)\n", M_ConnectMenu, MM_EVENTHANDLER); return; }