X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.h;h=1fc4b5dbb982e7ed2fa40c193009bdd3967ae96d;hp=c4a0252bb1fc787061b29694025e4d57dd881907;hb=7ecbe0a730dc19d8a46ffe6bbcb052f20d0c4152;hpb=1e422c29292f0583391b0ce9e9c872b38f035ac0

diff --git a/src/tools.h b/src/tools.h
index c4a0252b..1fc4b5db 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* tools.h                                                  *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// tools.h
+// ============================================================================
 
 #ifndef TOOLS_H
 #define TOOLS_H
@@ -18,7 +16,7 @@
 #include "game.h"
 
 /* for SetDrawtoField */
-#define DRAW_BUFFERED		1
+#define DRAW_FIELDBUFFER	1
 #define DRAW_BACKBUFFER		2
 
 /* for DrawElementShifted */
@@ -49,6 +47,16 @@
 #define DOOR_GET_STATE		(1 << 8)
 #define DOOR_SET_STATE		(1 << 9)
 
+#define DOOR_1			(DOOR_ACTION_1)
+#define DOOR_2			(DOOR_ACTION_2)
+#define DOOR_OPEN		(DOOR_OPEN_ALL)
+#define DOOR_CLOSE		(DOOR_CLOSE_ALL)
+
+#define DOOR_INDEX_FROM_TOKEN(x)	((x) == DOOR_1 ? 0 : 1)
+#define DOOR_TOKEN_FROM_INDEX(x)	((x) == 0 ? DOOR_1 ? : DOOR_2)
+#define REDRAW_DOOR_FROM_TOKEN(x)	((x) == DOOR_1 ? REDRAW_DOOR_1 : \
+					 REDRAW_DOOR_2)
+
 /* for Request */
 #define REQ_ASK			(1 << 0)
 #define REQ_CONFIRM		(1 << 1)
@@ -59,6 +67,7 @@
 
 #define REQUEST_WAIT_FOR_INPUT	(REQ_ASK | REQ_CONFIRM | REQ_PLAYER)
 
+
 void DumpTile(int, int);
 
 void DrawMaskedBorder_FIELD();
@@ -69,7 +78,9 @@ void DrawMaskedBorder_ALL();
 void DrawMaskedBorder(int);
 
 void SetDrawtoField(int);
-void RedrawPlayfield(boolean, int, int, int, int);
+void RedrawPlayfield();
+void BlitScreenToBitmap_RND(Bitmap *);
+void BlitScreenToBitmap(Bitmap *);
 void BackToFront();
 
 void FadeIn(int);
@@ -84,6 +95,8 @@ void FadeSetDisabled();
 void FadeSkipNextFadeIn();
 void FadeSkipNextFadeOut();
 
+Bitmap *getGlobalBorderBitmapFromGameStatus();
+
 void ClearField();
 void SetWindowBackgroundImageIfDefined(int);
 void SetMainBackgroundImageIfDefined(int);
@@ -95,6 +108,8 @@ void SetPanelBackground();
 void DrawBackground(int, int, int, int);
 void DrawBackgroundForFont(int, int, int, int, int);
 void DrawBackgroundForGraphic(int, int, int, int, int);
+boolean CheckIfGlobalBorderHasChanged();
+void RedrawGlobalBorder();
 
 void MarkTileDirty(int, int);
 void SetBorderElement();
@@ -104,9 +119,6 @@ void FloodFillLevel(int, int, int, short[MAX_LEV_FIELDX][MAX_LEV_FIELDY],
 void SetRandomAnimationValue(int, int);
 int getGraphicAnimationFrame(int, int);
 
-void DrawGraphicAnimation(int, int, int);
-void DrawGraphicAnimationExt(DrawBuffer *, int, int, int, int, int);
-
 void DrawFixedGraphicAnimation(int, int, int);
 void DrawFixedGraphicAnimationExt(DrawBuffer *, int, int, int, int, int);
 
@@ -124,7 +136,6 @@ void getFixedGraphicSourceExt(int, int, Bitmap **, int *, int *, boolean);
 void getSizedGraphicSource(int, int, int, Bitmap **, int *, int *);
 void getFixedGraphicSource(int, int, Bitmap **, int *, int *);
 void getMiniGraphicSource(int, Bitmap **, int *, int *);
-void getGraphicSourceExt(int, int, Bitmap **, int *, int *, boolean);
 void getGraphicSource(int, int, Bitmap **, int *, int *);
 
 void DrawGraphic(int, int, int, int);
@@ -158,18 +169,25 @@ void DrawLevelElement(int, int, int);
 void DrawScreenField(int, int);
 void DrawLevelField(int, int);
 
+void DrawSizedElement(int, int, int, int);
+void DrawSizedElementOrWall(int, int, int, int, int);
+
 void DrawMiniElement(int, int, int);
 void DrawMiniElementOrWall(int, int, int, int);
 
 void ShowEnvelope(int);
 void ShowEnvelopeDoor(char *text, int);
 
-void DrawLevel(void);
+void DrawLevel(int);
+void DrawSizedLevel(int, int, int, int, int);
 void DrawMiniLevel(int, int, int, int);
-void DrawPreviewLevel(boolean);
+void DrawPreviewLevelInitial(void);
+void DrawPreviewLevelAnimation(void);
 
-void WaitForEventToContinue();
+void WaitForEventToContinue(void);
 boolean Request(char *, unsigned int);
+void InitGraphicCompatibilityInfo_Doors(void);
+void InitDoors(void);
 unsigned int OpenDoor(unsigned int);
 unsigned int CloseDoor(unsigned int);
 unsigned int GetDoorState(void);
@@ -217,7 +235,7 @@ int getBeltElementFromBeltNrAndBeltDir(int, int);
 int getBeltSwitchElementFromBeltNrAndBeltDirNr(int, int);
 int getBeltSwitchElementFromBeltNrAndBeltDir(int, int);
 
-unsigned int InitRND(long);
+unsigned int InitRND(int);
 void InitGraphicInfo_EM(void);
 
 void PlayMenuSoundExt(int);
@@ -230,7 +248,7 @@ void PlayMenuMusic();
 void PlaySoundActivating();
 void PlaySoundSelecting();
 
-void ToggleFullscreenIfNeeded();
+void ToggleFullscreenOrChangeWindowScalingIfNeeded();
 void ChangeViewportPropertiesIfNeeded();
 
 #endif	/* TOOLS_H */