added separate initial and runtime level structure definitions for EM engine

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

diff --git a/src/game_em/export.h b/src/game_em/export.h
index 5ba8c5ce2da1743cef9d611cce74fece1d985917..3089d48f3f5e3e3c3b9051e00121434a5bcfa2d5 100644 (file)
--- a/src/game_em/export.h
+++ b/src/game_em/export.h
@@ -6,14 +6,15 @@
 // ============================================================================
 
 #include "emerald.h"
+#include "cave.h"
 
 
 // ----------------------------------------------------------------------------
 // constant definitions
 // ----------------------------------------------------------------------------
 
-#define EM_MAX_CAVE_BUFFER_WIDTH       CAVE_BUFFER_WIDTH
-#define EM_MAX_CAVE_BUFFER_HEIGHT      CAVE_BUFFER_HEIGHT
+#define EM_MAX_CAVE_WIDTH              CAVE_WIDTH
+#define EM_MAX_CAVE_HEIGHT             CAVE_HEIGHT
 
 
 // ----------------------------------------------------------------------------
@@ -38,19 +39,16 @@ struct GameInfo_EM
 
   int last_moving_player;
   int last_player_direction[MAX_PLAYERS];
+
+  struct LOGIC *lev;
+  struct PLAYER *ply[MAX_PLAYERS];
 };
 
 struct LevelInfo_EM
 {
   int file_version;
 
-  short cave[CAVE_BUFFER_WIDTH][CAVE_BUFFER_HEIGHT];
-
-  struct LEVEL *lev;
-  struct PLAYER *ply[MAX_PLAYERS];
-
-  /* used for runtime values */
-  struct GameInfo_EM *game_em;
+  struct CAVE *cav;
 };
 
 struct GraphicInfo_EM
@@ -76,7 +74,7 @@ struct EngineSnapshotInfo_EM
 {
   struct GameInfo_EM game_em;
   unsigned int RandomEM;
-  struct LEVEL lev;
+  struct LOGIC lev;
   struct PLAYER ply[MAX_PLAYERS];
   int screen_x;
   int screen_y;
@@ -111,7 +109,6 @@ boolean LoadNativeLevel_EM(char *, boolean);
 int getFieldbufferOffsetX_EM(void);
 int getFieldbufferOffsetY_EM(void);
 
-void BackToFront_EM(void);
 void BlitScreenToBitmap_EM(Bitmap *);
 void RedrawPlayfield_EM(boolean);
 
@@ -120,7 +117,4 @@ void SaveEngineSnapshotValues_EM(void);
 
 boolean checkIfAllPlayersFitToScreen(void);
 
-void tab_generate(void);
-void tab_generate_graphics_info_em(void);
-
 #endif // EXPORT_H