X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=f6c62f4bab65df47335734d2ad5b88ac439f0509;hb=0c2b6a7610933f9098ec233f7b4c2b52eac3535c;hp=b5b016345676b67a88183e5e3126ab1ef7f69a58;hpb=67758fda340e825f188fc6a4caad03381bf031dc;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index b5b01634..f6c62f4b 100644 --- a/src/main.h +++ b/src/main.h @@ -65,13 +65,14 @@ typedef unsigned char byte; #define SCR_FIELDY 17 #define MAX_BUF_XSIZE (SCR_FIELDX + 2) #define MAX_BUF_YSIZE (SCR_FIELDY + 2) - -#define MIN_LEV_FIELDX (SCR_FIELDX - 2) -#define MIN_LEV_FIELDY (SCR_FIELDY - 2) +#define MIN_LEV_FIELDX 3 +#define MIN_LEV_FIELDY 3 #define STD_LEV_FIELDX 64 #define STD_LEV_FIELDY 32 #define MAX_LEV_FIELDX 128 #define MAX_LEV_FIELDY 128 +#define ED_FIELDX (2 * SCR_FIELDX - 2) +#define ED_FIELDY (2 * SCR_FIELDY - 2) #define MAX_PLAYERS 4 @@ -101,7 +102,7 @@ typedef unsigned char byte; #define EP_BIT_SCHLUESSEL (1 << 2) #define EP_BIT_PFORTE (1 << 3) #define EP_BIT_SOLID (1 << 4) -#define EP_BIT_MASSIV (1 << 5) +#define EP_BIT_MASSIVE (1 << 5) #define EP_BIT_SLIPPERY (1 << 6) #define EP_BIT_ENEMY (1 << 7) #define EP_BIT_MAUER (1 << 8) @@ -131,7 +132,7 @@ typedef unsigned char byte; #define IS_SCHLUESSEL(e) (Elementeigenschaften[e] & EP_BIT_SCHLUESSEL) #define IS_PFORTE(e) (Elementeigenschaften[e] & EP_BIT_PFORTE) #define IS_SOLID(e) (Elementeigenschaften[e] & EP_BIT_SOLID) -#define IS_MASSIV(e) (Elementeigenschaften[e] & EP_BIT_MASSIV) +#define IS_MASSIVE(e) (Elementeigenschaften[e] & EP_BIT_MASSIVE) #define IS_SLIPPERY(e) (Elementeigenschaften[e] & EP_BIT_SLIPPERY) #define IS_ENEMY(e) (Elementeigenschaften[e] & EP_BIT_ENEMY) #define IS_MAUER(e) (Elementeigenschaften[e] & EP_BIT_MAUER) @@ -174,7 +175,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 +349,8 @@ struct LevelDirInfo char *filename; char *name; int levels; + int first_level; + int last_level; int sort_priority; boolean user_defined; boolean readonly; @@ -433,17 +435,22 @@ extern int lev_fieldx,lev_fieldy, scroll_x,scroll_y; extern int FX,FY, ScrollStepSize; extern int ScreenMovDir, ScreenMovPos, ScreenGfxPos; +extern int BorderElement; extern int GameFrameDelay; extern int FfwdFrameDelay; extern int MoveSpeed; extern int BX1,BY1, BX2,BY2; +extern int SBX_Left, SBX_Right; +extern int SBY_Upper, SBY_Lower; 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,7 +528,7 @@ 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 MICRO_MORE_STARTY 240 #define MORE_PER_LINE 16 #define MINI_MORE_PER_LINE 16 #define MICRO_MORE_PER_LINE 16 @@ -773,6 +780,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 @@ -787,17 +795,17 @@ extern int num_bg_loops; /* game graphics: ** 0 - 255: graphics from "RocksScreen" -** 256 - 511: graphics from "RocksMore" -** 512 - 767: graphics from "RocksFont" +** 256 - 511: graphics from "RocksFont" +** 512 - 767: graphics from "RocksMore" ** 768 - 1023: graphics from "RocksHeroes" */ #define GFX_START_ROCKSSCREEN 0 #define GFX_END_ROCKSSCREEN 255 -#define GFX_START_ROCKSMORE 256 -#define GFX_END_ROCKSMORE 511 -#define GFX_START_ROCKSFONT 512 -#define GFX_END_ROCKSFONT 767 +#define GFX_START_ROCKSFONT 256 +#define GFX_END_ROCKSFONT 511 +#define GFX_START_ROCKSMORE 512 +#define GFX_END_ROCKSMORE 767 #define GFX_START_ROCKSHEROES 768 #define GFX_END_ROCKSHEROES 1023 @@ -1058,8 +1066,10 @@ 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) @@ -1154,8 +1164,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 @@ -1211,10 +1230,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" @@ -1275,4 +1294,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 */