X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=316de68ed16bc4f1c84817d79f9472b2c8b1966a;hb=1101077a226b09854650662759bf12caf7c84f8d;hp=f372306fa0a9425a3b220bbffe4256d5e97a5447;hpb=909a0a4d74f274b5c05c16cf595b235aa092fc9a;p=rocksndiamonds.git diff --git a/src/libgame/system.h b/src/libgame/system.h index f372306f..316de68e 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -51,13 +51,19 @@ /* default shortcut keys */ #define DEFAULT_KEY_SAVE_GAME KSYM_F1 #define DEFAULT_KEY_LOAD_GAME KSYM_F2 +#define DEFAULT_KEY_TOGGLE_PAUSE KSYM_space -/* values for move directions */ +/* values for move directions and special "button" keys */ #define MV_NO_MOVING 0 #define MV_LEFT (1 << 0) #define MV_RIGHT (1 << 1) #define MV_UP (1 << 2) #define MV_DOWN (1 << 3) +#define KEY_BUTTON_1 (1 << 4) +#define KEY_BUTTON_2 (1 << 5) +#define KEY_MOTION (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN) +#define KEY_BUTTON (KEY_BUTTON_1 | KEY_BUTTON_2) +#define KEY_ACTION (KEY_MOTION | KEY_BUTTON) /* values for button status */ #define MB_NOT_PRESSED FALSE @@ -224,10 +230,11 @@ struct VideoSystemInfo struct AudioSystemInfo { boolean sound_available; - boolean music_available; boolean loops_available; - boolean mods_available; + boolean music_available; + boolean sound_enabled; + boolean sound_deactivated; /* for temporarily disabling sound */ int soundserver_pipe[2]; int soundserver_pid; @@ -236,7 +243,6 @@ struct AudioSystemInfo int channels; int music_channel; - int music_nr; }; struct GfxInfo @@ -293,6 +299,7 @@ struct SetupShortcutInfo { Key save_game; Key load_game; + Key toggle_pause; }; struct SetupInfo