Merge branch 'master' into releases

[rocksndiamonds.git] / src / game_em / main_em.h

diff --git a/src/game_em/main_em.h b/src/game_em/main_em.h
index c5efc415d4aa717d70d0e5cdcea246d1db89f533..91b0184468214bed54e530700ce0d92958b6705e 100644 (file)
--- 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)
@@ -117,7 +133,7 @@ extern int                  SX, SY;
 /* exported variables                                                        */
 /* ------------------------------------------------------------------------- */
 
-extern unsigned long RandomEM;
+extern unsigned int RandomEM;
 
 extern struct LEVEL lev;
 extern struct PLAYER ply[MAX_PLAYERS];