X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=14c2e885424fac83e3b2b718245ebe9ea73c2188;hb=207dd0ba7951139a27a87a091c7eb98c395f3c70;hp=c67fbebbb0f363b3d35b7aa0485bb6c8aa16b6c9;hpb=040054d0534035b8bc1445ca80605db597c5b949;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index c67fbebb..14c2e885 100644
--- a/src/main.h
+++ b/src/main.h
@@ -256,8 +256,11 @@
 #define CE_PRESSED_BY_MOUSE		45
 #define CE_MOUSE_CLICKED_ON_X		46
 #define CE_MOUSE_PRESSED_ON_X		47
+#define CE_NEXT_TO_PLAYER		48
+#define CE_NEXT_TO_X			49
+#define CE_PLAYER_NEXT_TO_X		50
 
-#define NUM_CHANGE_EVENTS		48
+#define NUM_CHANGE_EVENTS		51
 
 #define NUM_CE_BITFIELDS		((NUM_CHANGE_EVENTS + 31) / 32)
 
@@ -596,7 +599,7 @@
 #define GFX_CRUMBLED(e)		HAS_PROPERTY(GFX_ELEMENT(e), EP_GFX_CRUMBLED)
 
 // macros for pre-defined properties
-#define ELEM_IS_PLAYER(e)	HAS_PROPERTY(e, EP_PLAYER)
+#define IS_PLAYER_ELEMENT(e)	HAS_PROPERTY(e, EP_PLAYER)
 #define CAN_PASS_MAGIC_WALL(e)	HAS_PROPERTY(e, EP_CAN_PASS_MAGIC_WALL)
 #define CAN_PASS_DC_MAGIC_WALL(e) HAS_PROPERTY(e, EP_CAN_PASS_DC_MAGIC_WALL)
 #define IS_SWITCHABLE(e)	HAS_PROPERTY(e, EP_SWITCHABLE)
@@ -850,7 +853,7 @@
 	(ge == EL_ANY_ELEMENT ? TRUE :					\
 	 IS_GROUP_ELEMENT(ge) ? IS_IN_GROUP(e, GROUP_NR(ge)) : (e) == (ge))
 
-#define IS_PLAYER(x, y)		(ELEM_IS_PLAYER(StorePlayer[x][y]))
+#define IS_PLAYER(x, y)		(IS_PLAYER_ELEMENT(StorePlayer[x][y]))
 
 #define IS_FREE(x, y)		(Tile[x][y] == EL_EMPTY && !IS_PLAYER(x, y))
 #define IS_FREE_OR_PLAYER(x, y)	(Tile[x][y] == EL_EMPTY)
@@ -2574,9 +2577,9 @@ enum
 
 // program information and versioning definitions
 #define PROGRAM_VERSION_SUPER		4
-#define PROGRAM_VERSION_MAJOR		2
-#define PROGRAM_VERSION_MINOR		3
-#define PROGRAM_VERSION_PATCH		1
+#define PROGRAM_VERSION_MAJOR		3
+#define PROGRAM_VERSION_MINOR		1
+#define PROGRAM_VERSION_PATCH		0
 #define PROGRAM_VERSION_EXTRA		""
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
@@ -2624,7 +2627,7 @@ enum
 // values for game_emulation
 #define EMU_NONE			0
 #define EMU_BOULDERDASH			1
-#define EMU_SOKOBAN			2
+#define EMU_UNUSED_2			2
 #define EMU_SUPAPLEX			3
 
 // values for level file type identifier
@@ -2655,7 +2658,9 @@ enum
 #define AUTOPLAY_FFWD			(1 << 1)
 #define AUTOPLAY_WARP			(1 << 2)
 #define AUTOPLAY_TEST			(1 << 3)
-#define AUTOPLAY_FIX			(1 << 4)
+#define AUTOPLAY_SAVE			(1 << 4)
+#define AUTOPLAY_UPLOAD			(1 << 5)
+#define AUTOPLAY_FIX			(1 << 6)
 #define AUTOPLAY_WARP_NO_DISPLAY	AUTOPLAY_TEST
 
 #define AUTOPLAY_MODE_NONE		0
