X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=6c0ec325a8d19d106f3d0ab51b6de6c0678b7c0d;hb=3d07b68a314ce189f207e42d95f786979662410d;hp=27acc1e1591a774482368562027d7a292482676d;hpb=a35852e106072656e444202e672d050ebff03abb;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 27acc1e1..6c0ec325 100644 --- a/src/main.h +++ b/src/main.h @@ -17,35 +17,18 @@ #include #include #include +#include #include #include #include - -#ifndef MSDOS -#define XK_MISCELLANY -#define XK_LATIN1 - -#include -#include -#include -#include -#include -#include - -#ifdef XPM_INCLUDE_FILE -#define USE_XPM_LIBRARY -#include XPM_INCLUDE_FILE -#endif -#else /* MSDOS */ -#include "msdos.h" -#endif /* MSDOS */ +#include +#include #ifdef DEBUG #define DEBUG_TIMING 0 #endif -typedef unsigned char boolean; -typedef unsigned char byte; +#include "libgame/libgame.h" #ifndef FALSE #define FALSE 0 @@ -54,13 +37,16 @@ typedef unsigned char byte; #define WIN_XSIZE 672 #define WIN_YSIZE 560 -#ifndef MSDOS +#define WIN_SDL_DEPTH 16 /* !!! change this !!! */ + +#if !defined(PLATFORM_MSDOS) #define WIN_XPOS 0 #define WIN_YPOS 0 -#else /* MSDOS */ +#else #define WIN_XPOS ((XRES - WIN_XSIZE) / 2) #define WIN_YPOS ((YRES - WIN_YSIZE) / 2) -#endif /* MSDOS */ +#endif + #define SCR_FIELDX 17 #define SCR_FIELDY 17 #define MAX_BUF_XSIZE (SCR_FIELDX + 2) @@ -74,6 +60,7 @@ typedef unsigned char byte; #define MAX_PLAYERS 4 +#if 0 #ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif @@ -86,6 +73,7 @@ typedef unsigned char byte; #ifndef SIGN #define SIGN(a) ((a) < 0 ? -1 : ((a)>0 ? 1 : 0)) #endif +#endif #define SCREENX(a) ((a) - scroll_x) #define SCREENY(a) ((a) - scroll_y) @@ -132,6 +120,7 @@ typedef unsigned char byte; /* values for 'Elementeigenschaften2' */ #define EP_BIT_BELT (1 << 0) #define EP_BIT_BELT_SWITCH (1 << 1) +#define EP_BIT_TUBE (1 << 2) #define IS_AMOEBALIVE(e) (Elementeigenschaften1[e] & EP_BIT_AMOEBALIVE) #define IS_AMOEBOID(e) (Elementeigenschaften1[e] & EP_BIT_AMOEBOID) @@ -167,6 +156,7 @@ typedef unsigned char byte; #define IS_ACTIVE_BOMB(e) (Elementeigenschaften1[e] & EP_BIT_ACTIVE_BOMB) #define IS_BELT(e) (Elementeigenschaften2[e] & EP_BIT_BELT) #define IS_BELT_SWITCH(e) (Elementeigenschaften2[e] & EP_BIT_BELT_SWITCH) +#define IS_TUBE(e) (Elementeigenschaften2[e] & EP_BIT_TUBE) #define IS_PLAYER(x,y) (ELEM_IS_PLAYER(StorePlayer[x][y])) @@ -178,13 +168,15 @@ typedef unsigned char byte; #define IS_BLOCKED(x,y) (Feld[x][y] == EL_BLOCKED) #define EL_CHANGED(e) ((e) == EL_FELSBROCKEN ? EL_EDELSTEIN : \ + (e) == EL_BD_ROCK ? EL_EDELSTEIN_BD : \ (e) == EL_EDELSTEIN ? EL_DIAMANT : \ (e) == EL_EDELSTEIN_GELB ? EL_DIAMANT : \ (e) == EL_EDELSTEIN_ROT ? EL_DIAMANT : \ (e) == EL_EDELSTEIN_LILA ? EL_DIAMANT : \ EL_FELSBROCKEN) #define EL_CHANGED2(e) ((e) == EL_FELSBROCKEN ? EL_EDELSTEIN_BD : \ - EL_FELSBROCKEN) + (e) == EL_BD_ROCK ? EL_EDELSTEIN_BD : \ + EL_BD_ROCK) #define IS_DRAWABLE(e) ((e) < EL_BLOCKED) #define IS_NOT_DRAWABLE(e) ((e) >= EL_BLOCKED) #define TAPE_IS_EMPTY(x) ((x).length == 0) @@ -192,8 +184,11 @@ typedef unsigned char byte; #define PLAYERINFO(x,y) (&stored_player[StorePlayer[x][y]-EL_SPIELER1]) #define SHIELD_ON(p) ((p)->shield_passive_time_left > 0) +#define PROTECTED_FIELD(x,y) (IS_TUBE(Feld[x][y])) +#define PLAYER_PROTECTED(x,y) (SHIELD_ON(PLAYERINFO(x, y)) || \ + PROTECTED_FIELD(x, y)) -/* Pixmaps with graphic file */ +/* Bitmaps with graphic file */ #define PIX_BACK 0 #define PIX_DOOR 1 #define PIX_HEROES 2 @@ -204,20 +199,18 @@ typedef unsigned char byte; #define PIX_BIGFONT 7 #define PIX_SMALLFONT 8 #define PIX_MEDIUMFONT 9 -/* Pixmaps without graphic file */ -#define PIX_DB_BACK 10 -#define PIX_DB_DOOR 11 -#define PIX_DB_FIELD 12 +/* Bitmaps without graphic file */ +#define PIX_DB_DOOR 10 +#define PIX_DB_FIELD 11 #define NUM_PICTURES 10 -#define NUM_PIXMAPS 13 +#define NUM_BITMAPS 12 /* boundaries of arrays etc. */ #define MAX_PLAYER_NAME_LEN 10 #define MAX_LEVEL_NAME_LEN 32 #define MAX_LEVEL_AUTHOR_LEN 32 #define MAX_TAPELEN (1000 * 50) /* max. time * framerate */ -#define MAX_LEVDIR_ENTRIES 250 /* max. level directories */ #define MAX_SCORE_ENTRIES 100 #define MAX_ELEMENTS 700 /* 500 static + 200 runtime */ #define MAX_NUM_AMOEBA 100 @@ -233,7 +226,9 @@ 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) +#if 0 #define GADGET_FRAME_DELAY 150 /* delay between gadget actions */ +#endif #define MICROLEVEL_SCROLL_DELAY 50 /* delay for scrolling micro level */ #define MICROLEVEL_LABEL_DELAY 250 /* delay for micro level label */ @@ -243,19 +238,6 @@ struct HiScore int Score; }; -struct OptionInfo -{ - char *display_name; - char *server_host; - int server_port; - char *ro_base_directory; - char *rw_base_directory; - char *level_directory; - boolean serveronly; - boolean network; - boolean verbose; -}; - struct SetupJoystickInfo { char *device_name; @@ -267,12 +249,12 @@ struct SetupJoystickInfo struct SetupKeyboardInfo { - KeySym left; - KeySym right; - KeySym up; - KeySym down; - KeySym snap; - KeySym bomb; + Key left; + Key right; + Key up; + Key down; + Key snap; + Key bomb; }; struct SetupInputInfo @@ -301,6 +283,7 @@ struct SetupInfo boolean team_mode; boolean handicap; boolean time_limit; + boolean fullscreen; struct SetupInputInfo input[MAX_PLAYERS]; }; @@ -383,25 +366,6 @@ struct LevelInfo boolean gravity; }; -struct LevelDirInfo -{ - char *filename; /* level series sub-directory inside level directory */ - char *name; /* level series name, as displayed on main screen */ - char *name_short; /* optional short name for level selection screen */ - char *name_sorting; /* optional sorting name for correct level sorting */ - char *author; /* level series author name levels without author */ - char *imported_from; /* optional comment for imported level series */ - int levels; /* number of levels in level series */ - int first_level; /* first level number (to allow start with 0 or 1) */ - int last_level; /* last level number (automatically calculated) */ - int sort_priority; /* sort levels by 'sort_priority' and then by name */ - boolean user_defined; /* user defined levels are stored in home directory */ - boolean readonly; /* readonly levels can not be changed with editor */ - int color; /* color to use on selection screen for this level */ - char *class_desc; /* description of level series class */ - int handicap_level; /* number of the lowest unsolved level */ -}; - struct TapeInfo { int level_nr; @@ -439,45 +403,74 @@ struct GameInfo struct GlobalInfo { + float frames_per_second; + boolean fps_slowdown; + int fps_slowdown_factor; }; -extern Display *display; -extern Visual *visual; -extern int screen; -extern Window window; -extern GC gc, clip_gc[], tile_clip_gc; -extern Pixmap pix[]; -extern Pixmap clipmask[], tile_clipmask[]; +#if 0 +extern DrawWindow window; +extern DrawBuffer backbuffer; +extern GC gc; +#endif + +#if 0 +extern GC clip_gc[]; +#endif +extern GC tile_clip_gc; +extern Bitmap pix[]; +#if 0 +extern Bitmap pix_masked[]; + +extern Bitmap tile_masked[]; -#ifdef USE_XPM_LIBRARY -extern XpmAttributes xpm_att[]; +extern Pixmap clipmask[]; #endif +extern Pixmap tile_clipmask[]; -extern Drawable drawto, drawto_field, backbuffer, fieldbuffer; +#if 0 +extern DrawBuffer drawto; +#endif +extern DrawBuffer drawto_field, fieldbuffer; +#if 0 extern Colormap cmap; +#endif -extern int sound_pipe[2]; -extern int sound_device; +#if 0 extern char *sound_device_name; +#endif + extern int joystick_device; extern char *joystick_device_name[]; +#if 0 extern char *program_name; +#endif extern int game_status; extern boolean level_editor_test_game; extern boolean network_playing; + +#if 0 extern int button_status; extern boolean motion_status; +#endif + extern int key_joystick_mapping; extern int global_joystick_status, joystick_status; -extern int sound_status; -extern boolean sound_loops_allowed; + +#if 0 +extern boolean fullscreen_available; +extern boolean fullscreen_enabled; +#endif extern boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE]; extern int redraw_x1, redraw_y1; + +#if 0 extern int redraw_mask; extern int redraw_tiles; +#endif extern short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; @@ -495,7 +488,7 @@ extern short AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA]; extern unsigned long Elementeigenschaften1[MAX_ELEMENTS]; extern unsigned long Elementeigenschaften2[MAX_ELEMENTS]; -extern int level_nr, leveldir_nr, num_leveldirs; +extern int level_nr; extern int lev_fieldx,lev_fieldy, scroll_x,scroll_y; extern int FX,FY, ScrollStepSize; @@ -508,29 +501,48 @@ 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, TimePlayed, TimeLeft; + +#if 0 +extern int FrameCounter; +#endif + +extern int TimeFrames, TimePlayed, TimeLeft; extern boolean SiebAktiv; extern int SiebCount; extern boolean network_player_action_received; -extern struct LevelDirInfo leveldir[]; +#if 0 +extern struct LevelDirInfo *leveldir_first, *leveldir_current; +#endif extern struct LevelInfo level; extern struct PlayerInfo stored_player[], *local_player; extern struct HiScore highscore[]; extern struct TapeInfo tape; -extern struct SoundInfo Sound[]; +#if 0 +extern struct SampleInfo Sound[]; +#endif extern struct JoystickInfo joystick[]; + +#if 0 extern struct OptionInfo options; +#endif + extern struct SetupInfo setup; extern struct GameInfo game; + +#if 0 +extern struct VideoSystemInfo video; +extern struct AudioSystemInfo audio; +#endif + extern struct GlobalInfo global; extern char *sound_name[]; extern int background_loop[]; extern int num_bg_loops; extern char *element_info[]; - +extern int num_element_info; /* often used screen positions */ #define SX 8 @@ -568,6 +580,8 @@ extern char *element_info[]; #define MICROLEV_XPOS (SX + (SXSIZE - MICROLEV_XSIZE) / 2) #define MICROLEV_YPOS (SX + 12 * TILEY - MICRO_TILEY) #define MICROLABEL_YPOS (MICROLEV_YPOS + MICROLEV_YSIZE + 7) + +#if 0 #define FONT1_XSIZE 32 #define FONT1_YSIZE 32 #define FONT2_XSIZE 14 @@ -580,6 +594,7 @@ extern char *element_info[]; #define FONT5_YSIZE 14 #define FONT6_XSIZE 16 #define FONT6_YSIZE 32 +#endif #define GFX_STARTX SX #define GFX_STARTY SY @@ -617,8 +632,10 @@ extern char *element_info[]; #define MINI_MORE_PER_LINE 16 #define MICRO_MORE_PER_LINE 16 +#if 0 #define FONT_CHARS_PER_LINE 16 #define FONT_LINES_PER_FONT 4 +#endif /* game elements: ** 0 - 499: real elements, stored in level file @@ -645,7 +662,7 @@ extern char *element_info[]; #define EL_MORAST_VOLL 17 #define EL_TROPFEN 18 #define EL_BOMBE 19 -#define EL_SIEB_INAKTIV 20 +#define EL_MAGIC_WALL_OFF 20 #define EL_SPEED_PILL 21 #define EL_SALZSAEURE 22 #define EL_AMOEBE_NASS 23 @@ -686,7 +703,7 @@ extern char *element_info[]; #define EL_ERZ_EDEL_BD 58 #define EL_ERZ_EDEL_GELB 59 #define EL_MAMPFER2 60 -#define EL_SIEB2_INAKTIV 61 +#define EL_MAGIC_WALL_BD_OFF 61 #define EL_INVISIBLE_STEEL 62 #define EL_UNUSED_63 63 @@ -740,14 +757,10 @@ extern char *element_info[]; #define EL_BADEWANNE3 102 #define EL_BADEWANNE4 103 #define EL_BADEWANNE5 104 - -#define EL_UNUSED_105 105 -#define EL_UNUSED_106 106 - +#define EL_BD_WALL 105 +#define EL_BD_ROCK 106 #define EL_AUSGANG_AUF 107 - #define EL_BLACK_ORB 108 - #define EL_AMOEBA2DIAM 109 #define EL_MOLE 110 #define EL_PINGUIN 111 @@ -959,16 +972,30 @@ extern char *element_info[]; #define EL_EMC_WALL_7 342 #define EL_EMC_WALL_8 343 +#define EL_TUBE_CROSS 344 +#define EL_TUBE_VERTICAL 345 +#define EL_TUBE_HORIZONTAL 346 +#define EL_TUBE_VERT_LEFT 347 +#define EL_TUBE_VERT_RIGHT 348 +#define EL_TUBE_HORIZ_UP 349 +#define EL_TUBE_HORIZ_DOWN 350 +#define EL_TUBE_LEFT_UP 351 +#define EL_TUBE_LEFT_DOWN 352 +#define EL_TUBE_RIGHT_UP 353 +#define EL_TUBE_RIGHT_DOWN 354 +#define EL_SPRING 355 +#define EL_TRAP_INACTIVE 356 +#define EL_DX_SUPABOMB 357 /* "real" (and therefore drawable) runtime elements */ #define EL_FIRST_RUNTIME_EL 500 -#define EL_SIEB_LEER 500 -#define EL_SIEB2_LEER 501 -#define EL_SIEB_VOLL 502 -#define EL_SIEB2_VOLL 503 -#define EL_SIEB_TOT 504 -#define EL_SIEB2_TOT 505 +#define EL_MAGIC_WALL_EMPTY 500 +#define EL_MAGIC_WALL_BD_EMPTY 501 +#define EL_MAGIC_WALL_FULL 502 +#define EL_MAGIC_WALL_BD_FULL 503 +#define EL_MAGIC_WALL_DEAD 504 +#define EL_MAGIC_WALL_BD_DEAD 505 #define EL_AUSGANG_ACT 506 #define EL_SP_TERMINAL_ACTIVE 507 #define EL_SP_BUG_ACTIVE 508 @@ -984,6 +1011,10 @@ extern char *element_info[]; #define EL_SWITCHGATE_CLOSING 518 #define EL_TIMEGATE_OPENING 519 #define EL_TIMEGATE_CLOSING 520 +#define EL_PEARL_BREAKING 521 +#define EL_TRAP_ACTIVE 522 +#define EL_SPRING_MOVING 523 +#define EL_SP_MURPHY_CLONE 524 /* "unreal" (and therefore not drawable) runtime elements */ #define EL_BLOCKED 600 @@ -1116,10 +1147,10 @@ extern char *element_info[]; #define GFX_SOKOBAN_FELD_VOLL 123 #define GFX_GEBLUBBER 124 /* Zeile 8 (128) */ -#define GFX_SIEB_INAKTIV 128 -#define GFX_SIEB_LEER GFX_SIEB_INAKTIV -#define GFX_SIEB_VOLL GFX_SIEB_INAKTIV -#define GFX_SIEB_TOT GFX_SIEB_INAKTIV +#define GFX_MAGIC_WALL_OFF 128 +#define GFX_MAGIC_WALL_EMPTY GFX_MAGIC_WALL_OFF +#define GFX_MAGIC_WALL_FULL GFX_MAGIC_WALL_OFF +#define GFX_MAGIC_WALL_DEAD GFX_MAGIC_WALL_OFF #define GFX_ERZ_EDEL 132 #define GFX_ERZ_DIAM 133 #define GFX_ERZ_EDEL_ROT 134 @@ -1154,10 +1185,10 @@ extern char *element_info[]; #define GFX_MAUER_L1 GFX_MAUER_LEFT #define GFX_MAUER_L 170 #define GFX_MAUER_LEBT 171 -#define GFX_SIEB2_INAKTIV 172 -#define GFX_SIEB2_LEER GFX_SIEB2_INAKTIV -#define GFX_SIEB2_VOLL GFX_SIEB2_INAKTIV -#define GFX_SIEB2_TOT GFX_SIEB2_INAKTIV +#define GFX_MAGIC_WALL_BD_OFF 172 +#define GFX_MAGIC_WALL_BD_EMPTY GFX_MAGIC_WALL_BD_OFF +#define GFX_MAGIC_WALL_BD_FULL GFX_MAGIC_WALL_BD_OFF +#define GFX_MAGIC_WALL_BD_DEAD GFX_MAGIC_WALL_BD_OFF /* Zeile 11 (176) */ #define GFX_AUSGANG_ZU 176 #define GFX_AUSGANG_ACT 177 @@ -1348,6 +1379,8 @@ extern char *element_info[]; #define GFX2_SP_TERMINAL (GFX_START_ROCKSSP + 11 * SP_PER_LINE + 8) #define GFX2_SP_TERMINAL_ACTIVE (GFX_START_ROCKSSP + 12 * SP_PER_LINE + 8) +#define GFX_SP_MURPHY_CLONE (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 3) + /* graphics from "RocksDC" */ #define GFX_BELT1_MIDDLE (GFX_START_ROCKSDC + 0 * DC_PER_LINE + 0) #define GFX_BELT1_LEFT (GFX_START_ROCKSDC + 1 * DC_PER_LINE + 0) @@ -1428,6 +1461,29 @@ extern char *element_info[]; #define GFX_ARROW_RED_DOWN (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 3) #define GFX_SCROLLBAR_BLUE (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 0) #define GFX_SCROLLBAR_RED (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 1) +#define GFX_PEARL (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 0) +#define GFX_CRYSTAL (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 1) +#define GFX_WALL_PEARL (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 2) +#define GFX_WALL_CRYSTAL (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 3) +#define GFX_PEARL_BREAKING (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 0) +#define GFX_SPRING (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 0) +#define GFX_TUBE_RIGHT_DOWN (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 1) +#define GFX_TUBE_HORIZ_DOWN (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 2) +#define GFX_TUBE_LEFT_DOWN (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 3) +#define GFX_TUBE_HORIZONTAL (GFX_START_ROCKSMORE + 6 * MORE_PER_LINE + 0) +#define GFX_TUBE_VERT_RIGHT (GFX_START_ROCKSMORE + 6 * MORE_PER_LINE + 1) +#define GFX_TUBE_CROSS (GFX_START_ROCKSMORE + 6 * MORE_PER_LINE + 2) +#define GFX_TUBE_VERT_LEFT (GFX_START_ROCKSMORE + 6 * MORE_PER_LINE + 3) +#define GFX_TUBE_VERTICAL (GFX_START_ROCKSMORE + 7 * MORE_PER_LINE + 0) +#define GFX_TUBE_RIGHT_UP (GFX_START_ROCKSMORE + 7 * MORE_PER_LINE + 1) +#define GFX_TUBE_HORIZ_UP (GFX_START_ROCKSMORE + 7 * MORE_PER_LINE + 2) +#define GFX_TUBE_LEFT_UP (GFX_START_ROCKSMORE + 7 * MORE_PER_LINE + 3) + +#define GFX_TRAP_INACTIVE (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 4) +#define GFX_TRAP_ACTIVE (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 7) +#define GFX_BD_WALL (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 4) +#define GFX_BD_ROCK (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 4) +#define GFX_DX_SUPABOMB (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 7) /* graphics from "RocksFont" */ #define GFX_CHAR_START (GFX_START_ROCKSFONT) @@ -1462,10 +1518,6 @@ extern char *element_info[]; #define GFX_CHAR_END (GFX_CHAR_START + 79) /* new elements which still have no graphic */ -#define GFX_PEARL GFX_CHAR_FRAGE -#define GFX_CRYSTAL GFX_CHAR_FRAGE -#define GFX_WALL_PEARL GFX_CHAR_FRAGE -#define GFX_WALL_CRYSTAL GFX_CHAR_FRAGE #define GFX_DOOR_WHITE GFX_CHAR_FRAGE #define GFX_DOOR_WHITE_GRAY GFX_CHAR_FRAGE #define GFX_KEY_WHITE GFX_CHAR_FRAGE @@ -1550,15 +1602,14 @@ extern char *element_info[]; #define NUM_SOUNDS 62 /* default input keys */ -#define KEY_UNDEFINDED XK_VoidSymbol -#define DEFAULT_KEY_LEFT XK_Left -#define DEFAULT_KEY_RIGHT XK_Right -#define DEFAULT_KEY_UP XK_Up -#define DEFAULT_KEY_DOWN XK_Down -#define DEFAULT_KEY_SNAP XK_Shift_L -#define DEFAULT_KEY_BOMB XK_Shift_R -#define DEFAULT_KEY_OKAY XK_Return -#define DEFAULT_KEY_CANCEL XK_Escape +#define DEFAULT_KEY_LEFT KSYM_Left +#define DEFAULT_KEY_RIGHT KSYM_Right +#define DEFAULT_KEY_UP KSYM_Up +#define DEFAULT_KEY_DOWN KSYM_Down +#define DEFAULT_KEY_SNAP KSYM_Shift_L +#define DEFAULT_KEY_BOMB KSYM_Shift_R +#define DEFAULT_KEY_OKAY KSYM_Return +#define DEFAULT_KEY_CANCEL KSYM_Escape /* directions for moving */ #define MV_NO_MOVING 0 @@ -1567,6 +1618,7 @@ extern char *element_info[]; #define MV_UP (1 << 2) #define MV_DOWN (1 << 3) +#if 0 /* font types */ #define FS_SMALL 0 #define FS_BIG 1 @@ -1579,6 +1631,7 @@ extern char *element_info[]; #define FC_SPECIAL1 4 #define FC_SPECIAL2 5 #define FC_SPECIAL3 6 +#endif /* values for game_status */ #define EXITGAME 0 @@ -1593,6 +1646,7 @@ extern char *element_info[]; #define SETUPINPUT 9 #define CALIBRATION 10 +#if 0 #ifndef RO_GAME_DIR #define RO_GAME_DIR "." #endif @@ -1609,13 +1663,24 @@ extern char *element_info[]; #define LEVELS_DIRECTORY "levels" #define TAPES_DIRECTORY "tapes" #define SCORES_DIRECTORY "scores" +#endif -#define PROGRAM_VERSION_STRING "1.3.5" +#define PROGRAM_VERSION_STRING "1.5.0" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" -#define WINDOW_TITLE_STRING PROGRAM_TITLE_STRING " " PROGRAM_VERSION_STRING -#define COPYRIGHT_STRING "Copyright ^1995-99 by " PROGRAM_AUTHOR_STRING - +#define PROGRAM_RIGHTS_STRING "Copyright ^1995-2000 by" +#define PROGRAM_DOS_PORT_STRING "DOS port done by Guido Schulz" +#define PROGRAM_IDENT_STRING PROGRAM_VERSION_STRING " " TARGET_STRING +#define WINDOW_TITLE_STRING PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING +#define WINDOW_SUBTITLE_STRING PROGRAM_RIGHTS_STRING " " PROGRAM_AUTHOR_STRING +#define ICON_TITLE_STRING PROGRAM_TITLE_STRING +#define UNIX_USERDATA_DIRECTORY ".rocksndiamonds" + +#define X11_ICON_FILENAME "rocks_icon.xbm" +#define X11_ICONMASK_FILENAME "rocks_iconmask.xbm" +#define MSDOS_POINTER_FILENAME "mouse.pcx" + +#if 0 /* default name for empty highscore entry */ #define EMPTY_PLAYER_NAME "no name" @@ -1624,7 +1689,9 @@ extern char *element_info[]; /* default name for new levels */ #define NAMELESS_LEVEL_NAME "nameless level" +#endif +#if 0 /* values for button_status */ #define MB_NOT_PRESSED FALSE #define MB_RELEASED FALSE @@ -1632,10 +1699,12 @@ extern char *element_info[]; #define MB_MENU_CHOICE FALSE #define MB_MENU_MARK TRUE #define MB_MENU_INITIALIZE (-1) -#define MB_LEFT 1 -#define MB_MIDDLE 2 -#define MB_RIGHT 3 +#define MB_LEFTBUTTON 1 +#define MB_MIDDLEBUTTON 2 +#define MB_RIGHTBUTTON 3 +#endif +#if 0 /* values for redraw_mask */ #define REDRAW_ALL (1 << 0) #define REDRAW_FIELD (1 << 1) @@ -1656,9 +1725,12 @@ extern char *element_info[]; #define REDRAW_MAIN (REDRAW_FIELD | \ REDRAW_TILES | \ REDRAW_MICROLEVEL) +#define REDRAW_FPS (1 << 10) #define REDRAWTILES_THRESHOLD (SCR_FIELDX * SCR_FIELDY / 2) +#endif -/* areas in pixmap PIX_DOOR */ +#if 0 +/* areas in bitmap PIX_DOOR */ /* meaning in PIX_DB_DOOR: (3 PAGEs) PAGEX1: 1. buffer for DOOR_1 PAGEX2: 2. buffer for DOOR_1 @@ -1676,6 +1748,7 @@ extern char *element_info[]; #define DOOR_GFX_PAGEX8 (7 * DOOR_GFX_PAGESIZE) #define DOOR_GFX_PAGEY1 0 #define DOOR_GFX_PAGEY2 DYSIZE +#endif /* for DrawGraphicAnimation() [tools.c] and AnimateToon() [cartoons.c] */ #define ANIM_NORMAL 0