X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=31264e0345dbc73b994973a000ee2883729a853e;hb=ff2510f5098b545a03965c6b95296eec6885a4fb;hp=423058b41caa668af44b5ef5a1042c1faaf27070;hpb=7b47ce7ba0f673f0de5130daf5726104d0b38902;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 423058b4..31264e03 100644
--- a/src/main.h
+++ b/src/main.h
@@ -172,6 +172,16 @@
 
 #define PLAYER_NR_GFX(g,i)	((g) + i * (IMG_PLAYER2 - IMG_PLAYER1))
 
+#define ANIM_FRAMES(g)		(graphic_info[g].anim_frames)
+#define ANIM_DELAY(g)		(graphic_info[g].anim_delay)
+#define ANIM_MODE(g)		(graphic_info[g].anim_mode)
+
+#define IS_ANIMATED(g)		(ANIM_FRAMES(g) > 1)
+#define IS_NEW_DELAY(f, g)	((f) % ANIM_DELAY(g) == 0)
+#define IS_NEW_FRAME(f, g)	(IS_ANIMATED(g) && IS_NEW_DELAY(f, g))
+
+#define IS_LOOP_SOUND(s)	(sound_info[s].loop)
+
 
 #if 0
 
@@ -744,19 +754,23 @@
 #define EL_AMOEBA_DRY_PART2			(EL_FIRST_DUMMY + 22)
 #define EL_AMOEBA_DRY_PART3			(EL_FIRST_DUMMY + 23)
 #define EL_AMOEBA_DRY_PART4			(EL_FIRST_DUMMY + 24)
-#define EL_AMOEBA_DEAD_PART1			(EL_FIRST_DUMMY + 25)
-#define EL_AMOEBA_DEAD_PART2			(EL_FIRST_DUMMY + 26)
-#define EL_AMOEBA_DEAD_PART3			(EL_FIRST_DUMMY + 27)
-#define EL_AMOEBA_DEAD_PART4			(EL_FIRST_DUMMY + 28)
-#define EL_DYNABOMB_ACTIVE			(EL_FIRST_DUMMY + 29)
-#define EL_SHIELD_NORMAL_ACTIVE			(EL_FIRST_DUMMY + 30)
-#define EL_SHIELD_DEADLY_ACTIVE			(EL_FIRST_DUMMY + 31)
-#define EL_ARROW_RED_LEFT			(EL_FIRST_DUMMY + 32)
-#define EL_ARROW_RED_RIGHT			(EL_FIRST_DUMMY + 33)
-#define EL_ARROW_RED_UP				(EL_FIRST_DUMMY + 34)
-#define EL_ARROW_RED_DOWN			(EL_FIRST_DUMMY + 35)
-
-#define MAX_NUM_ELEMENTS			(EL_FIRST_DUMMY + 36)
+#define EL_AMOEBA_FULL_PART1			(EL_FIRST_DUMMY + 25)
+#define EL_AMOEBA_FULL_PART2			(EL_FIRST_DUMMY + 26)
+#define EL_AMOEBA_FULL_PART3			(EL_FIRST_DUMMY + 27)
+#define EL_AMOEBA_FULL_PART4			(EL_FIRST_DUMMY + 28)
+#define EL_AMOEBA_DEAD_PART1			(EL_FIRST_DUMMY + 29)
+#define EL_AMOEBA_DEAD_PART2			(EL_FIRST_DUMMY + 30)
+#define EL_AMOEBA_DEAD_PART3			(EL_FIRST_DUMMY + 31)
+#define EL_AMOEBA_DEAD_PART4			(EL_FIRST_DUMMY + 32)
+#define EL_DYNABOMB_ACTIVE			(EL_FIRST_DUMMY + 33)
+#define EL_SHIELD_NORMAL_ACTIVE			(EL_FIRST_DUMMY + 34)
+#define EL_SHIELD_DEADLY_ACTIVE			(EL_FIRST_DUMMY + 35)
+#define EL_ARROW_RED_LEFT			(EL_FIRST_DUMMY + 36)
+#define EL_ARROW_RED_RIGHT			(EL_FIRST_DUMMY + 37)
+#define EL_ARROW_RED_UP				(EL_FIRST_DUMMY + 38)
+#define EL_ARROW_RED_DOWN			(EL_FIRST_DUMMY + 39)
+
+#define MAX_NUM_ELEMENTS			(EL_FIRST_DUMMY + 40)
 
 
 /* values for graphics/sounds action types */
@@ -784,6 +798,11 @@
 
 #define NUM_ACTIONS				21
 
+/* values for special image configuration suffixes */
+#define GFX_SPECIAL_ARG_EDITOR			0
+
+#define NUM_SPECIAL_GFX_ARGS			1
+
 
 /* values for image configuration suffixes */
 #define GFX_ARG_XPOS				0
@@ -1027,14 +1046,17 @@ struct GlobalInfo
 
 struct ElementInfo
 {
-  char *token_name;		/* element token used in config files */
+  char *token_name;		/* element token prefix used in config files */
   char *sound_class_name;	/* classification for custom sound effects */
   char *editor_description;	/* short description for level editor */
+  char *custom_description;	/* custom description for level editor */
 
   int graphic[NUM_ACTIONS];	/* default graphics for several actions */
 				/* special graphics for left/right/up/down */
   int direction_graphic[NUM_ACTIONS][NUM_DIRECTIONS];
 
+  int editor_graphic;		/* graphic displayed in level editor */
+
   int sound[NUM_ACTIONS];	/* default sounds for several actions */
 };
 
@@ -1073,6 +1095,12 @@ struct ElementDirectionInfo
   int value;
 };
 
+struct SpecialSuffixInfo
+{
+  char *suffix;
+  int value;
+};
+
 
 #if 0
 extern GC			tile_clip_gc;
@@ -1112,7 +1140,8 @@ extern unsigned long		Properties1[MAX_NUM_ELEMENTS];
 extern unsigned long		Properties2[MAX_NUM_ELEMENTS];
 
 extern int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern short			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern int			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
 extern int			lev_fieldx, lev_fieldy;
 extern int			scroll_x, scroll_y;
@@ -1148,10 +1177,10 @@ extern struct GlobalInfo	global;
 extern struct ElementInfo	element_info[];
 extern struct ElementActionInfo	element_action_info[];
 extern struct ElementDirectionInfo element_direction_info[];
-extern struct GraphicInfo	graphic_info[];
-extern struct SoundInfo		sound_info[];
+extern struct SpecialSuffixInfo special_suffix_info[];
+extern struct GraphicInfo      *graphic_info;
+extern struct SoundInfo	       *sound_info;
 extern struct ConfigInfo	image_config[], sound_config[];
 extern struct ConfigInfo	image_config_suffix[], sound_config_suffix[];
-extern struct FileInfo	       *image_files, *sound_files;
 
 #endif	/* MAIN_H */