fixed some memory allocations to prevent valgrind warnings

[rocksndiamonds.git] / src / game_sp / Globals.h

diff --git a/src/game_sp/Globals.h b/src/game_sp/Globals.h
index dc5d3c968572160237912312a6c268bfcc953c70..bcb8dad3da471be2662543bc8f8923821a9a2599 100644 (file)
--- a/src/game_sp/Globals.h
+++ b/src/game_sp/Globals.h
@@ -13,7 +13,7 @@
 #define True                           (!False)
 #endif
 
-#define ScrollDelta                    ((long)1)
+#define ScrollDelta                    ((int)1)
 
 #define ZoomFactor                     (2)
 
@@ -224,8 +224,8 @@ typedef struct
 {
   int Width;
   int Height;
-  long OffSet;
-  long Size;
+  int OffSet;
+  int Size;
 } LevelDescriptor;
 #define HAS_LevelDescriptor
 #endif
@@ -265,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();
+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 void PrepareLevel();
+void PrepareLevel(void);
 
-extern int getSequenceLength(int sequence);
-extern boolean isSnappingSequence(int sequence);
+int getSequenceLength(int sequence);
+boolean isSnappingSequence(int sequence);
 
-extern void Trace(char *Source, char *Message);
-extern void ReportError(char *Source, char *Message);
-
-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[];
@@ -294,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;
@@ -304,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