rnd-20040927-2-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 9a3343b8c10cd8f826940c8be6c283355ac9166f..e0b60503eca362496070f7b37088b89a5ec7ac87 100644 (file)
--- 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
@@ -1055,12 +1006,10 @@
 #define EL_EMC_BUMPER                  705
 #define EL_EMC_PLANT                   706
 #define EL_EMC_LENSES                  707
-#define EL_EMC_MAGNIFY                 708
+#define EL_EMC_MAGNIFIER               708
 
 #define NUM_FILE_ELEMENTS              709
 
-#endif
-
 
 /* "real" (and therefore drawable) runtime elements */
 #define EL_FIRST_RUNTIME_REAL          NUM_FILE_ELEMENTS
@@ -1282,7 +1231,7 @@
 #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