X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2Fmain_sp.h;h=6e61508b44bdc93487cb51a5eb817d7d57c2c013;hb=e51177796149f37de339bda83558c3c49758be93;hp=0c0db95bbb9283a2f853c2b6717586418606f31c;hpb=e63e92923fa0196ba7d538d4c8f5a16994e3bee8;p=rocksndiamonds.git

diff --git a/src/game_sp/main_sp.h b/src/game_sp/main_sp.h
index 0c0db95b..6e61508b 100644
--- a/src/game_sp/main_sp.h
+++ b/src/game_sp/main_sp.h
@@ -6,6 +6,7 @@
 /* ========================================================================= */
 
 #include "../engines.h"
+#include "../conf_gfx.h"
 
 
 /* ========================================================================= */
@@ -26,28 +27,47 @@
 
 /* screen sizes and positions for SP engine */
 
-#define ORIG_TILEX		16
-#define ORIG_TILEY		16
+#define ORIG_TILESIZE		16
 
 #define ZOOM_FACTOR		2
 
-#define TILEX			(ORIG_TILEX		* ZOOM_FACTOR)
-#define TILEY			(ORIG_TILEY		* ZOOM_FACTOR)
+#define TILESIZE		(ORIG_TILESIZE * ZOOM_FACTOR)
+#define TILEX			TILESIZE
+#define TILEY			TILESIZE
 
 #define ORIG_SCR_MENUX		20
 #define ORIG_SCR_MENUY		12
 #define SCR_MENUX		17
 #define SCR_MENUY		12
+#if 1
+extern int			SCR_FIELDX, SCR_FIELDY;
+#else
 #define SCR_FIELDX		17
 #define SCR_FIELDY		17
-#define MAX_BUF_XSIZE		(SCR_FIELDX + 2)
-#define MAX_BUF_YSIZE		(SCR_FIELDY + 2)
+#endif
+#define MAX_BUF_XSIZE		(2 + SCR_FIELDX + 2)
+#define MAX_BUF_YSIZE		(2 + SCR_FIELDY + 2)
 
 /* often used screen positions */
+#if 1
+extern int			SX, SY;
+#else
 #define SX			8
 #define SY			8
+#endif
 #define SXSIZE			(SCR_FIELDX * TILEX)
 #define SYSIZE			(SCR_FIELDY * TILEY)
+#define FXSIZE			(MAX_BUF_XSIZE * TILEX)
+#define FYSIZE			(MAX_BUF_YSIZE * TILEY)
+
+#if 1
+extern int			REAL_SX, REAL_SY;
+#else
+#define REAL_SX			(SX - 2)
+#define REAL_SY			(SY - 2)
+#endif
+#define FULL_SXSIZE		(2 + SXSIZE + 2)
+#define FULL_SYSIZE		(2 + SYSIZE + 2)
 
 
 /* ------------------------------------------------------------------------- */
@@ -60,11 +80,12 @@
 
 extern struct LevelInfo_SP native_sp_level;
 
-extern struct GameInfo_SP game_sp;
-
-extern Bitmap *screenBitmap;
+extern Bitmap *bitmap_db_field_sp;
 
-extern Bitmap *sp_objects;
+extern int GfxElementLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
+extern int GfxGraphicLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
+extern int GfxGraphic[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
+extern int GfxFrame[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
 
 
 /* ------------------------------------------------------------------------- */