X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=b0ebc13d67372c1f9335f00496161006f0bb2282;hp=f0e559a5f280c1d652daf6aa7df12b6825bfc5e3;hb=87fd32ed7c5c47b7278300d12bf67c5b46a604a6;hpb=9ac63ed68417dba413c129c1c14c179f2437fd44

diff --git a/src/main.h b/src/main.h
index f0e559a5..b0ebc13d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2570,8 +2570,8 @@ enum
 // program information and versioning definitions
 #define PROGRAM_VERSION_SUPER		4
 #define PROGRAM_VERSION_MAJOR		2
-#define PROGRAM_VERSION_MINOR		0
-#define PROGRAM_VERSION_PATCH		6
+#define PROGRAM_VERSION_MINOR		2
+#define PROGRAM_VERSION_PATCH		1
 #define PROGRAM_VERSION_EXTRA		""
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
@@ -2890,9 +2890,15 @@ struct RequestInfo
   int anim_mode;
   int align;
   int valign;
+  int sort_priority;
   boolean autowrap;
   boolean centered;
   boolean wrap_single_words;
+
+  // run-time values
+  Bitmap *bitmap;
+  int sx, sy;
+  int xsize, ysize;
 };
 
 struct PreviewInfo
@@ -3180,6 +3186,7 @@ struct LevelInfo
   boolean sb_objects_needed;	// all Sokoban objects must be solved
   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 continuous_snapping;	// repeated snapping without releasing key
   boolean block_snap_field;	// snapping blocks field to show animation
@@ -3197,6 +3204,8 @@ struct LevelInfo
   // ('int' instead of 'boolean' because used as selectbox value in editor)
   int use_step_counter;		// count steps instead of seconds for level
 
+  int time_score_base;		// use time score for 1 or 10 seconds/steps
+
   short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
   boolean use_custom_template;	// use custom properties from template file
@@ -3253,6 +3262,8 @@ struct GlobalInfo
   int anim_status_next;
 
   boolean use_envelope_request;
+
+  char **user_names;
 };
 
 struct ElementChangeInfo
@@ -3645,7 +3656,7 @@ extern DrawBuffer	       *fieldbuffer;
 extern DrawBuffer	       *drawto_field;
 
 extern int			game_status;
-extern boolean			game_status_last_screen;
+extern int			game_status_last_screen;
 extern boolean			level_editor_test_game;
 extern boolean			network_playing;