X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.h;h=202025fa75b61708f61cd43f7027c224b7d8016a;hb=43bafe3a679ef509748fa2a10d6744cdd842d793;hp=424c7fe1a72b197f81237070e5a5738e78afd034;hpb=a7c06161253796a30a0237a7f5a044f459c8cf35;p=rocksndiamonds.git

diff --git a/src/tools.h b/src/tools.h
index 424c7fe1..202025fa 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -49,6 +49,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)
@@ -60,25 +70,6 @@
 #define REQUEST_WAIT_FOR_INPUT	(REQ_ASK | REQ_CONFIRM | REQ_PLAYER)
 
 
-struct RequestButtonInfo
-{
-  struct TextPosInfo yes;
-  struct TextPosInfo no;
-  struct TextPosInfo confirm;
-  struct TextPosInfo player_1;
-  struct TextPosInfo player_2;
-  struct TextPosInfo player_3;
-  struct TextPosInfo player_4;
-};
-
-struct RequestInfo
-{
-  struct RequestButtonInfo button;
-};
-
-extern struct RequestInfo request;
-
-
 void DumpTile(int, int);
 
 void DrawMaskedBorder_FIELD();
@@ -187,10 +178,12 @@ void ShowEnvelopeDoor(char *text, int);
 
 void DrawLevel(void);
 void DrawMiniLevel(int, int, int, int);
-void DrawPreviewLevel(boolean);
+void DrawPreviewLevelInitial(void);
+void DrawPreviewLevelAnimation(void);
 
 void WaitForEventToContinue();
 boolean Request(char *, unsigned int);
+void InitDoors(void);
 unsigned int OpenDoor(unsigned int);
 unsigned int CloseDoor(unsigned int);
 unsigned int GetDoorState(void);
@@ -251,7 +244,7 @@ void PlayMenuMusic();
 void PlaySoundActivating();
 void PlaySoundSelecting();
 
-void ToggleFullscreenIfNeeded();
+void ToggleFullscreenOrChangeWindowScalingIfNeeded();
 void ChangeViewportPropertiesIfNeeded();
 
 #endif	/* TOOLS_H */