X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=316de68ed16bc4f1c84817d79f9472b2c8b1966a;hb=7ff43d7ba40390c41b10888aad0a35dfe3cad82a;hp=71582633110a9483e0b0dc76659682f308253400;hpb=4e3bc17b6150a17a76cba2da2daa96af65bde5b9;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 71582633..316de68e 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -51,6 +51,7 @@
 /* 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 and special "button" keys */
 #define MV_NO_MOVING		0
@@ -58,10 +59,11 @@
 #define MV_RIGHT		(1 << 1)
 #define MV_UP			(1 << 2)
 #define MV_DOWN	       		(1 << 3)
-#define MV_BUTTON_1		(1 << 4)
-#define MV_BUTTON_2		(1 << 5)
-#define MV_MOTION		(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)
-#define MV_BUTTON		(MV_BUTTON_1 | MV_BUTTON_2)
+#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
@@ -228,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];
@@ -242,7 +243,6 @@ struct AudioSystemInfo
 
   int channels;
   int music_channel;
-  int music_nr;
 };
 
 struct GfxInfo
@@ -299,6 +299,7 @@ struct SetupShortcutInfo
 {
   Key save_game;
   Key load_game;
+  Key toggle_pause;
 };
 
 struct SetupInfo