X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fmain_em.h;h=cdb9325cad4d1be58da3494c85191f42e0faa993;hb=df57066a525140f21a8b712e7276cfba8c87a218;hp=cde3df154a0696d710bc4533d6f0ca1b555f1e22;hpb=3923ae9a33cceaf73cd7911b0c7d6abc18b3663b;p=rocksndiamonds.git

diff --git a/src/game_em/main_em.h b/src/game_em/main_em.h
index cde3df15..cdb9325c 100644
--- a/src/game_em/main_em.h
+++ b/src/game_em/main_em.h
@@ -37,11 +37,6 @@
 
 #define FILE_VERSION_EM_ACTUAL	FILE_VERSION_EM_V6
 
-/* level sizes and positions for EM engine */
-
-#define WIDTH			EM_MAX_CAVE_WIDTH
-#define HEIGHT			EM_MAX_CAVE_HEIGHT
-
 /* screen sizes and positions for EM engine */
 
 #define TILESIZE		32
@@ -53,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 */
 
@@ -90,40 +85,16 @@ extern int			SX, SY;
 // exported variables
 // ----------------------------------------------------------------------------
 
-extern unsigned int RandomEM;
-
-extern struct LEVEL lev;
+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_player[MAX_PLAYERS][SPR_MAX][8];
-
-extern short **Boom;
-extern short **Cave;
-extern short **Next;
-extern short **Draw;
-
+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_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 unsigned short map_obj[8][TILE_MAX];
-extern unsigned short map_spr[2][8][SPR_MAX];
-extern unsigned short map_ttl[128];
-
 extern Bitmap *screenBitmap;
-extern Bitmap *scoreBitmap;
-
-extern Bitmap *objBitmap;
-extern Bitmap *sprBitmap;
-extern Bitmap *ttlBitmap;
-extern Bitmap *botBitmap;
 
 
 // ----------------------------------------------------------------------------