X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=f1d500482a641d27f839fc6379de3cebf97db412;hb=1e196be4c0a2f1edf823b3a0e5a14a146317686e;hp=8b20fb7afdc1c9c3a1197e07fd89e148afd05a00;hpb=e6856beb007b3f09036a04290c6b162953ddfece;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 8b20fb7a..f1d50048 100644 --- a/src/main.h +++ b/src/main.h @@ -66,8 +66,13 @@ typedef unsigned char byte; #define MAX_BUF_XSIZE (SCR_FIELDX + 2) #define MAX_BUF_YSIZE (SCR_FIELDY + 2) +#if 0 #define MIN_LEV_FIELDX (SCR_FIELDX - 2) #define MIN_LEV_FIELDY (SCR_FIELDY - 2) +#else +#define MIN_LEV_FIELDX 3 +#define MIN_LEV_FIELDY 3 +#endif #define STD_LEV_FIELDX 64 #define STD_LEV_FIELDY 32 #define MAX_LEV_FIELDX 128 @@ -101,7 +106,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 +136,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 +179,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) @@ -435,17 +439,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_Middle, SBX_Right; +extern int SBY_Upper, SBY_Middle, 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[]; @@ -775,6 +784,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 @@ -1060,8 +1070,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) @@ -1156,8 +1168,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 @@ -1277,4 +1298,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 */