rnd-20100210-1-src

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

diff --git a/src/game_sp/Globals.h b/src/game_sp/Globals.h
index 64f3230c54091476b2c39ebdf8d86a6033baac56..dcf6c799ecdf4d12a26feb1dc30d5ef9dd72163e 100644 (file)
--- a/src/game_sp/Globals.h
+++ b/src/game_sp/Globals.h
@@ -12,29 +12,70 @@
 
 #include "global.h"
 
+#if 1
+
+#define ZoomFactor                     (2)
+
+#define BaseWidth                      (ZoomFactor * 16)
+#define StretchWidth                   (ZoomFactor * 16)
+#define StretchWidth2                  (StretchWidth / 2)
+#define TwoPixels                      (ZoomFactor * 2)
+
+#else
+
 #define BaseWidth                      (16)
 #define StretchWidth                   (16)
 #define StretchWidth2                  (StretchWidth / 2)
 #define TwoPixels                      (2)
-#define aniExplosionInfo                       (111)
-#define aniMurphySleepLeft                     (71)
-#define aniMurphySleepRight                    (68)
-#define aniMurphyTouchDown                     (47)
-#define aniMurphyTouchLeft                     (95)
-#define aniMurphyTouchRight                    (94)
-#define aniMurphyTouchUp                       (46)
+
+#endif
+
+#define aniExplosionInfo               (111)
+
+#if 1
+
+#define aniMurphy                      (IMG_SP_MURPHY)
+
+#define aniMurphySleepLeft             (IMG_SP_MURPHY_SLEEPING_LEFT)
+#define aniMurphySleepRight            (IMG_SP_MURPHY_SLEEPING_RIGHT)
+#define aniMurphyTouchDown             (IMG_SP_MURPHY_SNAPPING_DOWN)
+#define aniMurphyTouchLeft             (IMG_SP_MURPHY_SNAPPING_LEFT)
+#define aniMurphyTouchRight            (IMG_SP_MURPHY_SNAPPING_RIGHT)
+#define aniMurphyTouchUp               (IMG_SP_MURPHY_SNAPPING_UP)
+#define aniMurphyYawn                  (IMG_SP_MURPHY_BORING_1)
+#define aniPushLeft                    (IMG_SP_MURPHY_PUSHING_LEFT)
+#define aniPushRight                   (IMG_SP_MURPHY_PUSHING_RIGHT)
+#define aniPushUpDown                  (IMG_SP_MURPHY_PUSHING_RIGHT)
+
+#define aniSnikSnakDown                (167)
+#define aniSnikSnakLeft                (239)
+#define aniSnikSnakRight               (247)
+#define aniSnikSnakUp                  (159)
+
+#else
+
+#define aniMurphySleepLeft             (71)
+#define aniMurphySleepRight            (68)
+#define aniMurphyTouchDown             (47)
+#define aniMurphyTouchLeft             (95)
+#define aniMurphyTouchRight            (94)
+#define aniMurphyTouchUp               (46)
 #define aniMurphyYawn                  (56)
 #define aniPushLeft                    (45)
 #define aniPushRight                   (44)
 #define aniPushUpDown                  (79)
-#define aniSnikSnakDown                        (167)
-#define aniSnikSnakLeft                        (239)
-#define aniSnikSnakRight                       (247)
+
+#define aniSnikSnakDown                (167)
+#define aniSnikSnakLeft                (239)
+#define aniSnikSnakRight               (247)
 #define aniSnikSnakUp                  (159)
-#define fiBase                         (2)
-#define fiBug                  (25)
+
+#endif
+
+#define fiBase                                 (2)
+#define fiBug                          (25)
 #define fiElectron                     (24)
-#define fiExit                         (7)
+#define fiExit                                 (7)
 #define fiExplosion                    (0x1F)
 #define fiHWFirst                      (28)
 #define fiHWLast                       (37)
@@ -45,14 +86,14 @@
 #define fiInfotron                     (4)
 #define fiMurphy                       (3)
 #define fiOrangeDisk                   (8)
-#define fiPortAllDirections                    (23)
+#define fiPortAllDirections            (23)
 #define fiPortDown                     (10)
 #define fiPortLeft                     (11)
-#define fiPortLeftAndRight                     (22)
+#define fiPortLeftAndRight             (22)
 #define fiPortRight                    (9)
 #define fiPortUp                       (12)
-#define fiPortUpAndDown                        (21)
-#define fiRAM                  (5)
+#define fiPortUpAndDown                (21)
+#define fiRAM                          (5)
 #define fiRAMBottom                    (39)
 #define fiRAMLeft                      (26)
 #define fiRAMRight                     (27)
@@ -67,7 +108,8 @@
 #define fiTerminal                     (19)
 #define fiWallSpace                    (40)
 #define fiYellowDisk                   (18)
-#define fiZonk                         (1)
+#define fiZonk                                 (1)
+
 #define keyDown                        (3)
 #define keyLeft                        (2)
 #define keyNone                        (0)
@@ -77,10 +119,11 @@
 #define keySpaceLeft                   (6)
 #define keySpaceRight                  (8)
 #define keySpaceUp                     (5)
-#define keyUp                  (1)
+#define keyUp                          (1)
+
 #define posFrameCorner                         (55)
-#define posFrameHorizontal                     (111)
-#define posFrameVertical                       (110)
+#define posFrameHorizontal             (111)
+#define posFrameVertical               (110)
 
 extern int GetSI(int X, int Y);
 extern int GetStretchX(int si);
@@ -129,6 +172,18 @@ extern byte *PlayField8;
 extern char *CurPath, *OrigPath, *TmpPath;
 extern currency DeltaT;
 extern int *PlayField16;
+
+#if 1
+extern int aniBug[], aniZonkRollRight[], aniZonkRollLeft[];
+extern int aniEatInfotronLeft[], aniEatInfotronRight[];
+extern int aniInfotronRollRight[], aniInfotronRollLeft[];
+extern int aniMurphyEatLeft[], aniMurphyEatRight[];
+extern int aniMurphyEatUpLeft[], aniMurphyEatUpRight[], aniSplitUpDown[];
+extern int aniMurphyExit[];
+extern int aniSnikSnak[], aniElectron[], aniExplosion[];
+extern int aniTouchBase[], aniTouchInfotron[], aniTouchRedDisk[];
+extern int aniYellowDisk[], aniOrangeDisk[], aniRedDisk[];
+#else
 extern int *aniBug, *aniZonkRollRight, *aniZonkRollLeft;
 extern int *aniEatInfotronLeft, *aniEatInfotronRight;
 extern int *aniInfotronRollRight, *aniInfotronRollLeft;
@@ -138,13 +193,16 @@ extern int *aniMurphyExit;
 extern int *aniSnikSnak, *aniElectron, *aniExplosion;
 extern int *aniTouchBase, *aniTouchInfotron, *aniTouchRedDisk;
 extern int *aniYellowDisk, *aniOrangeDisk, *aniRedDisk;
+#endif
+
 extern int FieldHeight;
 extern int FieldMax, LevelMax;
 extern int FieldWidth;
 extern int FreezeZonks;
 extern int HeaderSize;
 extern int LevelNumber;
-extern int TimerVar, RandomSeed;
+extern int TimerVar;
+extern short RandomSeed;
 extern long DeltaTPlay, DeltaTDemo;
 extern long FileMax;
 extern long SignatureDelay;