X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=56998a0530cb33d922709f7dcb17e08caa6858ac;hp=9d25eb5ea4647ad3cc707818e2a5ce66bd21a53e;hb=617fc4a5748a1f2f48614b5dd30915852bf39fc2;hpb=f37c86753d5005bf7ae341d0cbcc15ef75393567

diff --git a/src/main.h b/src/main.h
index 9d25eb5e..56998a05 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2370,10 +2370,13 @@ enum
   GFX_ARG_DRAW_ORDER,
   GFX_ARG_INIT_DELAY_FIXED,
   GFX_ARG_INIT_DELAY_RANDOM,
+  GFX_ARG_INIT_DELAY_ACTION,
   GFX_ARG_ANIM_DELAY_FIXED,
   GFX_ARG_ANIM_DELAY_RANDOM,
+  GFX_ARG_ANIM_DELAY_ACTION,
   GFX_ARG_POST_DELAY_FIXED,
   GFX_ARG_POST_DELAY_RANDOM,
+  GFX_ARG_POST_DELAY_ACTION,
   GFX_ARG_INIT_EVENT,
   GFX_ARG_INIT_EVENT_ACTION,
   GFX_ARG_ANIM_EVENT,
@@ -2386,6 +2389,7 @@ enum
   GFX_ARG_FADE_DELAY,
   GFX_ARG_POST_DELAY,
   GFX_ARG_AUTO_DELAY,
+  GFX_ARG_AUTO_DELAY_UNIT,
   GFX_ARG_ALIGN,
   GFX_ARG_VALIGN,
   GFX_ARG_SORT_PRIORITY,
@@ -2544,7 +2548,7 @@ enum
 // program information and versioning definitions
 #define PROGRAM_VERSION_SUPER		4
 #define PROGRAM_VERSION_MAJOR		1
-#define PROGRAM_VERSION_MINOR		2
+#define PROGRAM_VERSION_MINOR		4
 #define PROGRAM_VERSION_PATCH		0
 #define PROGRAM_VERSION_EXTRA		""
 
@@ -2645,10 +2649,15 @@ struct RequestButtonInfo
   struct TextPosInfo yes;
   struct TextPosInfo no;
   struct TextPosInfo confirm;
+
   struct TextPosInfo player_1;
   struct TextPosInfo player_2;
   struct TextPosInfo player_3;
   struct TextPosInfo player_4;
+
+  struct TextPosInfo touch_yes;
+  struct TextPosInfo touch_no;
+  struct TextPosInfo touch_confirm;
 };
 
 struct MenuMainButtonInfo
@@ -2715,12 +2724,29 @@ struct MenuMainInfo
   struct TextPosInfo network_players;
 };
 
+struct MenuSetupButtonInfo
+{
+  struct MenuPosInfo prev_player;
+  struct MenuPosInfo next_player;
+
+  struct MenuPosInfo touch_back;
+  struct MenuPosInfo touch_next;
+  struct MenuPosInfo touch_back2;
+  struct MenuPosInfo touch_next2;
+};
+
+struct MenuSetupInfo
+{
+  struct MenuSetupButtonInfo button;
+};
+
 struct TitleFadingInfo
 {
   int fade_mode;
   int fade_delay;
   int post_delay;
   int auto_delay;
+  int auto_delay_unit;
 };
 
 struct TitleMessageInfo
@@ -2739,6 +2765,7 @@ struct TitleMessageInfo
   int fade_delay;
   int post_delay;
   int auto_delay;
+  int auto_delay_unit;
 };
 
 struct InitInfo
@@ -2801,6 +2828,7 @@ struct MenuInfo
   int music[NUM_SPECIAL_GFX_ARGS];
 
   struct MenuMainInfo main;
+  struct MenuSetupInfo setup;
 };
 
 struct DoorInfo
@@ -3412,6 +3440,18 @@ struct GlobalAnimInfo
   int music[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS];
 };
 
+struct GlobalAnimEventListInfo
+{
+  int *event_value;
+  int num_event_values;
+};
+
+struct GlobalAnimEventInfo
+{
+  struct GlobalAnimEventListInfo **event_list;
+  int num_event_lists;
+};
+
 struct GraphicInfo
 {
   Bitmap **bitmaps;		// bitmaps in all required sizes
@@ -3449,10 +3489,13 @@ struct GraphicInfo
 
   int init_delay_fixed;		// optional initial delay values for global
   int init_delay_random;	// animations (pause interval before start)
+  int init_delay_action;	// optional action called on animation start
   int anim_delay_fixed;		// optional delay values for bored/sleeping
   int anim_delay_random;	// and global animations (animation length)
+  int anim_delay_action;	// optional action called on animation end
   int post_delay_fixed;		// optional delay values after bored/global
   int post_delay_random;	// animations (pause before next animation)
+  int post_delay_action;	// optional action called after post delay
 
   int init_event;		// optional event triggering animation start
   int init_event_action;	// optional action called on animation start
@@ -3478,6 +3521,7 @@ struct GraphicInfo
   int fade_delay;		// optional setting for drawing title screens
   int post_delay;		// optional setting for drawing title screens
   int auto_delay;		// optional setting for drawing title screens
+  int auto_delay_unit;		// optional setting for drawing title screens
   int align, valign;		// optional setting for drawing title screens
   int sort_priority;		// optional setting for drawing title screens
 
@@ -3701,6 +3745,7 @@ extern struct TokenIntPtrInfo	image_config_vars[];
 extern struct FontInfo		font_info[];
 extern struct GlobalAnimInfo	global_anim_info[];
 extern struct GlobalAnimNameInfo global_anim_name_info[];
+extern struct GlobalAnimEventInfo global_anim_event_info;
 extern struct MusicPrefixInfo	music_prefix_info[];
 extern struct GraphicInfo      *graphic_info;
 extern struct SoundInfo	       *sound_info;