X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=ce239f1d3a5c2ead14c370d2c3edd8546ed3b462;hb=842dedbb2331375e8433251ff9da04e7708d52d7;hp=549d003e45bfda2fda5529629c4535c3ea4e0ef1;hpb=55188fc81fac757089356928ae7ec26f90c4a7d0;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 549d003e..ce239f1d 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -353,16 +353,21 @@
 
 #define ANIM_DEFAULT		ANIM_LOOP
 
-// values for special drawing styles (currently only for crumbled graphics)
+// values for special drawing styles and event handling
 #define STYLE_NONE		0
+
+// values used for crumbled graphics
 #define STYLE_ACCURATE_BORDERS	(1 << 0)
 #define STYLE_INNER_CORNERS	(1 << 1)
+
+// values used for game panel graphics
 #define STYLE_REVERSE		(1 << 2)
+#define STYLE_LEFTMOST_POSITION	(1 << 3)
 
-// values for special event handling style (used for global animation)
-#define STYLE_BLOCK		(1 << 3)
-#define STYLE_PASSTHROUGH	(1 << 4)
-#define STYLE_MULTIPLE_ACTIONS	(1 << 5)
+// values used for global animations
+#define STYLE_BLOCK		(1 << 4)
+#define STYLE_PASSTHROUGH	(1 << 5)
+#define STYLE_MULTIPLE_ACTIONS	(1 << 6)
 
 #define STYLE_DEFAULT		STYLE_NONE
 
@@ -511,7 +516,7 @@
 #define MAX_PLAYERS		4
 
 // maximum number of player names
-#define MAX_PLAYER_NAMES	10
+#define MAX_PLAYER_NAMES	12
 
 // maximum allowed length of player name
 #define MAX_PLAYER_NAME_LEN	10
@@ -762,10 +767,9 @@
 #define TREE_TYPE_LEVEL_DIR	3
 #define TREE_TYPE_LEVEL_NR	4
 #define TREE_TYPE_PLAYER_NAME	5
-#define TREE_TYPE_PLAYER_TEAM	6
 
 #define NUM_BASE_TREE_TYPES	4
-#define NUM_TREE_TYPES		7
+#define NUM_TREE_TYPES		6
 
 #define INFOTEXT_UNDEFINED	""
 #define INFOTEXT_GRAPHICS_DIR	"Custom Graphics"
@@ -773,13 +777,10 @@
 #define INFOTEXT_MUSIC_DIR	"Custom Music"
 #define INFOTEXT_LEVEL_DIR	"Level Sets"
 #define INFOTEXT_LEVEL_NR	"Levels"
-#define INFOTEXT_PLAYER_NAME	"Player Names"
-#define INFOTEXT_PLAYER_TEAM	"Player Teams"
+#define INFOTEXT_PLAYER_NAME	"Players & Teams"
 
 #define TREE_INFOTEXT(t)	((t) == TREE_TYPE_PLAYER_NAME ?		\
 				 INFOTEXT_PLAYER_NAME :			\
-				 (t) == TREE_TYPE_PLAYER_TEAM ?		\
-				 INFOTEXT_PLAYER_TEAM :			\
 				 (t) == TREE_TYPE_LEVEL_NR ?		\
 				 INFOTEXT_LEVEL_NR :			\
 				 (t) == TREE_TYPE_LEVEL_DIR ?		\
@@ -1438,6 +1439,7 @@ struct SetupInfo
   boolean input_on_focus;
   boolean prefer_aga_graphics;
   boolean prefer_lowpass_sounds;
+  boolean prefer_extra_panel_items;
   boolean game_speed_extended;
   int game_frame_delay;
   boolean sp_show_border_elements;