X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=4da25419093e2a19ee03f3029b86a3cf9f0fd8c3;hb=2a4878a4c2873df0426a22c357533656928748c8;hp=dca91e2e668500794923b773bf5bb903c4619215;hpb=6467d24a3a0f19645cd5ea89b4ca18a95021d657;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index dca91e2e..4da25419 100644
--- a/src/main.h
+++ b/src/main.h
@@ -174,7 +174,6 @@ typedef unsigned char byte;
 				 EL_FELSBROCKEN)
 #define IS_DRAWABLE(e)		((e) < EL_BLOCKED)
 #define IS_NOT_DRAWABLE(e)	((e) >= EL_BLOCKED)
-#define TIMESIZE		(TimeLeft * 100 / level.time)
 #define TAPE_IS_EMPTY(x)	((x).length == 0)
 #define TAPE_IS_STOPPED(x)	(!(x).recording && !(x).playing &&!(x).pausing)
 
@@ -349,6 +348,8 @@ struct LevelDirInfo
   char *filename;
   char *name;
   int levels;
+  int first_level;
+  int last_level;
   int sort_priority;
   boolean user_defined;
   boolean readonly;
@@ -439,11 +440,13 @@ extern int		MoveSpeed;
 extern int		BX1,BY1, BX2,BY2;
 extern int		ZX,ZY, ExitX,ExitY;
 extern int		AllPlayersGone;
-extern int		FrameCounter, TimeFrames, TimeLeft;
+extern int		FrameCounter, TimeFrames, TimePlayed, TimeLeft;
 extern int		MampferMax, MampferNr;
 extern boolean		SiebAktiv;
 extern int		SiebCount;
 
+extern int		game_emulation;
+
 extern boolean		network_player_action_received;
 
 extern struct LevelDirInfo	leveldir[];
@@ -521,8 +524,8 @@ extern int		num_bg_loops;
 #define MINI_MORE_STARTX	0
 #define MINI_MORE_STARTY	160
 #define MICRO_MORE_STARTX	0
-#define MICRO_MORE_STARTY	208
-#define MORE_PER_LINE		8
+#define MICRO_MORE_STARTY	240
+#define MORE_PER_LINE		16
 #define MINI_MORE_PER_LINE	16
 #define MICRO_MORE_PER_LINE	16
 #define FONT_CHARS_PER_LINE	16
@@ -773,6 +776,7 @@ extern int		num_bg_loops;
 #define EL_SIEB2_TOT		305
 #define EL_AUSGANG_ACT		306
 #define EL_SP_TERMINAL_ACTIVE	307
+#define EL_SP_BUG_ACTIVE	308
 
 /* "unreal" (and therefore not drawable) runtime elements */
 #define EL_BLOCKED		400
@@ -786,22 +790,22 @@ extern int		num_bg_loops;
 #define EL_PLAYER_IS_LEAVING	408
 
 /* game graphics:
-**	  0 - 209: graphics from "RocksScreen"
-**	210 - 255: graphics from "RocksMore"
-**	256 - 511: graphics from "RocksFont"
-**	512 - 767: graphics from "RocksHeroes"
+**	  0 -  255: graphics from "RocksScreen"
+**	256 -  511: graphics from "RocksFont"
+**	512 -  767: graphics from "RocksMore"
+**	768 - 1023: graphics from "RocksHeroes"
 */
 
 #define GFX_START_ROCKSSCREEN	0
-#define GFX_END_ROCKSSCREEN	209
-#define GFX_START_ROCKSMORE	210
-#define GFX_END_ROCKSMORE	255
+#define GFX_END_ROCKSSCREEN	255
 #define GFX_START_ROCKSFONT	256
 #define GFX_END_ROCKSFONT	511
-#define GFX_START_ROCKSHEROES	512
-#define GFX_END_ROCKSHEROES	767
+#define GFX_START_ROCKSMORE	512
+#define GFX_END_ROCKSMORE	767
+#define GFX_START_ROCKSHEROES	768
+#define GFX_END_ROCKSHEROES	1023
 
