X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=d9ff3664d5bcea3942f41ec4c56af620f03fd521;hb=4dd13e13723d0f55916fc013dc621fbdf2691a09;hp=8f979b491fd74bcb32d00198a05a7f21b443a69e;hpb=6b83db8bee17d70c4e89dc3e3b703b7032aa5f27;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 8f979b49..d9ff3664 100644
--- a/src/main.h
+++ b/src/main.h
@@ -664,7 +664,7 @@ extern char		*element_info[];
 
 #define EL_AUSGANG_AUF		107
 
-#define EL_UNUSED_108		108
+#define EL_BLACK_ORB		108
 
 #define EL_AMOEBA2DIAM		109
 #define EL_MAULWURF		110
@@ -683,11 +683,14 @@ extern char		*element_info[];
 #define EL_CHAR_ASCII0		(EL_CHAR_START-32)
 #define EL_CHAR_AUSRUF		(EL_CHAR_ASCII0+33)
 #define EL_CHAR_ZOLL		(EL_CHAR_ASCII0+34)
+#define EL_CHAR_RAUTE		(EL_CHAR_ASCII0+35)
 #define EL_CHAR_DOLLAR		(EL_CHAR_ASCII0+36)
 #define EL_CHAR_PROZ		(EL_CHAR_ASCII0+37)
+#define EL_CHAR_AMPERSAND	(EL_CHAR_ASCII0+38)
 #define EL_CHAR_APOSTR		(EL_CHAR_ASCII0+39)
 #define EL_CHAR_KLAMM1		(EL_CHAR_ASCII0+40)
 #define EL_CHAR_KLAMM2		(EL_CHAR_ASCII0+41)
+#define EL_CHAR_MULT		(EL_CHAR_ASCII0+42)
 #define EL_CHAR_PLUS		(EL_CHAR_ASCII0+43)
 #define EL_CHAR_KOMMA		(EL_CHAR_ASCII0+44)
 #define EL_CHAR_MINUS		(EL_CHAR_ASCII0+45)
@@ -710,7 +713,10 @@ extern char		*element_info[];
 #define EL_CHAR_COPY		(EL_CHAR_ASCII0+94)
 #define EL_CHAR_END		(EL_CHAR_START+79)
 
-#define EL_CHAR(x)		(EL_CHAR_A + x - 'A')
+#define EL_CHAR(x)		((x) == 'Ä' ? EL_CHAR_AE : \
+				 (x) == 'Ö' ? EL_CHAR_OE : \
+				 (x) == 'Ü' ? EL_CHAR_UE : \
+				 EL_CHAR_A + (x) - 'A')
 
 #define EL_MAUER_X		200
 #define EL_MAUER_Y		201
@@ -935,6 +941,7 @@ extern char		*element_info[];
 #define GFX_EDELSTEIN_ROT	152
 #define GFX_EDELSTEIN_LILA	154
 #define GFX_DYNABOMB_XL		156
+#define GFX_BLACK_ORB		157
 #define GFX_SPEED_PILL		158
 #define GFX_SONDE		159
 /* Zeile 10 (160) */
@@ -1048,7 +1055,9 @@ extern char		*element_info[];
 
 /* graphics from "RocksMore" */
 #define GFX_SP_EMPTY		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE +  0)
+/*
 #define GFX_SP_ZONK		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE +  1)
+*/
 #define GFX_SP_BASE		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE +  2)
 #define GFX_SP_MURPHY		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE +  3)
 #define GFX_SP_INFOTRON		(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE +  4)
@@ -1090,6 +1099,7 @@ extern char		*element_info[];
 
 #define GFX_INVISIBLE_STEEL	(GFX_START_ROCKSMORE +  5 * MORE_PER_LINE +  3)
 #define GFX_UNSICHTBAR		(GFX_START_ROCKSMORE +  5 * MORE_PER_LINE +  7)
+#define GFX_SP_ZONK		(GFX_START_ROCKSMORE +  6 * MORE_PER_LINE +  0)
 
 #define GFX_MURPHY_GO_LEFT	(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE +  8)
 #define GFX_MURPHY_ANY_LEFT	(GFX_START_ROCKSMORE +  0 * MORE_PER_LINE +  9)
@@ -1266,7 +1276,7 @@ extern char		*element_info[];
 #define TAPES_DIRECTORY		"tapes"
 #define SCORES_DIRECTORY	"scores"
 
-#define PROGRAM_VERSION_STRING	"1.2.1"
+#define PROGRAM_VERSION_STRING	"1.3.0"
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
 #define WINDOW_TITLE_STRING	PROGRAM_TITLE_STRING " " PROGRAM_VERSION_STRING