X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_sp%2FGlobals.h;h=a202d07df139482eee5939941267d2202b7a99d4;hp=6b965de945428cd2de1657b5a4928d2f2ebf52a6;hb=64e7c54dce6ea8c063f04198c64c5057d751c928;hpb=61c3da024802ecc0268bab42d7499fc0346e4fd3 diff --git a/src/game_sp/Globals.h b/src/game_sp/Globals.h index 6b965de9..a202d07d 100644 --- a/src/game_sp/Globals.h +++ b/src/game_sp/Globals.h @@ -15,12 +15,7 @@ #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) @@ -270,25 +265,20 @@ 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); -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 +289,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 +301,6 @@ extern int HeaderSize; extern int TimerVar; extern short RandomSeed; -#if 0 -extern int FileMax; -#endif - extern LevelInfoType LInfo; extern int ScrollMinX, ScrollMaxX, ScrollMinY, ScrollMaxY; extern int ScrollX, ScrollY; @@ -345,4 +323,4 @@ extern int SnikSnaksElectronsFrozen; extern int YellowDisksExploded; extern int YawnSleepCounter; -#endif /* GLOBALS_H */ +#endif // GLOBALS_H