X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=d5afcf7211c8e0d9ae8cf530fe4dcf9cce9e7be3;hb=f47cd4b09952aaf95d16542f6b53f2d8bf9e1d7d;hp=dcf4f1df9e9fc2c3bbeaf888fccef8ef5b9be958;hpb=2362e426463cb445e119a4e3e5ce0b6ccb3fb33c;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index dcf4f1df..d5afcf72 100644
--- a/src/main.h
+++ b/src/main.h
@@ -963,55 +963,6 @@
 #define EL_SP_GRAVITY_OFF_PORT_LEFT	665
 #define EL_SP_GRAVITY_OFF_PORT_UP	666
 
-#if 1
-
-#define NUM_FILE_ELEMENTS		667
-
-/* the following EMC style elements are currently not implemented in R'n'D */
-#define EL_BALLOON_SWITCH_NONE		EL_UNKNOWN
-#define EL_EMC_LEVEL_BORDER		EL_UNKNOWN
-#define EL_EMC_ANDROID			EL_UNKNOWN
-#define EL_EMC_ANDROID_RIGHT		EL_UNKNOWN
-#define EL_EMC_ANDROID_UP		EL_UNKNOWN
-#define EL_EMC_ANDROID_LEFT		EL_UNKNOWN
-#define EL_EMC_ANDROID_DOWN		EL_UNKNOWN
-#define EL_EMC_ANDROID_LEFT_UP		EL_UNKNOWN
-#define EL_EMC_ANDROID_LEFT_DOWN	EL_UNKNOWN
-#define EL_EMC_ANDROID_RIGHT_UP		EL_UNKNOWN
-#define EL_EMC_ANDROID_RIGHT_DOWN	EL_UNKNOWN
-#define EL_EMC_GRASS			EL_UNKNOWN
-#define EL_EMC_GENERATOR_BALL		EL_UNKNOWN
-#define EL_EMC_GROW			EL_UNKNOWN
-#define EL_EMC_GATE_1			EL_UNKNOWN
-#define EL_EMC_GATE_2			EL_UNKNOWN
-#define EL_EMC_GATE_3			EL_UNKNOWN
-#define EL_EMC_GATE_4			EL_UNKNOWN
-#define EL_EMC_GATE_5			EL_UNKNOWN
-#define EL_EMC_GATE_6			EL_UNKNOWN
-#define EL_EMC_GATE_7			EL_UNKNOWN
-#define EL_EMC_GATE_8			EL_UNKNOWN
-#define EL_EMC_GATE_1_GRAY		EL_UNKNOWN
-#define EL_EMC_GATE_2_GRAY		EL_UNKNOWN
-#define EL_EMC_GATE_3_GRAY		EL_UNKNOWN
-#define EL_EMC_GATE_4_GRAY		EL_UNKNOWN
-#define EL_EMC_GATE_5_GRAY		EL_UNKNOWN
-#define EL_EMC_GATE_6_GRAY		EL_UNKNOWN
-#define EL_EMC_GATE_7_GRAY		EL_UNKNOWN
-#define EL_EMC_GATE_8_GRAY		EL_UNKNOWN
-#define EL_EMC_KEY_1			EL_UNKNOWN
-#define EL_EMC_KEY_2			EL_UNKNOWN
-#define EL_EMC_KEY_3			EL_UNKNOWN
-#define EL_EMC_KEY_4			EL_UNKNOWN
-#define EL_EMC_KEY_5			EL_UNKNOWN
-#define EL_EMC_KEY_6			EL_UNKNOWN
-#define EL_EMC_KEY_7			EL_UNKNOWN
-#define EL_EMC_KEY_8			EL_UNKNOWN
-#define EL_EMC_BUMPER			EL_UNKNOWN
-#define EL_EMC_PLANT			EL_UNKNOWN
-#define EL_EMC_LENSES			EL_UNKNOWN
-#define EL_EMC_MAGNIFY			EL_UNKNOWN
-
-#else
 
 /* the following EMC style elements are currently not implemented in R'n'D */
 #define EL_BALLOON_SWITCH_NONE		667
