X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=545c161a0ae2853d156d505e533f6da414ebb93f;hb=e57078603232563176d90bb543ce2bc3a15b889e;hp=f00ab2a7d74187d43dc543728931be7c3b00a48a;hpb=41680565bf2af491be63ee8440788c4ff8b616db;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index f00ab2a7..545c161a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -440,15 +440,7 @@
 #define EL_CHAR_ASCII0_END		(EL_CHAR_ASCII0 + 111)
 #define EL_CHAR_END			(EL_CHAR_START  + 79)
 
-#define EL_CHAR(x)			((x) == 'Ä' ? EL_CHAR_AE         : \
-					 (x) == 'Ö' ? EL_CHAR_OE         : \
-					 (x) == 'Ü' ? EL_CHAR_UE         : \
-					 (x) == '^' ? EL_CHAR_COPYRIGHT  : \
-					 (x) == '_' ? EL_CHAR_UNDERSCORE : \
-					 (x) == '°' ? EL_CHAR_DEGREE     : \
-					 (x) == '´' ? EL_CHAR_TM         : \
-					 (x) == '|' ? EL_CHAR_CURSOR     : \
-					 EL_CHAR_A + (x) - 'A')
+#define EL_CHAR(c)			(EL_CHAR_ASCII0 + MAP_FONT_ASCII(c))
 
 #define EL_EXPANDABLE_WALL_HORIZONTAL	200
 #define EL_EXPANDABLE_WALL_VERTICAL	201
@@ -794,10 +786,9 @@
 #define GFX_ARG_POSITION			19
 #define GFX_ARG_DRAW_XOFFSET			20
 #define GFX_ARG_DRAW_YOFFSET			21
-#define GFX_ARG_FORMAT				22
-#define GFX_ARG_NAME				23
+#define GFX_ARG_NAME				22
 
-#define NUM_GFX_ARGS				24
+#define NUM_GFX_ARGS				23
 
 
 /* values for sound configuration suffixes */
@@ -820,20 +811,22 @@
 #define FONT_TEXT_2				9
 #define FONT_TEXT_3				10
 #define FONT_TEXT_4				11
-#define FONT_INPUT				12
-#define FONT_INPUT_ACTIVE			13
-#define FONT_OPTION_OFF				14
-#define FONT_OPTION_ON				15
-#define FONT_VALUE_1				16
-#define FONT_VALUE_2				17
-#define FONT_VALUE_OLD				18
-#define FONT_TAPE_RECORDER			19
-#define FONT_LEVEL_NUMBER			20
-
-#define NUM_FONTS				21
+#define FONT_INPUT_1				12
+#define FONT_INPUT_1_ACTIVE			13
+#define FONT_INPUT_2				14
+#define FONT_INPUT_2_ACTIVE			15
+#define FONT_OPTION_OFF				16
+#define FONT_OPTION_ON				17
+#define FONT_VALUE_1				18
+#define FONT_VALUE_2				19
+#define FONT_VALUE_OLD				20
+#define FONT_LEVEL_NUMBER			21
+#define FONT_TAPE_RECORDER			22
+#define FONT_GAME_INFO				23
+
+#define NUM_FONTS				24
 #define NUM_INITIAL_FONTS			4
 
-
 /* values for game_status */
 #define EXITGAME		0
 #define MAINMENU		1
@@ -854,7 +847,7 @@
 
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
-#define PROGRAM_RIGHTS_STRING	"Copyright ^1995-2003 by"
+#define PROGRAM_RIGHTS_STRING	"Copyright ©1995-2003 by"
 #define PROGRAM_DOS_PORT_STRING	"DOS port done by Guido Schulz"
 #define PROGRAM_IDENT_STRING	PROGRAM_VERSION_STRING " " TARGET_STRING
 #define WINDOW_TITLE_STRING	PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING
@@ -996,6 +989,8 @@ struct LevelInfo
   boolean gravity;
   boolean em_slippery_gems;	/* EM style "gems slip from wall" behaviour */
 
+  short custom_element_successor[NUM_CUSTOM_ELEMENTS];
+
   boolean no_level_file;
 };
 
@@ -1107,6 +1102,7 @@ struct GraphicInfo
   int width, height;		/* width/height of each animation frame */
   int offset_x, offset_y;	/* x/y offset to next animation frame */
   int anim_frames;
+  int anim_frames_per_line;
   int anim_start_frame;
   int anim_delay;		/* important: delay of 1 means "no delay"! */
   int anim_mode;