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 c2a56c7c8b170268c934565572a7a5cd5ac84f21..bcb8dad3da471be2662543bc8f8923821a9a2599 100644 (file)
--- a/src/game_sp/Globals.h
+++ b/src/game_sp/Globals.h
@@ -13,14 +13,9 @@
 #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)
@@ -229,8 +224,8 @@ typedef struct
 {
   int Width;
   int Height;
-  long OffSet;
-  long Size;
+  int OffSet;
+  int Size;
 } LevelDescriptor;
 #define HAS_LevelDescriptor
 #endif
@@ -270,25 +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);
 
-#if 0
-extern void Trace(char *Source, char *Message);
-extern void ReportError(char *Source, char *Message);
-#endif
-
-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[];
@@ -299,17 +290,9 @@ extern boolean LevelLoaded;
 extern boolean DemoAvailable;
 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 DisPlayField[SP_MAX_PLAYFIELD_SIZE + SP_HEADER_SIZE];
-#else
-extern int *PlayField16;
-extern byte *PlayField8;
-extern byte *DisPlayField;
-#endif
 
 extern int FieldHeight;
 extern int FieldMax, LevelMax;
@@ -319,10 +302,6 @@ extern int HeaderSize;
 extern int TimerVar;
 extern short RandomSeed;
 
-#if 0
-extern long FileMax;
-#endif
-
 extern LevelInfoType LInfo;
 extern int ScrollMinX, ScrollMaxX, ScrollMinY, ScrollMaxY;
 extern int ScrollX, ScrollY;
@@ -343,6 +322,6 @@ extern int RedDiskReleasePhase;
 extern int ScratchGravity, GravityFlag;
 extern int SnikSnaksElectronsFrozen;
 extern int YellowDisksExploded;
-extern long YawnSleepCounter;
+extern int YawnSleepCounter;
 
-#endif /* GLOBALS_H */
+#endif // GLOBALS_H