rnd-19991005-1-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index a9f061770b0532013b5f64a822ebb52a0711f780..64b0ae4eebecbbf16f01283f7cbda7c35401b5ab 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -55,6 +55,10 @@ static void InitElementProperties(void);
 
 void OpenAll(int argc, char *argv[])
 {
+#ifdef MSDOS
+  initErrorFile();
+#endif
+
   if (options.serveronly)
   {
     NetworkServer(options.server_port, options.serveronly);
@@ -81,8 +85,8 @@ void OpenAll(int argc, char *argv[])
   InitGfx();
   InitElementProperties();     /* initializes IS_CHAR() for el2gfx() */
 
-  InitGadgets();
   InitLevelAndPlayerInfo();
+  InitGadgets();               /* needs to know number of level series */
 
   DrawMainMenu();
 
@@ -107,7 +111,7 @@ void InitLevelAndPlayerInfo()
   LoadLevelInfo();                             /* global level info */
   LoadSetup();                                 /* global setup info */
   LoadLevelSetup_LastSeries();                 /* last played series info */
-  LoadLevelSetup_SeriesInfo(leveldir_nr);      /* last played level info */
+  LoadLevelSetup_SeriesInfo();                 /* last played level info */
 }
 
 void InitNetworkServer()
@@ -472,8 +476,10 @@ void InitGfx()
     { "Toons", TRUE },
     { "SP",    TRUE },
     { "DC",    TRUE },
+    { "More",  TRUE },
     { "Font",  FALSE },
-    { "Font2", FALSE }
+    { "Font2", FALSE },
+    { "Font3", FALSE }
   }; 
 #else
   static struct PictureFileInfo pic[NUM_PICTURES] =
@@ -484,8 +490,10 @@ void InitGfx()
     { "RocksToons",    TRUE },
     { "RocksSP",       TRUE },
     { "RocksDC",       TRUE },
+    { "RocksMore",     TRUE },
     { "RocksFont",     FALSE },
-    { "RocksFont2",    FALSE }
+    { "RocksFont2",    FALSE },
+    { "RocksFont3",    FALSE }
   }; 
 #endif
 
@@ -807,6 +815,7 @@ void InitGadgets()
   CreateGameButtons();
   CreateTapeButtons();
   CreateToolButtons();
+  CreateScreenGadgets();
 }
 
 void InitElementProperties()