X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=2cbb77f03e99a60a4e051103c78728c5cce3fa05;hb=8bc9d8febda30d07142948f6b892365d3e11a940;hp=63eacc0167c4621eb686a402301506efd22dd14f;hpb=4c3124b6e2b8454dbf25a30559676bfa1b2a1a87;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 63eacc01..2cbb77f0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -886,7 +886,6 @@
 #define BUTTON_ACTIVE(b)	(ActiveButton[b])
 #define FONT_ACTIVE(f)		(ActiveFont[f])
 
-
 /* fundamental game speed values */
 #define MICROLEVEL_SCROLL_DELAY	50	/* delay for scrolling micro level */
 #define MICROLEVEL_LABEL_DELAY	250	/* delay for micro level label */
@@ -1766,9 +1765,17 @@
 #define ACTION_PAGE_30			81
 #define ACTION_PAGE_31			82
 #define ACTION_PAGE_32			83
-#define ACTION_OTHER			84
-
-#define NUM_ACTIONS			85
+#define ACTION_PART_1			84
+#define ACTION_PART_2			85
+#define ACTION_PART_3			86
+#define ACTION_PART_4			87
+#define ACTION_PART_5			88
+#define ACTION_PART_6			89
+#define ACTION_PART_7			90
+#define ACTION_PART_8			91
+#define ACTION_OTHER			92
+
+#define NUM_ACTIONS			93
 
 #define ACTION_BORING_LAST		ACTION_BORING_10
 #define ACTION_SLEEPING_LAST		ACTION_SLEEPING_3
@@ -1945,6 +1952,10 @@
 #define NUM_FONTS			38
 #define NUM_INITIAL_FONTS		4
 
+/* values for global animation configuration (must match those from main.c) */
+#define NUM_GLOBAL_ANIMS		8
+#define NUM_GLOBAL_ANIM_PARTS		8
+
 /* values for game_status (must match special image configuration suffixes) */
 #define GAME_MODE_DEFAULT		0
 #define GAME_MODE_LOADING		1
@@ -2177,7 +2188,7 @@ struct MenuInfo
   struct TitleFadingInfo leave_menu;
   struct TitleFadingInfo enter_screen[NUM_SPECIAL_GFX_ARGS];
   struct TitleFadingInfo leave_screen[NUM_SPECIAL_GFX_ARGS];
-  struct TitleFadingInfo next_screen;
+  struct TitleFadingInfo next_screen[NUM_SPECIAL_GFX_ARGS];
 
   int sound[NUM_SPECIAL_GFX_ARGS];
   int music[NUM_SPECIAL_GFX_ARGS];
@@ -2327,6 +2338,11 @@ struct EditorPaletteInfo
   struct EditorPaletteElementInfo element_right;
 };
 
+struct EditorDrawingAreaInfo
+{
+  int tile_size;
+};
+
 struct EditorInfo
 {
   struct EditorSettingsInfo settings;
@@ -2334,11 +2350,12 @@ struct EditorInfo
   struct EditorButtonInfo button;
   struct EditorInputInfo input;
   struct EditorPaletteInfo palette;
+  struct EditorDrawingAreaInfo drawingarea;
 };
 
 struct ViewportInfo
 {
-  struct RectWithBorder window;
+  struct RectWithBorder window[NUM_SPECIAL_GFX_ARGS];
   struct RectWithBorder playfield[NUM_SPECIAL_GFX_ARGS];
   struct RectWithBorder door_1[NUM_SPECIAL_GFX_ARGS];
   struct RectWithBorder door_2[NUM_SPECIAL_GFX_ARGS];
@@ -2492,6 +2509,7 @@ struct LevelInfo
   boolean use_time_orb_bug;	/* for compatibility with old levels */
   boolean instant_relocation;	/* no visual delay when relocating player */
   boolean shifted_relocation;	/* no level centering when relocating player */
+  boolean lazy_relocation;	/* only redraw off-screen player relocation */
   boolean can_pass_to_walkable;	/* player can pass to empty or walkable tile */
   boolean grow_into_diggable;	/* amoeba can grow into anything diggable */
   boolean auto_exit_sokoban;	/* automatically finish solved Sokoban levels */
@@ -2737,6 +2755,14 @@ struct FontInfo
   				/* internal bitmap ID for special graphics */
 };
 
+struct GlobalAnimInfo
+{
+  char *token_name;		/* global animation token in config files */
+
+  /* global animation parts for certain screens */
+  int graphic[NUM_GLOBAL_ANIM_PARTS][NUM_SPECIAL_GFX_ARGS];
+};
+
 struct GraphicInfo
 {
   Bitmap **bitmaps;		/* bitmaps in all required sizes */
@@ -2882,6 +2908,7 @@ extern DrawBuffer	       *fieldbuffer;
 extern DrawBuffer	       *drawto_field;
 
 extern int			game_status;
+extern boolean			game_status_last_screen;
 extern boolean			level_editor_test_game;
 extern boolean			network_playing;
 
@@ -2983,9 +3010,17 @@ extern struct TitleFadingInfo	fading;
 extern struct TitleFadingInfo	fading_none;
 extern struct TitleFadingInfo	title_initial_default;
 extern struct TitleFadingInfo	title_default;
+extern struct TitleMessageInfo	titlescreen_initial_default;
+extern struct TitleMessageInfo	titlescreen_initial_first[];
+extern struct TitleMessageInfo	titlescreen_initial[];
+extern struct TitleMessageInfo	titlescreen_default;
+extern struct TitleMessageInfo	titlescreen_first[];
+extern struct TitleMessageInfo	titlescreen[];
 extern struct TitleMessageInfo	titlemessage_initial_default;
+extern struct TitleMessageInfo	titlemessage_initial_first[];
 extern struct TitleMessageInfo	titlemessage_initial[];
 extern struct TitleMessageInfo	titlemessage_default;
+extern struct TitleMessageInfo	titlemessage_first[];
 extern struct TitleMessageInfo	titlemessage[];
 extern struct TitleMessageInfo	readme;
 extern struct InitInfo		init, init_last;
@@ -3001,6 +3036,7 @@ extern struct ElementDirectionInfo element_direction_info[];
 extern struct SpecialSuffixInfo special_suffix_info[];
 extern struct TokenIntPtrInfo	image_config_vars[];
 extern struct FontInfo		font_info[];
+extern struct GlobalAnimInfo	global_anim_info[];
 extern struct MusicPrefixInfo	music_prefix_info[];
 extern struct GraphicInfo      *graphic_info;
 extern struct SoundInfo	       *sound_info;