X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FGlobals.h;h=6b965de945428cd2de1657b5a4928d2f2ebf52a6;hb=04822a800bb5479087613b0730fdf7e765ba012c;hp=4c8798d7c0aadb51d3b4dc7f8647e38d9cdaf4bd;hpb=fe43dcf8ac7fb16e80d60a0c187bcbd65f40b5f2;p=rocksndiamonds.git

diff --git a/src/game_sp/Globals.h b/src/game_sp/Globals.h
index 4c8798d7..6b965de9 100644
--- a/src/game_sp/Globals.h
+++ b/src/game_sp/Globals.h
@@ -13,9 +13,14 @@
 #define True				(!False)
 #endif
 
-#define ScrollDelta			((long)1)
+#define ScrollDelta			((int)1)
 
+#if NEW_TILESIZE
+// #define ZoomFactor			(ZOOM_FACTOR)
 #define ZoomFactor			(2)
+#else
+#define ZoomFactor			(2)
+#endif
 
 #define StretchWidth			(ZoomFactor * 16)
 #define TwoPixels			(ZoomFactor * 2)
@@ -224,8 +229,8 @@ typedef struct
 {
   int Width;
   int Height;
-  long OffSet;
-  long Size;
+  int OffSet;
+  int Size;
 } LevelDescriptor;
 #define HAS_LevelDescriptor
 #endif
@@ -296,8 +301,9 @@ extern boolean menBorder;
 
 #if 1
 extern int *PlayField16;
+extern byte *PlayField8;
 // extern int PlayField16[SP_MAX_PLAYFIELD_SIZE + SP_HEADER_SIZE];
-extern byte PlayField8[SP_MAX_PLAYFIELD_SIZE + SP_HEADER_SIZE];
+// extern byte PlayField8[SP_MAX_PLAYFIELD_SIZE + SP_HEADER_SIZE];
 extern byte DisPlayField[SP_MAX_PLAYFIELD_SIZE + SP_HEADER_SIZE];
 #else
 extern int *PlayField16;
@@ -313,7 +319,9 @@ extern int HeaderSize;
 extern int TimerVar;
 extern short RandomSeed;
 
-extern long FileMax;
+#if 0
+extern int FileMax;
+#endif
 
 extern LevelInfoType LInfo;
 extern int ScrollMinX, ScrollMaxX, ScrollMinY, ScrollMaxY;
@@ -335,6 +343,6 @@ extern int RedDiskReleasePhase;
 extern int ScratchGravity, GravityFlag;
 extern int SnikSnaksElectronsFrozen;
 extern int YellowDisksExploded;
-extern long YawnSleepCounter;
+extern int YawnSleepCounter;
 
 #endif /* GLOBALS_H */