X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=0fc74cb2264f1ae2636e59d7eff73066fc899e9c;hb=eff5510ff8a7afc155b0cc1b1383583354c820aa;hp=45ce857f99dc2f4adc954c024ddea6db94f7eb9b;hpb=86d415d483595dc87c7b78991554744c680af740;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 45ce857f..0fc74cb2 100644
--- a/src/main.h
+++ b/src/main.h
@@ -200,7 +200,7 @@
 #define EP_BITMASK_BASE_DEFAULT		(1 << EP_CAN_MOVE_INTO_ACID)
 #define EP_BITMASK_DEFAULT		0
 
-#define PROPERTY_BIT(p)			(1 << ((p) % 32))
+#define PROPERTY_BIT(p)			(1u << ((p) % 32))
 #define PROPERTY_VAR(e,p)		(element_info[e].properties[(p) / 32])
 #define HAS_PROPERTY(e,p)	((PROPERTY_VAR(e, p) & PROPERTY_BIT(p)) != 0)
 #define SET_PROPERTY(e,p,v)	((v) ?					   \
@@ -2299,6 +2299,7 @@ enum
 enum
 {
   GFX_SPECIAL_ARG_DEFAULT = 0,
+  GFX_SPECIAL_ARG_LOADING_INITIAL,
   GFX_SPECIAL_ARG_LOADING,
   GFX_SPECIAL_ARG_TITLE_INITIAL,
   GFX_SPECIAL_ARG_TITLE_INITIAL_1,
@@ -2329,6 +2330,7 @@ enum
   GFX_SPECIAL_ARG_CRUMBLED,
   GFX_SPECIAL_ARG_MAINONLY,
   GFX_SPECIAL_ARG_NAMESONLY,
+  GFX_SPECIAL_ARG_SCORESONLY,
   GFX_SPECIAL_ARG_TYPENAME,
   GFX_SPECIAL_ARG_TYPENAMES,
   GFX_SPECIAL_ARG_SUBMENU,
@@ -2409,6 +2411,7 @@ enum
   GFX_ARG_DELAY,
   GFX_ARG_ANIM_MODE,
   GFX_ARG_GLOBAL_SYNC,
+  GFX_ARG_GLOBAL_ANIM_SYNC,
   GFX_ARG_CRUMBLED_LIKE,
   GFX_ARG_DIGGABLE_LIKE,
   GFX_ARG_BORDER_SIZE,
@@ -2551,6 +2554,7 @@ enum
 
 // values for game_status (must match special image configuration suffixes)
 #define GAME_MODE_DEFAULT		GFX_SPECIAL_ARG_DEFAULT
+#define GAME_MODE_LOADING_INITIAL	GFX_SPECIAL_ARG_LOADING_INITIAL
 #define GAME_MODE_LOADING		GFX_SPECIAL_ARG_LOADING
 #define GAME_MODE_TITLE_INITIAL		GFX_SPECIAL_ARG_TITLE_INITIAL
 #define GAME_MODE_TITLE_INITIAL_1	GFX_SPECIAL_ARG_TITLE_INITIAL_1
@@ -2581,6 +2585,7 @@ enum
 #define GAME_MODE_PSEUDO_CRUMBLED	GFX_SPECIAL_ARG_CRUMBLED
 #define GAME_MODE_PSEUDO_MAINONLY	GFX_SPECIAL_ARG_MAINONLY
 #define GAME_MODE_PSEUDO_NAMESONLY	GFX_SPECIAL_ARG_NAMESONLY
+#define GAME_MODE_PSEUDO_SCORESONLY	GFX_SPECIAL_ARG_SCORESONLY
 #define GAME_MODE_PSEUDO_TYPENAME	GFX_SPECIAL_ARG_TYPENAME
 #define GAME_MODE_PSEUDO_TYPENAMES	GFX_SPECIAL_ARG_TYPENAMES
 #define GAME_MODE_PSEUDO_SUBMENU	GFX_SPECIAL_ARG_SUBMENU
@@ -2606,18 +2611,18 @@ enum
 // program information and versioning definitions
 #define PROGRAM_VERSION_SUPER		4
 #define PROGRAM_VERSION_MAJOR		3
-#define PROGRAM_VERSION_MINOR		2
-#define PROGRAM_VERSION_PATCH		0
+#define PROGRAM_VERSION_MINOR		3
+#define PROGRAM_VERSION_PATCH		1
 #define PROGRAM_VERSION_EXTRA		""
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
 #define PROGRAM_EMAIL_STRING		"info@artsoft.org"
 #define PROGRAM_WEBSITE_STRING		"https://www.artsoft.org/"
-#define PROGRAM_COPYRIGHT_STRING	"Copyright \xa9""1995-2022 by Holger Schemel"
+#define PROGRAM_COPYRIGHT_STRING	"1995-2022 by Holger Schemel"
 #define PROGRAM_COMPANY_STRING		"A Game by Artsoft Entertainment"
 
-#define PROGRAM_ICON_FILENAME		"RocksIcon32x32.png"
+#define PROGRAM_ICON_FILENAME		"icons/icon.png"
 
 #define COOKIE_PREFIX			"ROCKSNDIAMONDS"
 
@@ -2812,6 +2817,7 @@ struct MenuScoresButtonInfo
   struct MenuPosInfo next_level;
   struct MenuPosInfo prev_score;
   struct MenuPosInfo next_score;
+  struct MenuPosInfo play_tape;
 };
 
 struct MenuScoresInfo
@@ -2849,7 +2855,9 @@ struct TitleMessageInfo
 
 struct InitInfo
 {
+  struct MenuPosInfo busy_initial;
   struct MenuPosInfo busy;
+  struct MenuPosInfo busy_playfield;
 };
 
 struct MenuInfo
@@ -3116,10 +3124,14 @@ struct ScoreInfo
   int last_added_local;
   int last_level_nr;
   int last_entry_nr;
+  int next_level_nr;
 
   boolean updated;
   boolean uploaded;
+  boolean tape_downloaded;
   boolean force_last_added;
+  boolean continue_playing;
+  boolean continue_on_return;
 
   struct ScoreEntry entry[MAX_SCORE_ENTRIES];
 };
@@ -3615,6 +3627,7 @@ struct GraphicInfo
   int anim_mode;
 
   boolean anim_global_sync;
+  boolean anim_global_anim_sync;
 
   int crumbled_like;		// element for cloning crumble graphics
   int diggable_like;		// element for cloning digging graphics
@@ -3711,7 +3724,7 @@ struct MusicFileInfo
 
   boolean is_sound;
 
-  struct MusicFileInfo *next;
+  struct MusicFileInfo *prev, *next;
 };
 
 struct ElementActionInfo
@@ -3755,6 +3768,7 @@ extern DrawBuffer	       *drawto_field;
 extern int			game_status;
 extern int			game_status_last_screen;
 extern boolean			level_editor_test_game;
+extern boolean			score_info_tape_play;
 extern boolean			network_playing;
 
 extern int			key_joystick_mapping;
@@ -3897,6 +3911,7 @@ extern SetupFileHash	       *element_token_hash;
 extern SetupFileHash	       *graphic_token_hash;
 extern SetupFileHash	       *font_token_hash;
 extern SetupFileHash	       *hide_setup_hash;
+extern SetupFileHash	       *anim_url_hash;
 extern struct ConfigTypeInfo	image_config_suffix[];
 extern struct ConfigTypeInfo	sound_config_suffix[];
 extern struct ConfigTypeInfo	music_config_suffix[];