-#define NUM_TILES		768
+#define NUM_TILES		1024
 
 /* graphics from "RocksScreen" */
 /* Zeile 0 (0) */
@@ -1058,6 +1062,19 @@ extern int		num_bg_loops;
 #define GFX_SP_CHIP_UPPER	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 6)
 #define GFX_SP_CHIP_LOWER	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 7)
 
+#define GFX_SP_BUG_WARNING	(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE +15)
+#define GFX_SP_EXPLODE_EMPTY	(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 8)
+#define GFX_SP_EXPLODE_INFOTRON	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 8)
+#define GFX_SP_BUG_ACTIVE	(GFX_START_ROCKSMORE +  6 * MORE_PER_LINE + 8)
+#define GFX_SP_SNIKSNAK_LEFT	(GFX_START_ROCKSMORE +  8 * MORE_PER_LINE + 8)
+#define GFX_SP_SNIKSNAK_RIGHT	(GFX_START_ROCKSMORE +  8 * MORE_PER_LINE +12)
+#define GFX_SP_SNIKSNAK_UP	(GFX_START_ROCKSMORE +  9 * MORE_PER_LINE + 8)
+#define GFX_SP_SNIKSNAK_DOWN	(GFX_START_ROCKSMORE +  9 * MORE_PER_LINE +12)
+
+#define GFX2_SP_ELECTRON	(GFX_START_ROCKSMORE + 10 * MORE_PER_LINE + 8)
+#define GFX2_SP_TERMINAL	(GFX_START_ROCKSMORE + 11 * MORE_PER_LINE + 8)
+#define GFX2_SP_TERMINAL_ACTIVE	(GFX_START_ROCKSMORE + 12 * MORE_PER_LINE + 8)
+
 /* graphics from "RocksFont" */
 #define GFX_CHAR_START		(GFX_START_ROCKSFONT)
 #define GFX_CHAR_ASCII0		(GFX_CHAR_START-32)
@@ -1143,8 +1160,17 @@ extern int		num_bg_loops;
 #define SND_WARNTON		49
 #define SND_WHOOSH		50
 #define SND_ZISCH		51
-
-#define NUM_SOUNDS		52
+#define SND_SP_BASE		52
+#define SND_SP_INFOTRON		53
+#define SND_SP_ZONKDOWN		54
+#define SND_SP_ZONKPUSH		55
+#define SND_SP_BUG		56
+#define SND_SP_BOOM		57
+#define SND_SP_BOOOM		58
+#define SND_SP_EXIT		59
+#define SND_EMPTY		60
+
+#define NUM_SOUNDS		61
 
 /* default input keys */
 #define KEY_UNDEFINDED		XK_VoidSymbol
@@ -1200,10 +1226,10 @@ extern int		num_bg_loops;
 #define TAPES_DIRECTORY		"tapes"
 #define SCORES_DIRECTORY	"scores"
 
-#define VERSION_STRING		"1.2.0"
+#define VERSION_STRING		"1.2.1"
 #define GAMETITLE_STRING	"Rocks'n'Diamonds"
 #define WINDOWTITLE_STRING	GAMETITLE_STRING " " VERSION_STRING
-#define COPYRIGHT_STRING	"Copyright ^1995-98 by Holger Schemel"
+#define COPYRIGHT_STRING	"Copyright ^1995-99 by Holger Schemel"
 
 /* default name for empty highscore entry */
 #define EMPTY_PLAYER_NAME	"no name"
@@ -1264,4 +1290,10 @@ extern int		num_bg_loops;
 #define ANIM_OSCILLATE	1
 #define ANIM_REVERSE	2
 
+/* values for game_emulation */
+#define EMU_NONE		0
+#define EMU_BOULDERDASH		1
+#define EMU_SOKOBAN		2
+#define EMU_SUPAPLEX		3
+
 #endif	/* MAIN_H */