@@ -2663,6 +2668,8 @@ enum
 #define AUTOPLAY_MODE_FFWD		(AUTOPLAY_MODE_PLAY | AUTOPLAY_FFWD)
 #define AUTOPLAY_MODE_WARP		(AUTOPLAY_MODE_FFWD | AUTOPLAY_WARP)
 #define AUTOPLAY_MODE_TEST		(AUTOPLAY_MODE_WARP | AUTOPLAY_TEST)
+#define AUTOPLAY_MODE_SAVE		(AUTOPLAY_MODE_TEST | AUTOPLAY_SAVE)
+#define AUTOPLAY_MODE_UPLOAD		(AUTOPLAY_MODE_TEST | AUTOPLAY_UPLOAD)
 #define AUTOPLAY_MODE_FIX		(AUTOPLAY_MODE_TEST | AUTOPLAY_FIX)
 #define AUTOPLAY_MODE_WARP_NO_DISPLAY	AUTOPLAY_MODE_TEST
 
@@ -3038,10 +3045,31 @@ struct ViewportInfo
   struct RectWithBorder door_2[NUM_SPECIAL_GFX_ARGS];
 };
 
-struct HiScore
+struct ScoreEntry
 {
-  char Name[MAX_PLAYER_NAME_LEN + 1];
-  int Score;
+  char tape_basename[MAX_FILENAME_LEN + 1];
+  char name[MAX_PLAYER_NAME_LEN + 1];
+  int score;
+  int time;		// time (in frames) or steps played
+};
+
+struct ScoreInfo
+{
+  int file_version;	// file format version the score is stored with
+  int game_version;	// game release version the score was created with
+
+  char level_identifier[MAX_FILENAME_LEN + 1];
+  int level_nr;
+
+  int num_entries;
+  int last_added;
+  int last_added_local;
+
+  boolean updated;
+  boolean uploaded;
+  boolean force_last_added;
+
+  struct ScoreEntry entry[MAX_SCORE_ENTRIES];
 };
 
 struct Content
@@ -3107,6 +3135,7 @@ struct LevelInfo
   int time;				// available time (seconds)
   int gems_needed;
   boolean auto_count_gems;
+  boolean rate_time_over_score;
 
   char name[MAX_LEVEL_NAME_LEN + 1];
   char author[MAX_LEVEL_AUTHOR_LEN + 1];
@@ -3192,6 +3221,7 @@ struct LevelInfo
   boolean auto_exit_sokoban;	// automatically finish solved Sokoban levels
   boolean solved_by_one_player;	// level is solved if one player enters exit
   boolean finish_dig_collect;	// only finished dig/collect triggers ce action
+  boolean keep_walkable_ce;	// keep walkable CE if it changes to the player
 
   boolean continuous_snapping;	// repeated snapping without releasing key
   boolean block_snap_field;	// snapping blocks field to show animation
@@ -3241,8 +3271,9 @@ struct GlobalInfo
 {
   char *autoplay_leveldir;
   int autoplay_level[MAX_TAPES_PER_SET];
+  int autoplay_mode;
   boolean autoplay_all;
-  boolean autoplay_mode;
+  time_t autoplay_time;
 
   char *patchtapes_mode;
   char *patchtapes_leveldir;
@@ -3252,7 +3283,14 @@ struct GlobalInfo
   char *convert_leveldir;
   int convert_level_nr;
 
-  char *create_images_dir;
+  char *dumplevel_leveldir;
+  int dumplevel_level_nr;
+
+  char *dumptape_leveldir;
+  int dumptape_level_nr;
+
+  char *create_sketch_images_dir;
+  char *create_collect_images_dir;
 
   int num_toons;
 
@@ -3700,6 +3738,7 @@ extern int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
 extern int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern int			GfxRandomStatic[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int 			GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -3749,7 +3788,7 @@ extern boolean			network_player_action_received;
 extern int			graphics_action_mapping[];
 
 extern struct LevelInfo		level, level_template;
-extern struct HiScore		highscore[];
+extern struct ScoreInfo		scores, server_scores;
 extern struct TapeInfo		tape;
 extern struct GlobalInfo	global;
 extern struct BorderInfo	border;