X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=9175e5c294776724e8fcc97619961207f48efdf3;hb=020210607f2ba71676882d52d0413f4128858b4a;hp=0b154ad28107aceaf9978441b1a0bab597476b63;hpb=6fe98dc77891e9fc45cbd99bbd4793e2133c6960;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 0b154ad2..9175e5c2 100644
--- a/src/main.h
+++ b/src/main.h
@@ -122,6 +122,7 @@ typedef unsigned char byte;
 #define EP_BIT_MAMPF3		(1<<23)
 #define EP_BIT_PUSHABLE		(1<<24)
 #define EP_BIT_PLAYER		(1<<25)
+#define EP_BIT_HAS_CONTENT	(1<<26)
 
 #define IS_AMOEBALIVE(e)	(Elementeigenschaften[e] & EP_BIT_AMOEBALIVE)
 #define IS_AMOEBOID(e)		(Elementeigenschaften[e] & EP_BIT_AMOEBOID)
@@ -149,6 +150,7 @@ typedef unsigned char byte;
 #define IS_MAMPF3(e)		(Elementeigenschaften[e] & EP_BIT_MAMPF3)
 #define IS_PUSHABLE(e)		(Elementeigenschaften[e] & EP_BIT_PUSHABLE)
 #define ELEM_IS_PLAYER(e)	(Elementeigenschaften[e] & EP_BIT_PLAYER)
+#define HAS_CONTENT(e)		(Elementeigenschaften[e] & EP_BIT_HAS_CONTENT)
 
 #define IS_PLAYER(x,y)		(ELEM_IS_PLAYER(StorePlayer[x][y]))
 
@@ -204,6 +206,7 @@ typedef unsigned char byte;
 #define GAME_FRAME_DELAY	20	/* frame delay in milliseconds */
 #define FFWD_FRAME_DELAY	10	/* 200% speed for fast forward */
 #define FRAMES_PER_SECOND	(1000 / GAME_FRAME_DELAY)
+#define GADGET_FRAME_DELAY	150	/* delay between gadget actions */
 
 struct HiScore
 {
@@ -328,7 +331,7 @@ struct LevelInfo
   int edelsteine;
   char name[MAX_LEVNAMLEN];
   int score[LEVEL_SCORE_ELEMENTS];
-  int mampfer_inhalt[4][3][3];
+  int mampfer_inhalt[8][3][3];
   int tempo_amoebe;
   int dauer_sieb;
   int dauer_ablenk;
@@ -431,7 +434,7 @@ extern int		BX1,BY1, BX2,BY2;
 extern int		ZX,ZY, ExitX,ExitY;
 extern int		AllPlayersGone;
 extern int		FrameCounter, TimeFrames, TimeLeft;
-extern int		MampferNr, SiebAktiv;
+extern int		MampferMax, MampferNr, SiebAktiv;
 
 extern boolean		network_player_action_received;