X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fmain_em.h;h=91b0184468214bed54e530700ce0d92958b6705e;hb=931481fe085a820997fc0184263ced9d6475aea5;hp=d6a768786ee70591cfd486bf88f397f52fd22bbb;hpb=1fcb3ddbb8404effdcfa5ebbd53d3ff5009260f6;p=rocksndiamonds.git

diff --git a/src/game_em/main_em.h b/src/game_em/main_em.h
index d6a76878..91b01844 100644
--- a/src/game_em/main_em.h
+++ b/src/game_em/main_em.h
@@ -28,8 +28,11 @@
 /* ------------------------------------------------------------------------- */
 
 /* values for native Emerald Mine game version */
+#define FILE_VERSION_EM_UNKNOWN	0
+#define FILE_VERSION_EM_V1	1
+#define FILE_VERSION_EM_V2	2
 #define FILE_VERSION_EM_V3	3
-#define FILE_VERSION_EM_V4	4
+#define FILE_VERSION_EM_V4	4	/* (there really was no version 4) */
 #define FILE_VERSION_EM_V5	5
 #define FILE_VERSION_EM_V6	6
 
@@ -42,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
@@ -51,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)
@@ -66,20 +85,30 @@
 #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
-#define SY			8
+#if 1
+extern int			SX, SY;
+#else
 #define SX			8
 #define SY			8
+#endif
 #define SXSIZE			(SCR_FIELDX * TILEX)
 #define SYSIZE			(SCR_FIELDY * TILEY)
 
+/* other settings */
+#define PLAY_ELEMENT_SOUND	FALSE
+
 
 /* ------------------------------------------------------------------------- */
 /* macro function definitions                                                */
@@ -104,7 +133,7 @@
 /* exported variables                                                        */
 /* ------------------------------------------------------------------------- */
 
-extern unsigned long RandomEM;
+extern unsigned int RandomEM;
 
 extern struct LEVEL lev;
 extern struct PLAYER ply[MAX_PLAYERS];