X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=7b82f5e3a138adc4801cf5273e064a22b90fad14;hb=cd9add1d9479d1938d05ca9df4f31c3f99bd5f3e;hp=0afb5dbbe0c27b02c537939d9e217cc3b6697798;hpb=01295e7cfce6354e2fad160ba0ce2880546d7a60;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 0afb5dbb..7b82f5e3 100644 --- a/src/main.h +++ b/src/main.h @@ -32,6 +32,7 @@ #define IMG_EMPTY IMG_EMPTY_SPACE #define IMG_SP_EMPTY IMG_SP_EMPTY_SPACE +#define IMG_CHAR_START IMG_CHAR_SPACE #define WIN_XSIZE 672 #define WIN_YSIZE 560 @@ -423,38 +424,38 @@ #define EL_EM_KEY1_FILE 119 #define EL_CHAR_START 120 -#define EL_CHAR_ASCII0 (EL_CHAR_START-32) -#define EL_CHAR_EXCLAM (EL_CHAR_ASCII0+33) -#define EL_CHAR_QUOTEDBL (EL_CHAR_ASCII0+34) -#define EL_CHAR_NUMBERSIGN (EL_CHAR_ASCII0+35) -#define EL_CHAR_DOLLAR (EL_CHAR_ASCII0+36) -#define EL_CHAR_PROCENT (EL_CHAR_ASCII0+37) -#define EL_CHAR_AMPERSAND (EL_CHAR_ASCII0+38) -#define EL_CHAR_APOSTROPHE (EL_CHAR_ASCII0+39) -#define EL_CHAR_PARENLEFT (EL_CHAR_ASCII0+40) -#define EL_CHAR_PARENRIGHT (EL_CHAR_ASCII0+41) -#define EL_CHAR_ASTERISK (EL_CHAR_ASCII0+42) -#define EL_CHAR_PLUS (EL_CHAR_ASCII0+43) -#define EL_CHAR_COMMA (EL_CHAR_ASCII0+44) -#define EL_CHAR_MINUS (EL_CHAR_ASCII0+45) -#define EL_CHAR_PERIOD (EL_CHAR_ASCII0+46) -#define EL_CHAR_SLASH (EL_CHAR_ASCII0+47) -#define EL_CHAR_0 (EL_CHAR_ASCII0+48) -#define EL_CHAR_9 (EL_CHAR_ASCII0+57) -#define EL_CHAR_COLON (EL_CHAR_ASCII0+58) -#define EL_CHAR_SEMICOLON (EL_CHAR_ASCII0+59) -#define EL_CHAR_LESS (EL_CHAR_ASCII0+60) -#define EL_CHAR_EQUAL (EL_CHAR_ASCII0+61) -#define EL_CHAR_GREATER (EL_CHAR_ASCII0+62) -#define EL_CHAR_QUESTION (EL_CHAR_ASCII0+63) -#define EL_CHAR_AT (EL_CHAR_ASCII0+64) -#define EL_CHAR_A (EL_CHAR_ASCII0+65) -#define EL_CHAR_Z (EL_CHAR_ASCII0+90) -#define EL_CHAR_AE (EL_CHAR_ASCII0+91) -#define EL_CHAR_OE (EL_CHAR_ASCII0+92) -#define EL_CHAR_UE (EL_CHAR_ASCII0+93) -#define EL_CHAR_COPYRIGHT (EL_CHAR_ASCII0+94) -#define EL_CHAR_END (EL_CHAR_START+79) +#define EL_CHAR_ASCII0 (EL_CHAR_START - 32) +#define EL_CHAR_EXCLAM (EL_CHAR_ASCII0 + 33) +#define EL_CHAR_QUOTEDBL (EL_CHAR_ASCII0 + 34) +#define EL_CHAR_NUMBERSIGN (EL_CHAR_ASCII0 + 35) +#define EL_CHAR_DOLLAR (EL_CHAR_ASCII0 + 36) +#define EL_CHAR_PROCENT (EL_CHAR_ASCII0 + 37) +#define EL_CHAR_AMPERSAND (EL_CHAR_ASCII0 + 38) +#define EL_CHAR_APOSTROPHE (EL_CHAR_ASCII0 + 39) +#define EL_CHAR_PARENLEFT (EL_CHAR_ASCII0 + 40) +#define EL_CHAR_PARENRIGHT (EL_CHAR_ASCII0 + 41) +#define EL_CHAR_ASTERISK (EL_CHAR_ASCII0 + 42) +#define EL_CHAR_PLUS (EL_CHAR_ASCII0 + 43) +#define EL_CHAR_COMMA (EL_CHAR_ASCII0 + 44) +#define EL_CHAR_MINUS (EL_CHAR_ASCII0 + 45) +#define EL_CHAR_PERIOD (EL_CHAR_ASCII0 + 46) +#define EL_CHAR_SLASH (EL_CHAR_ASCII0 + 47) +#define EL_CHAR_0 (EL_CHAR_ASCII0 + 48) +#define EL_CHAR_9 (EL_CHAR_ASCII0 + 57) +#define EL_CHAR_COLON (EL_CHAR_ASCII0 + 58) +#define EL_CHAR_SEMICOLON (EL_CHAR_ASCII0 + 59) +#define EL_CHAR_LESS (EL_CHAR_ASCII0 + 60) +#define EL_CHAR_EQUAL (EL_CHAR_ASCII0 + 61) +#define EL_CHAR_GREATER (EL_CHAR_ASCII0 + 62) +#define EL_CHAR_QUESTION (EL_CHAR_ASCII0 + 63) +#define EL_CHAR_AT (EL_CHAR_ASCII0 + 64) +#define EL_CHAR_A (EL_CHAR_ASCII0 + 65) +#define EL_CHAR_Z (EL_CHAR_ASCII0 + 90) +#define EL_CHAR_AE (EL_CHAR_ASCII0 + 91) +#define EL_CHAR_OE (EL_CHAR_ASCII0 + 92) +#define EL_CHAR_UE (EL_CHAR_ASCII0 + 93) +#define EL_CHAR_COPYRIGHT (EL_CHAR_ASCII0 + 94) +#define EL_CHAR_END (EL_CHAR_START + 79) #define EL_CHAR(x) ((x) == 'Ä' ? EL_CHAR_AE : \ (x) == 'Ö' ? EL_CHAR_OE : \ @@ -725,23 +726,27 @@ #define EL_BD_AMOEBA_PART2 (EL_FIRST_DUMMY + 14) #define EL_BD_AMOEBA_PART3 (EL_FIRST_DUMMY + 15) #define EL_BD_AMOEBA_PART4 (EL_FIRST_DUMMY + 16) -#define EL_AMOEBA_PART1 (EL_FIRST_DUMMY + 17) -#define EL_AMOEBA_PART2 (EL_FIRST_DUMMY + 18) -#define EL_AMOEBA_PART3 (EL_FIRST_DUMMY + 19) -#define EL_AMOEBA_PART4 (EL_FIRST_DUMMY + 20) -#define EL_AMOEBA_DEAD_PART1 (EL_FIRST_DUMMY + 21) -#define EL_AMOEBA_DEAD_PART2 (EL_FIRST_DUMMY + 22) -#define EL_AMOEBA_DEAD_PART3 (EL_FIRST_DUMMY + 23) -#define EL_AMOEBA_DEAD_PART4 (EL_FIRST_DUMMY + 24) -#define EL_DYNABOMB_ACTIVE (EL_FIRST_DUMMY + 25) -#define EL_SHIELD_NORMAL_ACTIVE (EL_FIRST_DUMMY + 26) -#define EL_SHIELD_DEADLY_ACTIVE (EL_FIRST_DUMMY + 27) -#define EL_ARROW_RED_LEFT (EL_FIRST_DUMMY + 28) -#define EL_ARROW_RED_RIGHT (EL_FIRST_DUMMY + 29) -#define EL_ARROW_RED_UP (EL_FIRST_DUMMY + 30) -#define EL_ARROW_RED_DOWN (EL_FIRST_DUMMY + 31) - -#define MAX_NUM_ELEMENTS (EL_FIRST_DUMMY + 32) +#define EL_AMOEBA_WET_PART1 (EL_FIRST_DUMMY + 17) +#define EL_AMOEBA_WET_PART2 (EL_FIRST_DUMMY + 18) +#define EL_AMOEBA_WET_PART3 (EL_FIRST_DUMMY + 19) +#define EL_AMOEBA_WET_PART4 (EL_FIRST_DUMMY + 20) +#define EL_AMOEBA_DRY_PART1 (EL_FIRST_DUMMY + 21) +#define EL_AMOEBA_DRY_PART2 (EL_FIRST_DUMMY + 22) +#define EL_AMOEBA_DRY_PART3 (EL_FIRST_DUMMY + 23) +#define EL_AMOEBA_DRY_PART4 (EL_FIRST_DUMMY + 24) +#define EL_AMOEBA_DEAD_PART1 (EL_FIRST_DUMMY + 25) +#define EL_AMOEBA_DEAD_PART2 (EL_FIRST_DUMMY + 26) +#define EL_AMOEBA_DEAD_PART3 (EL_FIRST_DUMMY + 27) +#define EL_AMOEBA_DEAD_PART4 (EL_FIRST_DUMMY + 28) +#define EL_DYNABOMB_ACTIVE (EL_FIRST_DUMMY + 29) +#define EL_SHIELD_NORMAL_ACTIVE (EL_FIRST_DUMMY + 30) +#define EL_SHIELD_DEADLY_ACTIVE (EL_FIRST_DUMMY + 31) +#define EL_ARROW_RED_LEFT (EL_FIRST_DUMMY + 32) +#define EL_ARROW_RED_RIGHT (EL_FIRST_DUMMY + 33) +#define EL_ARROW_RED_UP (EL_FIRST_DUMMY + 34) +#define EL_ARROW_RED_DOWN (EL_FIRST_DUMMY + 35) + +#define MAX_NUM_ELEMENTS (EL_FIRST_DUMMY + 36) /* game graphics: