rnd-20100317-1-src

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

diff --git a/src/game_sp/Globals.h b/src/game_sp/Globals.h
index 194f1b9dced8c95969514e4c55a9d5e88556bd2e..330b547016598516ae3434442291b7e8cee3dc89 100644 (file)
--- a/src/game_sp/Globals.h
+++ b/src/game_sp/Globals.h
@@ -18,6 +18,7 @@
 #define ZoomFactor                     (2)
 #define BaseWidth                      (ZoomFactor * 16)
 #define StretchWidth                   (ZoomFactor * 16)
+#define TileSize                       (ZoomFactor * 16)
 #define TwoPixels                      (ZoomFactor * 2)
 
 
@@ -68,12 +69,12 @@
 #define fiRAMTop                       (38)
 #define fiRAMBottom                    (39)
 #define fiWallSpace                    (40)
-#define fiHWTrash1                     (41)
-#define fiHWTrash2                     (42)
-#define fiHWMurphy                     (43)
 
 #define fiExplosion                    (0x1F)
 
+#define fiFirst                                (0)
+#define fiLast                         (40)
+
 
 // ----------------------------------------------------------------------------
 // graphics and animations (used at runtime to display the elements)
@@ -142,7 +143,6 @@
 #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 aniBugActivating               IMG_SP_BUGGY_BASE_ACTIVATING
 #define aniBugDeactivating             IMG_SP_BUGGY_BASE_ACTIVATING
@@ -200,17 +200,6 @@
 #define imgFrameVertical               IMG_SP_FRAME_VERTICAL
 
 
-extern int aniFramesBug[], aniFramesZonkRollRight[], aniFramesZonkRollLeft[];
-extern int aniFramesEatInfotronLeft[], aniFramesEatInfotronRight[];
-extern int aniFramesInfotronRollRight[], aniFramesInfotronRollLeft[];
-extern int aniFramesMurphyEatLeft[], aniFramesMurphyEatRight[];
-extern int aniFramesMurphyEatUpLeft[], aniFramesMurphyEatUpRight[], aniFramesSplitUpDown[];
-extern int aniFramesMurphyExit[];
-extern int aniFramesSnikSnak[], aniFramesElectron[], aniFramesExplosion[];
-extern int aniFramesTouchBase[], aniFramesTouchInfotron[], aniFramesTouchRedDisk[];
-extern int aniFramesYellowDisk[], aniFramesOrangeDisk[], aniFramesRedDisk[];
-
-
 // ----------------------------------------------------------------------------
 // input keys
 // ----------------------------------------------------------------------------
@@ -284,7 +273,7 @@ extern int GetX(int si);
 extern int GetY(int si);
 extern void InitGlobals();
 
-extern void ReadLevel();
+extern void PrepareLevel();
 
 extern int getSequenceLength(int sequence);
 extern boolean isSnappingSequence(int sequence);
@@ -313,14 +302,12 @@ extern int FieldMax, LevelMax;
 extern int FieldWidth;
 extern int FreezeZonks;
 extern int HeaderSize;
-extern int LevelNumber;
 extern int TimerVar;
 extern short RandomSeed;
 
 extern long FileMax;
 
 extern LevelInfoType LInfo;
-extern float Stretch;
 extern int ScrollMinX, ScrollMaxX, ScrollMinY, ScrollMaxY;
 extern int ScrollX, ScrollY;