X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=48f6561a4d52d2b15389cf297a833b72cfadba2d;hb=479bba3c31872d0bf11756a6380988bf787ce5ef;hp=b2a69ad38a745709d4696a1b926322075a625e1a;hpb=c4dd9e14b72b528e82bc018fe2fa76b784221584;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index b2a69ad3..48f6561a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -381,13 +381,16 @@
 #define CA_ARG_ELEMENT_RESET		(CA_ARG_ELEMENT + 0)
 #define CA_ARG_ELEMENT_TARGET		(CA_ARG_ELEMENT + 1)
 #define CA_ARG_ELEMENT_TRIGGER		(CA_ARG_ELEMENT + 2)
-#define CA_ARG_ELEMENT_HEADLINE		(CA_ARG_ELEMENT + 998)
+#define CA_ARG_ELEMENT_HEADLINE		(CA_ARG_ELEMENT + 997)
 #define CA_ARG_ELEMENT_CV_TARGET	(CA_ARG_ELEMENT_TARGET)
 #define CA_ARG_ELEMENT_CV_TRIGGER	(CA_ARG_ELEMENT_TRIGGER)
 #define CA_ARG_ELEMENT_CV_HEADLINE	(CA_ARG_ELEMENT_HEADLINE)
 #define CA_ARG_ELEMENT_NR_TARGET	(CA_ARG_ELEMENT + 3)
 #define CA_ARG_ELEMENT_NR_TRIGGER	(CA_ARG_ELEMENT + 4)
-#define CA_ARG_ELEMENT_NR_HEADLINE	(CA_ARG_ELEMENT + 999)
+#define CA_ARG_ELEMENT_NR_HEADLINE	(CA_ARG_ELEMENT + 998)
+#define CA_ARG_ELEMENT_CS_TARGET	(CA_ARG_ELEMENT + 5)
+#define CA_ARG_ELEMENT_CS_TRIGGER	(CA_ARG_ELEMENT + 6)
+#define CA_ARG_ELEMENT_CS_HEADLINE	(CA_ARG_ELEMENT + 999)
 #define CA_ARG_SPEED			13000
 #define CA_ARG_SPEED_NOT_MOVING		(CA_ARG_SPEED + STEPSIZE_NOT_MOVING)
 #define CA_ARG_SPEED_VERY_SLOW		(CA_ARG_SPEED + STEPSIZE_VERY_SLOW)
@@ -667,6 +670,7 @@
 #define GFX_ELEMENT(e)		(element_info[e].use_gfx_element ?	\
 				 element_info[e].gfx_element : e)
 
+/* !!! CHECK THIS !!! */
 #if 1
 #define TILE_GFX_ELEMENT(x, y)						\
 		   (GfxElement[x][y] != EL_UNDEFINED &&			\
@@ -1265,13 +1269,16 @@
 #define EL_EMC_DRIPPER			704
 
 #define EL_TRIGGER_CE_VALUE		705
+#define EL_TRIGGER_CE_SCORE		706
+#define EL_CURRENT_CE_VALUE		707
+#define EL_CURRENT_CE_SCORE		708
 
-#define EL_YAMYAM_LEFT			706
-#define EL_YAMYAM_RIGHT			707
-#define EL_YAMYAM_UP			708
-#define EL_YAMYAM_DOWN			709
+#define EL_YAMYAM_LEFT			709
+#define EL_YAMYAM_RIGHT			710
+#define EL_YAMYAM_UP			711
+#define EL_YAMYAM_DOWN			712
 
-#define NUM_FILE_ELEMENTS		710
+#define NUM_FILE_ELEMENTS		713
 
 
 /* "real" (and therefore drawable) runtime elements */
@@ -1636,11 +1643,12 @@
 #define FONT_VALUE_1			26
 #define FONT_VALUE_2			27
 #define FONT_VALUE_OLD			28
-#define FONT_LEVEL_NUMBER		29
-#define FONT_TAPE_RECORDER		30
-#define FONT_GAME_INFO			31
+#define FONT_LEVEL_NUMBER_ACTIVE	29
+#define FONT_LEVEL_NUMBER		30
+#define FONT_TAPE_RECORDER		31
+#define FONT_GAME_INFO			32
 
-#define NUM_FONTS			32
+#define NUM_FONTS			33
 #define NUM_INITIAL_FONTS		4
 
 /* values for game_status (must match special image configuration suffixes) */
@@ -1674,7 +1682,7 @@
 #define PROGRAM_VERSION_MAJOR		3
 #define PROGRAM_VERSION_MINOR		2
 #define PROGRAM_VERSION_PATCH		0
-#define PROGRAM_VERSION_BUILD		7
+#define PROGRAM_VERSION_BUILD		8
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
@@ -1970,6 +1978,7 @@ struct ElementChangeInfo
   int actual_trigger_side;	/* element side that triggered the change */
   int actual_trigger_player;	/* player which actually triggered change */
   int actual_trigger_ce_value;	/* CE value of element that triggered change */
+  int actual_trigger_ce_score;	/* CE score of element that triggered change */
 
   boolean can_change_or_has_action;	/* can_change | has_action */
 
@@ -2147,7 +2156,8 @@ struct GraphicInfo
   int step_offset;		/* optional step offset of toon animations */
   int step_delay;		/* optional step delay of toon animations */
 
-  int draw_x, draw_y;		/* optional offset for drawing fonts chars */
+  int draw_xoffset;		/* optional offset for drawing font chars */
+  int draw_yoffset;		/* optional offset for drawing font chars */
 
   int draw_masked;		/* optional setting for drawing envelope gfx */