X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.h;h=afad2e37948a973739006a7dcd05143f0745c2c1;hb=b6b5d3fe94b178e8e48e9c51b61f3b1b8383a42f;hp=562d0937d3971ea4d0a6ffbf2015c7fff0aaa220;hpb=21e33411cb221de827be347312ad67c59b7d5a95;p=rocksndiamonds.git

diff --git a/src/tools.h b/src/tools.h
index 562d0937..afad2e37 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -17,53 +17,50 @@
 
 
 // for DrawElementShifted
-#define NO_CUTTING		0
-#define CUT_ABOVE		(1 << 0)
-#define CUT_BELOW		(1 << 1)
-#define CUT_LEFT		(1 << 2)
-#define CUT_RIGHT		(1 << 3)
+#define NO_CUTTING			0
+#define CUT_ABOVE			(1 << 0)
+#define CUT_BELOW			(1 << 1)
+#define CUT_LEFT			(1 << 2)
+#define CUT_RIGHT			(1 << 3)
 
 // for masking functions
-#define NO_MASKING		0
-#define USE_MASKING		1
+#define NO_MASKING			0
+#define USE_MASKING			1
  
 // for MoveDoor
-#define DOOR_OPEN_1		(1 << 0)
-#define DOOR_OPEN_2		(1 << 1)
-#define DOOR_CLOSE_1		(1 << 2)
-#define DOOR_CLOSE_2		(1 << 3)
-#define DOOR_OPEN_ALL		(DOOR_OPEN_1 | DOOR_OPEN_2)
-#define DOOR_CLOSE_ALL		(DOOR_CLOSE_1 | DOOR_CLOSE_2)
-#define DOOR_ACTION_1		(DOOR_OPEN_1 | DOOR_CLOSE_1)
-#define DOOR_ACTION_2		(DOOR_OPEN_2 | DOOR_CLOSE_2)
-#define DOOR_ACTION		(DOOR_ACTION_1 | DOOR_ACTION_2)
-#define DOOR_COPY_BACK		(1 << 4)
-#define DOOR_NO_COPY_BACK	(1 << 5)
-#define DOOR_NO_DELAY		(1 << 6)
-#define DOOR_FORCE_ANIM		(1 << 7)
-#define DOOR_FORCE_REDRAW	(1 << 8)
-#define DOOR_GET_STATE		(1 << 9)
-#define DOOR_SET_STATE		(1 << 10)
-
-#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_OPEN_1			(1 << 0)
+#define DOOR_OPEN_2			(1 << 1)
+#define DOOR_CLOSE_1			(1 << 2)
+#define DOOR_CLOSE_2			(1 << 3)
+#define DOOR_OPEN_ALL			(DOOR_OPEN_1 | DOOR_OPEN_2)
+#define DOOR_CLOSE_ALL			(DOOR_CLOSE_1 | DOOR_CLOSE_2)
+#define DOOR_ACTION_1			(DOOR_OPEN_1 | DOOR_CLOSE_1)
+#define DOOR_ACTION_2			(DOOR_OPEN_2 | DOOR_CLOSE_2)
+#define DOOR_ACTION			(DOOR_ACTION_1 | DOOR_ACTION_2)
+#define DOOR_COPY_BACK			(1 << 4)
+#define DOOR_NO_COPY_BACK		(1 << 5)
+#define DOOR_NO_DELAY			(1 << 6)
+#define DOOR_FORCE_ANIM			(1 << 7)
+#define DOOR_FORCE_REDRAW		(1 << 8)
+#define DOOR_GET_STATE			(1 << 9)
+#define DOOR_SET_STATE			(1 << 10)
+
+#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)
+#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)
-#define REQ_PLAYER		(1 << 2)
-#define REQ_STAY_OPEN		(1 << 3)
-#define REQ_STAY_CLOSED		(1 << 4)
-#define REQ_REOPEN		(1 << 5)
-
-#define REQUEST_WAIT_FOR_INPUT	(REQ_ASK | REQ_CONFIRM | REQ_PLAYER)
+#define REQ_ASK				(1 << 0)
+#define REQ_CONFIRM			(1 << 1)
+#define REQ_PLAYER			(1 << 2)
+#define REQ_STAY_OPEN			(1 << 3)
+#define REQ_STAY_CLOSED			(1 << 4)
+#define REQ_REOPEN			(1 << 5)
 
 
 int getFieldbufferOffsetX_RND(int, int);
@@ -85,7 +82,7 @@ void DrawMaskedBorder_DOOR_3(void);
 void DrawMaskedBorder_ALL(void);
 void DrawMaskedBorder(int);
 void DrawMaskedBorderToTarget(int);
-void DrawTileCursor(int);
+void DrawTileCursor(int, int);
 
 void SetDrawtoField(int);
 int GetDrawtoField(void);
@@ -133,6 +130,7 @@ void FloodFillLevel(int, int, int, short[MAX_LEV_FIELDX][MAX_LEV_FIELDY], int, i
 void FloodFillLevelExt(int, int, int, int x, int y, short field[x][y], int, int);
 
 void SetRandomAnimationValue(int, int);
+void SetAnimationFirstLevel(int);
 int getGraphicAnimationFrame(int, int);
 int getGraphicAnimationFrameXY(int, int, int);
 
@@ -216,7 +214,7 @@ void DrawNetworkPlayers(void);
 void ClearNetworkPlayers(void);
 
 void WaitForEventToContinue(void);
-boolean Request(char *, unsigned int);
+int Request(char *, unsigned int);
 void InitGraphicCompatibilityInfo_Doors(void);
 void InitDoors(void);
 unsigned int OpenDoor(unsigned int);
@@ -231,6 +229,11 @@ void UndrawSpecialEditorDoor(void);
 void CreateToolButtons(void);
 void FreeToolButtons(void);
 
+int map_element_RND_to_BD_cave(int);
+int map_element_RND_to_BD_effect(int, int);
+int map_element_BD_to_RND_cave(int);
+int map_element_BD_to_RND_game(int);
+
 int map_element_RND_to_EM_cave(int);
 int map_element_EM_to_RND_cave(int);
 int map_element_EM_to_RND_game(int);
@@ -275,6 +278,8 @@ int getBeltSwitchElementFromBeltNrAndBeltDirNr(int, int);
 int getBeltSwitchElementFromBeltNrAndBeltDir(int, int);
 
 unsigned int InitRND(int);
+
+void InitGraphicInfo_BD(void);
 void InitGraphicInfo_EM(void);
 
 void PlayMenuSoundExt(int);
@@ -307,6 +312,8 @@ boolean CheckFadeAll(void);
 void OpenURL(char *);
 void OpenURLFromHash(SetupFileHash *, int);
 
+char *getCurrentLevelsetName(void);
+
 void TestGeneratingUUIDs(void);
 
 #endif	// TOOLS_H