X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=575be5aca2655391a6c3a5facbc30a92acf54e45;hb=b4865a65808ffd72a4f98d09cdb332582e464500;hp=b429c15b992a998188a7a28c8ca32f2e3ee7f629;hpb=881bd7909d3a28c07c0bed2185e60a437b407e7c;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index b429c15b..575be5ac 100644
--- a/src/main.h
+++ b/src/main.h
@@ -596,7 +596,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 +850,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)
@@ -2624,7 +2624,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
@@ -3055,6 +3055,11 @@ struct ScoreInfo
   int level_nr;
 
   int num_entries;
+  int last_added;
+  int last_added_local;
+
+  boolean updated;
+  boolean force_last_added;
 
   struct ScoreEntry entry[MAX_SCORE_ENTRIES];
 };
@@ -3208,6 +3213,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
@@ -3268,7 +3274,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;
 
@@ -3765,7 +3778,7 @@ extern boolean			network_player_action_received;
 extern int			graphics_action_mapping[];
 
 extern struct LevelInfo		level, level_template;
-extern struct ScoreInfo		scores;
+extern struct ScoreInfo		scores, server_scores;
 extern struct TapeInfo		tape;
 extern struct GlobalInfo	global;
 extern struct BorderInfo	border;