X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=34e646e59faa984b0e66de8029bdc75cb7459a06;hb=6c244f56b4911dc83930193a43497388b91696af;hp=a3ce361adbe422a512545977d6e7bad967a7e627;hpb=75add713b14147fbd222c48504c4e797f3125286;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index a3ce361a..34e646e5 100644 --- a/src/main.h +++ b/src/main.h @@ -442,21 +442,6 @@ #define EL_CHAR(c) (EL_CHAR_ASCII0 + MAP_FONT_ASCII(c)) -#if 0 -#define EL_CHAR(x) ((x) == 'Ä' ? EL_CHAR_AE : \ - (x) == 'Ö' ? EL_CHAR_OE : \ - (x) == 'Ü' ? EL_CHAR_UE : \ - (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') -#endif - #define EL_EXPANDABLE_WALL_HORIZONTAL 200 #define EL_EXPANDABLE_WALL_VERTICAL 201 #define EL_EXPANDABLE_WALL_ANY 202 @@ -833,10 +818,11 @@ #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 FONT_LEVEL_NUMBER 19 +#define FONT_TAPE_RECORDER 20 +#define FONT_GAME_INFO 21 -#define NUM_FONTS 21 +#define NUM_FONTS 22 #define NUM_INITIAL_FONTS 4 /* values for game_status */