@@ -1027,39 +978,36 @@
 #define EL_EMC_ANDROID_RIGHT_DOWN	677
 #define EL_EMC_GRASS			678
 #define EL_EMC_GENERATOR_BALL		679
-#define EL_EMC_GROW			680
-#define EL_EMC_GATE_1			681
-#define EL_EMC_GATE_2			682
-#define EL_EMC_GATE_3			683
-#define EL_EMC_GATE_4			684
-#define EL_EMC_GATE_5			685
-#define EL_EMC_GATE_6			686
-#define EL_EMC_GATE_7			687
-#define EL_EMC_GATE_8			688
-#define EL_EMC_GATE_1_GRAY		689
-#define EL_EMC_GATE_2_GRAY		690
-#define EL_EMC_GATE_3_GRAY		691
-#define EL_EMC_GATE_4_GRAY		692
-#define EL_EMC_GATE_5_GRAY		693
-#define EL_EMC_GATE_6_GRAY		694
-#define EL_EMC_GATE_7_GRAY		695
-#define EL_EMC_GATE_8_GRAY		696
-#define EL_EMC_KEY_1			697
-#define EL_EMC_KEY_2			698
-#define EL_EMC_KEY_3			699
-#define EL_EMC_KEY_4			700
-#define EL_EMC_KEY_5			701
-#define EL_EMC_KEY_6			702
-#define EL_EMC_KEY_7			703
-#define EL_EMC_KEY_8			704
-#define EL_EMC_BUMPER			705
-#define EL_EMC_PLANT			706
-#define EL_EMC_LENSES			707
-#define EL_EMC_MAGNIFY			708
-
-#define NUM_FILE_ELEMENTS		709
-
-#endif
+#define EL_EMC_GATE_1			680
+#define EL_EMC_GATE_2			681
+#define EL_EMC_GATE_3			682
+#define EL_EMC_GATE_4			683
+#define EL_EMC_GATE_5			684
+#define EL_EMC_GATE_6			685
+#define EL_EMC_GATE_7			686
+#define EL_EMC_GATE_8			687
+#define EL_EMC_GATE_1_GRAY		688
+#define EL_EMC_GATE_2_GRAY		689
+#define EL_EMC_GATE_3_GRAY		690
+#define EL_EMC_GATE_4_GRAY		691
+#define EL_EMC_GATE_5_GRAY		692
+#define EL_EMC_GATE_6_GRAY		693
+#define EL_EMC_GATE_7_GRAY		694
+#define EL_EMC_GATE_8_GRAY		695
+#define EL_EMC_KEY_1			696
+#define EL_EMC_KEY_2			697
+#define EL_EMC_KEY_3			698
+#define EL_EMC_KEY_4			799
+#define EL_EMC_KEY_5			700
+#define EL_EMC_KEY_6			701
+#define EL_EMC_KEY_7			702
+#define EL_EMC_KEY_8			703
+#define EL_EMC_BUMPER			704
+#define EL_EMC_PLANT			705
+#define EL_EMC_LENSES			706
+#define EL_EMC_MAGNIFIER		707
+
+#define NUM_FILE_ELEMENTS		708
 
 
 /* "real" (and therefore drawable) runtime elements */
@@ -1282,15 +1230,17 @@
 #define GFX_ARG_POST_DELAY_FIXED		28
 #define GFX_ARG_POST_DELAY_RANDOM		29
 #define GFX_ARG_NAME				30
-#define GFX_ARG_SCALE_UP			31
+#define GFX_ARG_SCALE_UP_FACTOR			31
 
 #define NUM_GFX_ARGS				32
 
 
 /* values for sound configuration suffixes */
 #define SND_ARG_MODE_LOOP			0
+#define SND_ARG_VOLUME				1
+#define SND_ARG_PRIORITY			2
 
-#define NUM_SND_ARGS				1
+#define NUM_SND_ARGS				3
 
 
 /* values for music configuration suffixes */
@@ -1942,6 +1892,8 @@ struct GraphicInfo
 struct SoundInfo
 {
   boolean loop;
+  int volume;
+  int priority;
 };
 
 struct MusicInfo