X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fmain_em.h;h=350bc38be584a5b444bc7c59fdc1c3592fe8f172;hb=9cb7b346aac829206d263209c41daadc1fde7c04;hp=0e988595552363b5fda805b893d31d2df7716ece;hpb=56be9668e4ff713c8fff9b105f0913dd4d373cb1;p=rocksndiamonds.git

diff --git a/src/game_em/main_em.h b/src/game_em/main_em.h
index 0e988595..350bc38b 100644
--- a/src/game_em/main_em.h
+++ b/src/game_em/main_em.h
@@ -5,14 +5,14 @@
 // external functions and definitions imported from main program to game_em
 // ============================================================================
 
-#include "../engines.h"
+#include "import_em.h"
 
 
 // ============================================================================
 // functions and definitions that are exported from game_em to main program
 // ============================================================================
 
-#include "export.h"
+#include "export_em.h"
 
 
 // ============================================================================
@@ -48,8 +48,8 @@ extern int			TILESIZE_VAR;
 
 extern int			SCR_FIELDX, SCR_FIELDY;
 
-#define MAX_BUF_XSIZE		(SCR_FIELDX + 2)
-#define MAX_BUF_YSIZE		(SCR_FIELDY + 2)
+#define MAX_BUF_XSIZE		(SCR_FIELDX + 2 * CAVE_BUFFER_XOFFSET)
+#define MAX_BUF_YSIZE		(SCR_FIELDY + 2 * CAVE_BUFFER_YOFFSET)
 
 /* often used screen positions */
 
@@ -76,6 +76,9 @@ extern int			SX, SY;
 
 #define DISPLAY_TIME(x)		ROUNDED_DIVIDE(x, FRAMES_PER_SECOND)
 
+#define CAVE_POS_X(x)		((x) - lev.left)
+#define CAVE_POS_Y(x)		((x) - lev.top)
+
 
 // ----------------------------------------------------------------------------
 // data structure definitions
@@ -85,25 +88,15 @@ extern int			SX, SY;
 // exported variables
 // ----------------------------------------------------------------------------
 
-extern unsigned int RandomEM;
-
 extern struct CAVE cav;
 extern struct LOGIC lev;
 extern struct PLAYER ply[MAX_PLAYERS];
 
 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_object[GAME_TILE_MAX][8];
 extern struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
 extern struct GameInfo_EM game_em;
 
-extern unsigned char tab_blank[TILE_MAX];
-extern unsigned char tab_acid[TILE_MAX];
-extern unsigned char tab_fake_acid[TILE_MAX];
-extern unsigned char tab_amoeba[TILE_MAX];
-extern unsigned char tab_android_move[TILE_MAX];
-extern unsigned short tab_explode_normal[TILE_MAX];
-extern unsigned short tab_explode_dynamite[TILE_MAX];
-
 extern Bitmap *screenBitmap;