X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=4b8753ff6c7494a7aa20a2ee7b7b5ad550d6d955;hb=69c0ba1506ea3cdbb11e0190124229cf37e8b77a;hp=0dc8ea0ddfb9a47b717c9cd35f03a368958a4915;hpb=aeffe316860a47217d9b5074ade03cebda8730c9;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 0dc8ea0d..4b8753ff 100644 --- a/src/init.c +++ b/src/init.c @@ -5232,7 +5232,6 @@ static void InitSetup(void) LoadUserSetup(); // global user number LoadSetup(); // global setup info - LoadSetup_AutoSetup(); // global auto setup info // set some options from setup file @@ -5530,7 +5529,7 @@ static void InitGfx(void) DrawProgramInfo(); - DrawInitText("Loading graphics", 120, FC_GREEN); + DrawInitTextHead("Loading graphics"); // initialize settings for busy animation with default values int parameter[NUM_GFX_ARGS]; @@ -6196,6 +6195,9 @@ void OpenAll(void) InitGlobal(); // initialize some global variables + InitRND(NEW_RANDOMIZE); + InitSimpleRandom(NEW_RANDOMIZE); + print_timestamp_time("[init global stuff]"); InitSetup(); @@ -6231,9 +6233,6 @@ void OpenAll(void) InitMixer(); print_timestamp_time("[init setup/config stuff (6)]"); - InitRND(NEW_RANDOMIZE); - InitSimpleRandom(NEW_RANDOMIZE); - InitJoysticks(); print_timestamp_time("[init setup/config stuff]"); @@ -6333,6 +6332,8 @@ void OpenAll(void) DrawMainMenu(); + CheckUploadTapes(); + #if 0 Debug("internal:path", "SDL_GetBasePath() == '%s'", SDL_GetBasePath());