rnd-20020906-3-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index fb8d277c198c8a4357f6d2c7fbc628570c7378ea..be60bd39da567849c0f856466b46bbe28ee6a4cb 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -415,7 +415,8 @@ extern struct GameInfo              game;
 extern struct GlobalInfo       global;
 extern struct ElementInfo      element_info[];
 extern struct GraphicInfo      graphic_info[];
-extern struct ArtworkConfigInfo        image_config[], sound_config[];
+extern struct ConfigInfo       image_config[], sound_config[];
+extern struct FileInfo        *image_files, *sound_files;
 
 /* often used screen positions */
 #define SX                     8
@@ -1459,26 +1460,10 @@ extern struct ArtworkConfigInfo image_config[], sound_config[];
 
 
 /* values for image configuration */
-#define GFX_BD_EMPTY_SPACE_DIGGING             0
-#define GFX_BD_SAND_DIGGING                    1
-#define GFX_BD_DIAMOND_COLLECTING              2
-#define GFX_BD_DIAMOND_IMPACT                  3
-#define GFX_BD_ROCK_PUSHING                    4
-#define GFX_BD_ROCK_IMPACT                     5
-#define GFX_BD_MAGIC_WALL_ACTIVATING           6
-#define GFX_BD_MAGIC_WALL_CHANGING             7
-#define GFX_BD_MAGIC_WALL_RUNNING              8
-#define GFX_BD_AMOEBA_WAITING                  9
-#define GFX_BD_AMOEBA_CREATING                 10
-#define GFX_BD_AMOEBA_TURNING_TO_GEM           11
-#define GFX_BD_AMOEBA_TURNING_TO_ROCK          12
-#define GFX_BD_BUTTERFLY_MOVING                        13
-#define GFX_BD_BUTTERFLY_WAITING               14
-#define GFX_BD_FIREFLY_MOVING                  15
-#define GFX_BD_FIREFLY_WAITING                 16
-#define GFX_BD_EXIT_ENTERING                   17
-
-#define NUM_IMAGE_CONFIG_ENTRIES               18
+#define GFX_BD_DIAMOND                         0
+#define GFX_ROBOT_WHEEL                                1
+
+#define NUM_IMAGE_FILES                                2
 
 
 /* values for sound configuration */
@@ -1652,7 +1637,7 @@ extern struct ArtworkConfigInfo   image_config[], sound_config[];
 #define SND_MENU_HALL_OF_FAME                  167
 #define SND_MENU_INFO_SCREEN                   168
 
-#define NUM_SOUND_CONFIG_ENTRIES               169
+#define NUM_SOUND_FILES                                169
 
 
 /* values for game_status */