rnd-20050815-1-src

[rocksndiamonds.git] / src / game_em / level.h

diff --git a/src/game_em/level.h b/src/game_em/level.h
index 82cd93bf2159d3742f129f6217815bbd885d6172..46ba9e4038825e8d5a49750a74bbf92fbf7b881b 100644 (file)
--- a/src/game_em/level.h
+++ b/src/game_em/level.h
@@ -1,10 +1,13 @@
 #ifndef LEVEL_H
 #define LEVEL_H
 
+#include "main_em.h"
 #include "tile.h"
 
-#define WIDTH  102
-#define HEIGHT 102
+#define WIDTH          EM_MAX_CAVE_WIDTH
+#define HEIGHT         EM_MAX_CAVE_HEIGHT
+
+#if 0
 
 struct LEVEL
 {
@@ -19,7 +22,7 @@ struct LEVEL
 
   /* fill in all below /every/ time you read a level */
   unsigned int alien_score;           /* alien popped by stone/spring score */
-  unsigned int ameuba_time;           /* ameuba speed */
+  unsigned int amoeba_time;           /* amoeba speed */
   unsigned int android_move_cnt;      /* android move time counter */
   unsigned int android_move_time;     /* android move reset time */
   unsigned int android_clone_cnt;     /* android clone time counter */
@@ -73,21 +76,29 @@ struct PLAYER
   unsigned int y;
   unsigned int oldx;
   unsigned int oldy;
+
   unsigned joy_n:1;
   unsigned joy_e:1;
   unsigned joy_s:1;
   unsigned joy_w:1;
-  unsigned joy_fire:1;
+  unsigned joy_snap:1;
+  unsigned joy_drop:1;
   unsigned joy_stick:1;
   unsigned joy_spin:1;
 };
 
-extern unsigned long Random;
+#endif
+
+extern unsigned long RandomEM;
 
 extern struct PLAYER ply1;
 extern struct PLAYER ply2;
 extern struct LEVEL lev;
 
+extern struct LevelInfo_EM native_em_level;
+extern struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8];
+extern struct GraphicInfo_EM graphic_info_em_player[2][SPR_MAX][8];
+
 extern unsigned short **Boom;
 extern unsigned short **Cave;
 extern unsigned short **Next;