X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_sp%2FGlobals.h;h=bcb8dad3da471be2662543bc8f8923821a9a2599;hp=330b547016598516ae3434442291b7e8cee3dc89;hb=04a2a29c9811ca80be2123aaab0e56e569a6e3cc;hpb=35b995abd3183999201d9581f7674de1475dc169

diff --git a/src/game_sp/Globals.h b/src/game_sp/Globals.h
index 330b5470..bcb8dad3 100644
--- a/src/game_sp/Globals.h
+++ b/src/game_sp/Globals.h
@@ -13,12 +13,11 @@
 #define True				(!False)
 #endif
 
-#define ScrollDelta			((long)1)
+#define ScrollDelta			((int)1)
 
 #define ZoomFactor			(2)
-#define BaseWidth			(ZoomFactor * 16)
+
 #define StretchWidth			(ZoomFactor * 16)
-#define TileSize			(ZoomFactor * 16)
 #define TwoPixels			(ZoomFactor * 2)
 
 
@@ -225,8 +224,8 @@ typedef struct
 {
   int Width;
   int Height;
-  long OffSet;
-  long Size;
+  int OffSet;
+  int Size;
 } LevelDescriptor;
 #define HAS_LevelDescriptor
 #endif
@@ -266,23 +265,21 @@ typedef struct
 #endif
 
 
-extern int GetSI(int X, int Y);
-extern int GetStretchX(int si);
-extern int GetStretchY(int si);
-extern int GetX(int si);
-extern int GetY(int si);
-extern void InitGlobals();
-
-extern void PrepareLevel();
+int GetSI(int X, int Y);
+int GetStretchX(int si);
+int GetStretchY(int si);
+int GetX(int si);
+int GetY(int si);
+void InitGlobals(void);
+void FreeGlobals(void);
 
-extern int getSequenceLength(int sequence);
-extern boolean isSnappingSequence(int sequence);
+void PrepareLevel(void);
 
-extern void Trace(char *Source, char *Message);
-extern void ReportError(char *Source, char *Message);
+int getSequenceLength(int sequence);
+boolean isSnappingSequence(int sequence);
 
-extern int Min(int A, int B);
-extern int Max(int A, int B);
+int Min(int A, int B);
+int Max(int A, int B);
 
 extern int fiGraphic[];
 extern int aniSnikSnakTurningLeft[];
@@ -295,7 +292,7 @@ extern boolean menBorder;
 
 extern int *PlayField16;
 extern byte *PlayField8;
-extern byte *DisPlayField;
+extern byte DisPlayField[SP_MAX_PLAYFIELD_SIZE + SP_HEADER_SIZE];
 
 extern int FieldHeight;
 extern int FieldMax, LevelMax;
@@ -305,10 +302,26 @@ extern int HeaderSize;
 extern int TimerVar;
 extern short RandomSeed;
 
-extern long FileMax;
-
 extern LevelInfoType LInfo;
 extern int ScrollMinX, ScrollMaxX, ScrollMinY, ScrollMaxY;
 extern int ScrollX, ScrollY;
 
-#endif /* GLOBALS_H */
+extern int AllowRedDiskCheat, AllowEatRightRedDiskBug;
+extern int Data_SubRest, Data_SubRstFlg;
+extern int DemoKeyCode;
+extern int GameBusyFlag;
+extern int InfotronsNeeded, TotalInfotronsNeeded;
+extern int KillMurphyFlag, MurphyMoveCounter;
+extern int MurphyExplodePos, SplitMoveFlag, RedDiskReleaseMurphyPos;
+extern int MurphyPosIndex, MurphyXPos, MurphyYPos;
+extern int MurphyScreenXPos, MurphyScreenYPos;
+extern int MurphyVarFaceLeft;
+extern int RedDiskCount;
+extern int RedDiskReleaseFlag, MovingPictureSequencePhase;
+extern int RedDiskReleasePhase;
+extern int ScratchGravity, GravityFlag;
+extern int SnikSnaksElectronsFrozen;
+extern int YellowDisksExploded;
+extern int YawnSleepCounter;
+
+#endif // GLOBALS_H