X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FGlobals.h;h=5923bad5d08c4f913cc38019a7a1af8ad3e0304c;hb=520916c89d7d96944bf3d66e3caa5afd840df74c;hp=05d4cd7c01031c6180f3737e3914ce817ece07c8;hpb=e51177796149f37de339bda83558c3c49758be93;p=rocksndiamonds.git diff --git a/src/game_sp/Globals.h b/src/game_sp/Globals.h index 05d4cd7c..5923bad5 100644 --- 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 @@ -277,11 +277,6 @@ extern void PrepareLevel(); extern int getSequenceLength(int sequence); extern 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); @@ -294,15 +289,9 @@ extern boolean LevelLoaded; extern boolean DemoAvailable; extern boolean menBorder; -#if 1 -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 byte DisPlayField[SP_MAX_PLAYFIELD_SIZE + SP_HEADER_SIZE]; extern int FieldHeight; extern int FieldMax, LevelMax; @@ -312,8 +301,6 @@ 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; @@ -334,6 +321,6 @@ extern int RedDiskReleasePhase; extern int ScratchGravity, GravityFlag; extern int SnikSnaksElectronsFrozen; extern int YellowDisksExploded; -extern long YawnSleepCounter; +extern int YawnSleepCounter; #endif /* GLOBALS_H */