X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=46d304bb1aecd57d33b237c7a661a05434cd2662;hb=884db54d739f5838243315f390d28634cb99a7d9;hp=17411f8d0464a4d685bcccfbc557ebdac97a5b9d;hpb=69e8efac8d856859c55237e085ff8b514ae1aa3c;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 17411f8d..46d304bb 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,11 +230,10 @@ struct VideoSystemInfo
 struct AudioSystemInfo
 {
   boolean sound_available;
-  boolean music_available;
   boolean loops_available;
-  boolean mods_available;
-  boolean sound_enabled;
+  boolean music_available;
 
+  boolean sound_enabled;
   boolean sound_deactivated;	/* for temporarily disabling sound */
 
   int soundserver_pipe[2];
@@ -238,7 +243,6 @@ struct AudioSystemInfo
 
   int channels;
   int music_channel;
-  int music_nr;
 };
 
 struct GfxInfo
@@ -295,6 +299,7 @@ struct SetupShortcutInfo
 {
   Key save_game;
   Key load_game;
+  Key toggle_pause;
 };
 
 struct SetupInfo
@@ -472,6 +477,10 @@ void ReloadCustomImage(Bitmap *, char *);
 inline void OpenAudio(void);
 inline void CloseAudio(void);
 inline void SetAudioMode(boolean);
+#if 0
+inline void SetAudioReloadFunctions(void (*func_reload_sounds)(void),
+				    void (*func_reload_music)(void));
+#endif
 
 inline void InitEventFilter(EventFilter);
 inline boolean PendingEvent(void);