X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=e3534df39810d215b8f0368ee2abb86cb7266810;hb=d4977158fef9c47e1f076c43175ac88b73fbd945;hp=467b5d1b9503c11d9b55a54fb1d8ac8d7e67eca9;hpb=5e30707f778ec0ce59045e9f19b0af45aa4cf693;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 467b5d1b..e3534df3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -331,6 +331,11 @@
 #define CH_SIDE_TOP_BOTTOM		MV_VERTICAL
 #define CH_SIDE_ANY			MV_ANY_DIRECTION
 
+#define CH_SIDE_FROM_BUTTON(b)	((b) == MB_LEFTBUTTON   ? CH_SIDE_LEFT :       \
+				 (b) == MB_RIGHTBUTTON  ? CH_SIDE_RIGHT :      \
+				 (b) == MB_MIDDLEBUTTON ? CH_SIDE_TOP_BOTTOM : \
+				 CH_SIDE_NONE)
+
 // values for change player for custom elements
 #define CH_PLAYER_NONE			PLAYER_BITS_NONE
 #define CH_PLAYER_1			PLAYER_BITS_1
@@ -2570,15 +2575,15 @@ 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		3
+#define PROGRAM_VERSION_PATCH		0
 #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-2020 by Holger Schemel"
+#define PROGRAM_COPYRIGHT_STRING	"Copyright \xa9""1995-2021 by Holger Schemel"
 #define PROGRAM_COMPANY_STRING		"A Game by Artsoft Entertainment"
 
 #define PROGRAM_ICON_FILENAME		"RocksIcon32x32.png"
@@ -2890,9 +2895,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 +3191,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 +3209,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
@@ -3388,6 +3402,8 @@ struct ElementInfo
   int drop_delay_random;	// additional random delay after dropping
   int move_delay_fixed;		// constant delay after moving
   int move_delay_random;	// additional random delay after moving
+  int step_delay_fixed;		// constant delay while moving
+  int step_delay_random;	// additional random delay while moving
 
   int move_pattern;		// direction movable element moves to
   int move_direction_initial;	// initial direction element moves to
@@ -3647,7 +3663,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;