rnd-20020330-4-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 2ddbbcd5769c56c30cadc67d8092fc3fefb3f9f2..f4a7f1aec7ed0cf9df4c4c3482a81c48c79c2714 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -23,6 +23,7 @@
 #include "files.h"
 #include "network.h"
 #include "netserv.h"
+#include "cartoons.h"
 
 static char *image_filename[NUM_PICTURES] =
 {
@@ -38,13 +39,12 @@ static char *image_filename[NUM_PICTURES] =
   "RocksFont3.pcx"
 }; 
 
-static void InitPlayerInfo(void);
 static void InitSetup(void);
+static void InitPlayerInfo(void);
 static void InitLevelInfo(void);
 static void InitNetworkServer(void);
 static void InitSound(void);
 static void InitGfx(void);
-static void InitCustomGraphics(void);
 static void InitGfxBackground(void);
 static void InitGadgets(void);
 static void InitElementProperties(void);
@@ -87,9 +87,9 @@ void OpenAll(void)
   InitLevelInfo();
   InitGadgets();               /* needs to know number of level series */
 
-  InitCustomGraphics();
-
   InitGfxBackground();
+  InitToons();
+
   DrawMainMenu();
 
   InitNetworkServer();
@@ -339,49 +339,6 @@ void InitGfx()
   InitTileClipmasks();
 }
 
-void LoadCustomGraphics()
-{
-#if 0
-  int i;
-
-  for(i=0; i<NUM_PICTURES; i++)
-  {
-    Bitmap *new_pic = 
-    pix_custom[i] = LoadImage(image_filename[i]);
-  }
-#endif
-}
-
-void InitCustomGraphics()
-{
-#if 0
-  static char *filename = NULL;
-
-  /* look for optional directory ~/.<program>/graphics */
-  filename = getPath2(getUserDataDir(), GRAPHICS_DIRECTORY);
-  if (access(dir, F_OK) == 0)
-  {
-  }
-
-
-
-
-(leveldir_current->user_defined ?
-                      getUserLevelDir("") :
-                      options.level_directory),
-                     leveldir_current->fullpath,
-                     basename);
-
-
-
-  filename = getPath3((leveldir_current->user_defined ?
-                      getUserLevelDir("") :
-                      options.level_directory),
-                     leveldir_current->fullpath,
-                     basename);
-#endif
-}
-
 void InitGfxBackground()
 {
   int x, y;