rnd-20020907-1-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 54d1d6b7da565c5a467703cd6d8aaa7a068f9904..68466fe5d63e82b1225da3aabfe6f9680c1c1816 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2001 Artsoft Entertainment                      *
+* (c) 1995-2002 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -136,7 +136,33 @@ char *sound_name[NUM_SOUNDS] =
   "gate.wav"
 };
 
-struct SoundEffectInfo sound_effects[] =
+char *image_config_suffix[] =
+{
+  ".frame_xpos",
+  ".frame_ypos",
+  ".num_frames",
+  NULL
+};
+
+char *sound_config_suffix[] =
+{
+  NULL
+};
+
+struct ConfigInfo image_config[] =
+{
+  /* graphics for Boulder Dash style elements and actions */
+  { "bd_diamond",                      "bd_diamond.pcx"        },
+  { "bd_diamond.frame_xpos",           "0"                     },
+  { "bd_diamond.num_frames",           "1"                     },
+  { "robot_wheel",                     "bd_diamond.pcx"        },
+  { "robot_wheel.frame_xpos",          "0"                     },
+  { "robot_wheel.num_frames",          "4"                     },
+
+  { NULL,                              NULL                    },
+};
+
+struct ConfigInfo sound_config[] =
 {
   /* sounds for Boulder Dash style elements and actions */
   { "bd_empty_space.digging",          "empty.wav"             },
@@ -150,7 +176,6 @@ struct SoundEffectInfo sound_effects[] =
   { "bd_magic_wall.running",           "miep.wav"              },
   { "bd_amoeba.waiting",               SND_FILE_UNDEFINED      },
   { "bd_amoeba.creating",              "amoebe.wav"            },
-  { "bd_amoeba.growing",               SND_FILE_UNDEFINED      },
   { "bd_amoeba.turning_to_gem",                "pling.wav"             },
   { "bd_amoeba.turning_to_rock",       "klopf.wav"             },
   { "bd_butterfly.moving",             "klapper.wav"           },
@@ -221,7 +246,6 @@ struct SoundEffectInfo sound_effects[] =
   { "magic_wall.running",              "miep.wav"              },
   { "amoeba.waiting",                  SND_FILE_UNDEFINED      },
   { "amoeba.creating",                 "amoebe.wav"            },
-  { "amoeba.growing",                  SND_FILE_UNDEFINED      },
   { "amoeba.dropping",                 SND_FILE_UNDEFINED      },
   { "acid.splashing",                  "blurb.wav"             },
   { "quicksand.filling",               SND_FILE_UNDEFINED      },
@@ -296,10 +320,8 @@ struct SoundEffectInfo sound_effects[] =
   { "time_orb_empty.impact",           "deng.wav"              },
   { "gameoflife.waiting",              SND_FILE_UNDEFINED      },
   { "gameoflife.creating",             "amoebe.wav"            },
-  { "gameoflife.growing",              SND_FILE_UNDEFINED      },
   { "biomaze.waiting",                 SND_FILE_UNDEFINED      },
   { "biomaze.creating",                        "amoebe.wav"            },
-  { "biomaze.growing",                 SND_FILE_UNDEFINED      },
   { "pacman.moving",                   SND_FILE_UNDEFINED      },
   { "pacman.waiting",                  SND_FILE_UNDEFINED      },
   { "pacman.eating_amoeba",            SND_FILE_UNDEFINED      },
@@ -355,9 +377,14 @@ struct SoundEffectInfo sound_effects[] =
   { "[not used]",                      "whoosh.wav"            },
   { "[not used]",                      "boom.wav"              },
 #endif
+
+  { NULL,                              NULL                    },
 };
 
-struct ElementInfo element_info[] =
+struct FileInfo *image_files;
+struct FileInfo *sound_files;
+
+struct ElementInfo element_info[MAX_ELEMENTS] =
 {
   { "empty_space",             "empty space"                   },      /* 0 */
   { "sand",                    "sand"                          },
@@ -727,6 +754,8 @@ struct ElementInfo element_info[] =
   */
 };
 
+struct GraphicInfo graphic_info[MAX_GRAPHICS];
+
 
 /* ========================================================================= */
 /* main()                                                                    */
@@ -743,5 +772,6 @@ int main(int argc, char *argv[])
 
   EventLoop();
   CloseAllAndExit(0);
-  exit(0);     /* to keep compilers happy */
+
+  return 0;    /* to keep compilers happy */
 }