rnd-20041127-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index f65bffb9a17f09838f534fccd9eb2c5989f27ec8..1374311eb18518517a7491332606ebf76f16a814 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -557,12 +557,15 @@
 #define VY                     400
 #define EX                     DX
 #define EY                     (VY - 44)
-#define TILEX                  32
-#define TILEY                  32
-#define MINI_TILEX             (TILEX / 2)
-#define MINI_TILEY             (TILEY / 2)
-#define MICRO_TILEX            (TILEX / 8)
-#define MICRO_TILEY            (TILEY / 8)
+#define TILESIZE               32
+#define TILEX                  TILESIZE
+#define TILEY                  TILESIZE
+#define MINI_TILESIZE          (TILESIZE / 2)
+#define MINI_TILEX             MINI_TILESIZE
+#define MINI_TILEY             MINI_TILESIZE
+#define MICRO_TILESIZE         (TILESIZE / 8)
+#define MICRO_TILEX            MICRO_TILESIZE
+#define MICRO_TILEY            MICRO_TILESIZE
 #define MIDPOSX                        (SCR_FIELDX / 2)
 #define MIDPOSY                        (SCR_FIELDY / 2)
 #define SXSIZE                 (SCR_FIELDX * TILEX)
@@ -982,27 +985,29 @@
 #define EL_EMC_ANDROID                 680
 #define EL_EMC_GRASS                   681
 #define EL_EMC_MAGIC_BALL              682
-#define EL_EMC_MAGIC_BALL_SWITCH       683
-#define EL_EMC_SPRING_BUMPER           684
-#define EL_EMC_PLANT                   685
-#define EL_EMC_LENSES                  686
-#define EL_EMC_MAGNIFIER               687
-#define EL_EMC_WALL_9                  688
-#define EL_EMC_WALL_10                 689
-#define EL_EMC_WALL_11                 690
-#define EL_EMC_WALL_12                 691
-#define EL_EMC_WALL_13                 692
-#define EL_EMC_WALL_14                 693
-#define EL_EMC_WALL_15                 694
-#define EL_EMC_WALL_16                 695
-#define EL_EMC_WALL_SLIPPERY_1         696
-#define EL_EMC_WALL_SLIPPERY_2         697
-#define EL_EMC_WALL_SLIPPERY_3         698
-#define EL_EMC_WALL_SLIPPERY_4         699
-#define EL_EMC_FAKE_GRASS              700
-#define EL_EMC_DRIPPER                 701
-
-#define NUM_FILE_ELEMENTS              702
+#define EL_EMC_MAGIC_BALL_ACTIVE       683
+#define EL_EMC_MAGIC_BALL_SWITCH       684
+#define EL_EMC_MAGIC_BALL_SWITCH_ACTIVE        685
+#define EL_EMC_SPRING_BUMPER           686
+#define EL_EMC_PLANT                   687
+#define EL_EMC_LENSES                  688
+#define EL_EMC_MAGNIFIER               689
+#define EL_EMC_WALL_9                  690
+#define EL_EMC_WALL_10                 691
+#define EL_EMC_WALL_11                 692
+#define EL_EMC_WALL_12                 693
+#define EL_EMC_WALL_13                 694
+#define EL_EMC_WALL_14                 695
+#define EL_EMC_WALL_15                 696
+#define EL_EMC_WALL_16                 697
+#define EL_EMC_WALL_SLIPPERY_1         698
+#define EL_EMC_WALL_SLIPPERY_2         699
+#define EL_EMC_WALL_SLIPPERY_3         700
+#define EL_EMC_WALL_SLIPPERY_4         701
+#define EL_EMC_FAKE_GRASS              702
+#define EL_EMC_DRIPPER                 703
+
+#define NUM_FILE_ELEMENTS              704
 
 
 /* "real" (and therefore drawable) runtime elements */