X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fmain_em.h;h=91b0184468214bed54e530700ce0d92958b6705e;hb=61c3da024802ecc0268bab42d7499fc0346e4fd3;hp=add5ae09e61e2076203ead5fe106f775a099043e;hpb=5ba7f2d9a3f07f342afdf215a3307d5487cb6d43;p=rocksndiamonds.git

diff --git a/src/game_em/main_em.h b/src/game_em/main_em.h
index add5ae09..91b01844 100644
--- a/src/game_em/main_em.h
+++ b/src/game_em/main_em.h
@@ -45,6 +45,10 @@
 
 /* screen sizes and positions for EM engine */
 
+#define NEW_TILESIZE		1
+
+#define ORIG_TILESIZE		16
+
 #define ORIG_TILEX		16
 #define ORIG_TILEY		16
 #define ORIG_SCOREX		8
@@ -54,10 +58,22 @@
 #define ORIG_MENUFONTX		12
 #define ORIG_MENUFONTY		16
 
+#if NEW_TILESIZE
+#define ZOOM_FACTOR		(2 * TILESIZE_VAR / TILESIZE)
+#else
 #define ZOOM_FACTOR		2
+#endif
+
+#define TILESIZE		32
 
+#if NEW_TILESIZE
+extern int			TILESIZE_VAR;
+#define TILEX			TILESIZE_VAR
+#define TILEY			TILESIZE_VAR
+#else
 #define TILEX			(ORIG_TILEX		* ZOOM_FACTOR)
 #define TILEY			(ORIG_TILEY		* ZOOM_FACTOR)
+#endif
 #define SCOREX			(ORIG_SCOREX		* ZOOM_FACTOR)
 #define SCOREY			(ORIG_SCOREY		* ZOOM_FACTOR)
 #define GFXMENUFONTX		(ORIG_GFXMENUFONTX	* ZOOM_FACTOR)
@@ -69,16 +85,24 @@
 #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
+#endif
 #define MAX_BUF_XSIZE		(SCR_FIELDX + 2)
 #define MAX_BUF_YSIZE		(SCR_FIELDY + 2)
 
 /* often used screen positions */
 #define ORIG_MENU_SX		((ORIG_SCR_MENUX - SCR_MENUX) * TILEX / 2)
 #define ORIG_MENU_SY		0
+#if 1
+extern int			SX, SY;
+#else
 #define SX			8
 #define SY			8
+#endif
 #define SXSIZE			(SCR_FIELDX * TILEX)
 #define SYSIZE			(SCR_FIELDY * TILEY)
 
@@ -109,7 +133,7 @@
 /* exported variables                                                        */
 /* ------------------------------------------------------------------------- */
 
-extern unsigned long RandomEM;
+extern unsigned int RandomEM;
 
 extern struct LEVEL lev;
 extern struct PLAYER ply[MAX_PLAYERS];