X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_em%2Fmain_em.h;h=6c9653154b8631e38e716fed372d56d99c286ff8;hp=d6a768786ee70591cfd486bf88f397f52fd22bbb;hb=520916c89d7d96944bf3d66e3caa5afd840df74c;hpb=1fcb3ddbb8404effdcfa5ebbd53d3ff5009260f6

diff --git a/src/game_em/main_em.h b/src/game_em/main_em.h
index d6a76878..6c965315 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,44 +45,28 @@
 
 /* screen sizes and positions for EM engine */
 
-#define ORIG_TILEX		16
-#define ORIG_TILEY		16
-#define ORIG_SCOREX		8
-#define ORIG_SCOREY		9
-#define ORIG_GFXMENUFONTX	14
-#define ORIG_GFXMENUFONTY	16
-#define ORIG_MENUFONTX		12
-#define ORIG_MENUFONTY		16
-
-#define ZOOM_FACTOR		2
-
-#define TILEX			(ORIG_TILEX		* ZOOM_FACTOR)
-#define TILEY			(ORIG_TILEY		* ZOOM_FACTOR)
-#define SCOREX			(ORIG_SCOREX		* ZOOM_FACTOR)
-#define SCOREY			(ORIG_SCOREY		* ZOOM_FACTOR)
-#define GFXMENUFONTX		(ORIG_GFXMENUFONTX	* ZOOM_FACTOR)
-#define GFXMENUFONTY		(ORIG_GFXMENUFONTY	* ZOOM_FACTOR)
-#define MENUFONTX		(ORIG_MENUFONTX		* ZOOM_FACTOR)
-#define MENUFONTY		(ORIG_MENUFONTY		* ZOOM_FACTOR)
-
-#define ORIG_SCR_MENUX		20
-#define ORIG_SCR_MENUY		12
-#define SCR_MENUX		17
-#define SCR_MENUY		12
-#define SCR_FIELDX		17
-#define SCR_FIELDY		17
+#define TILESIZE		32
+
+extern int			TILESIZE_VAR;
+
+#define TILEX			TILESIZE_VAR
+#define TILEY			TILESIZE_VAR
+
+extern int			SCR_FIELDX, SCR_FIELDY;
+
 #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
-#define SX			8
-#define SY			8
+
+extern int			SX, SY;
+
 #define SXSIZE			(SCR_FIELDX * TILEX)
 #define SYSIZE			(SCR_FIELDY * TILEY)
 
+/* other settings */
+#define PLAY_ELEMENT_SOUND	FALSE
+
 
 /* ------------------------------------------------------------------------- */
 /* macro function definitions                                                */
@@ -104,7 +91,7 @@
 /* exported variables                                                        */
 /* ------------------------------------------------------------------------- */
 
-extern unsigned long RandomEM;
+extern unsigned int RandomEM;
 
 extern struct LEVEL lev;
 extern struct PLAYER ply[MAX_PLAYERS];
@@ -139,15 +126,6 @@ extern Bitmap *sprBitmap;
 extern Bitmap *ttlBitmap;
 extern Bitmap *botBitmap;
 
-extern Pixmap screenPixmap;
-extern Pixmap scorePixmap;
-extern Pixmap spriteBitmap;
-
-extern Pixmap objmaskBitmap;
-extern Pixmap sprmaskBitmap;
-
-extern GC spriteGC;
-
 
 /* ------------------------------------------------------------------------- */
 /* exported functions                                                        */