Move Mapster32 autoexec to before the map specified on the command line is loaded, to allow EVENT_PRELOADMAP and EVENT_LOADMAP to work when loading a map from the command line. This makes the console output of autoexec a little worse but the OSD will be fixed at a later time.

git-svn-id: https://svn.eduke32.com/eduke32@6223 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-06-23 03:58:01 +00:00
parent e2c44ae253
commit e3f3a8ce33

View file

@ -748,6 +748,9 @@ int app_main(int argc, char const * const * argv)
mkonwinvalid();
// executed once per init
OSD_Exec("m32_autoexec.cfg");
if (LoadBoard(boardfilename, 1))
reset_default_mapstate();
@ -776,9 +779,6 @@ int app_main(int argc, char const * const * argv)
Bexit(0);
}
// executed once per init, but after setgamemode so that OSD has the right width
OSD_Exec("m32_autoexec.cfg");
system_getcvars();
overheadeditor();
@ -802,9 +802,6 @@ int app_main(int argc, char const * const * argv)
Bexit(0);
}
// executed once per init, but after setgamemode so that OSD has the right width
OSD_Exec("m32_autoexec.cfg");
system_getcvars();
setbrightness(GAMMA_CALC,0,0);