projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020611-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 145bac1dddea768910ff0556548b9b1f6f4065ab..6fe5f12f7d19ea40f63183bbf316ad289b4c0f68 100644
(file)
--- 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
/* 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 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
/* values for button status */
#define MB_NOT_PRESSED FALSE
@@
-109,6
+115,9
@@
/* default name for unknown player names */
#define ANONYMOUS_NAME "anonymous"
/* default name for unknown player names */
#define ANONYMOUS_NAME "anonymous"
+/* default text for non-existant artwork */
+#define NOT_AVAILABLE "(not available)"
+
/* default name for new levels */
#define NAMELESS_LEVEL_NAME "nameless level"
/* default name for new levels */
#define NAMELESS_LEVEL_NAME "nameless level"
@@
-166,6
+175,10
@@
#define VERSION_MINOR(x) (((x) % 10000) / 100)
#define VERSION_PATCH(x) ((x) % 100)
#define VERSION_MINOR(x) (((x) % 10000) / 100)
#define VERSION_PATCH(x) ((x) % 100)
+/* functions for parent/child process identification */
+#define IS_PARENT_PROCESS(pid) ((pid) > 0)
+#define IS_CHILD_PROCESS(pid) ((pid) == 0)
+
/* type definitions */
typedef int (*EventFilter)(const Event *);
/* type definitions */
typedef int (*EventFilter)(const Event *);
@@
-211,6
+224,7
@@
struct OptionInfo
boolean network;
boolean verbose;
boolean debug;
boolean network;
boolean verbose;
boolean debug;
+ char *debug_command;
};
struct VideoSystemInfo
};
struct VideoSystemInfo
@@
-224,19
+238,20
@@
struct VideoSystemInfo
struct AudioSystemInfo
{
boolean sound_available;
struct AudioSystemInfo
{
boolean sound_available;
- boolean music_available;
boolean loops_available;
boolean loops_available;
- boolean mods_available;
+ boolean music_available;
+
boolean sound_enabled;
boolean sound_enabled;
+ boolean sound_deactivated; /* for temporarily disabling sound */
- int
soundserv
er_pipe[2];
- int
soundserv
er_pid;
+ int
mix
er_pipe[2];
+ int
mix
er_pid;
char *device_name;
int device_fd;
char *device_name;
int device_fd;
- int channels;
+ int
num_
channels;
int music_channel;
int music_channel;
- int
music_nr
;
+ int
first_sound_channel
;
};
struct GfxInfo
};
struct GfxInfo
@@
-293,6
+308,7
@@
struct SetupShortcutInfo
{
Key save_game;
Key load_game;
{
Key save_game;
Key load_game;
+ Key toggle_pause;
};
struct SetupInfo
};
struct SetupInfo
@@
-320,6
+336,9
@@
struct SetupInfo
char *graphics_set;
char *sounds_set;
char *music_set;
char *graphics_set;
char *sounds_set;
char *music_set;
+ boolean override_level_graphics;
+ boolean override_level_sounds;
+ boolean override_level_music;
struct SetupShortcutInfo shortcut;
struct SetupInputInfo input[MAX_PLAYERS];
struct SetupShortcutInfo shortcut;
struct SetupInputInfo input[MAX_PLAYERS];
@@
-368,6
+387,7
@@
struct TreeInfo
typedef struct TreeInfo TreeInfo;
typedef struct TreeInfo LevelDirTree;
typedef struct TreeInfo TreeInfo;
typedef struct TreeInfo LevelDirTree;
+typedef struct TreeInfo ArtworkDirTree;
typedef struct TreeInfo GraphicsDirTree;
typedef struct TreeInfo SoundsDirTree;
typedef struct TreeInfo MusicDirTree;
typedef struct TreeInfo GraphicsDirTree;
typedef struct TreeInfo SoundsDirTree;
typedef struct TreeInfo MusicDirTree;
@@
-381,9
+401,9
@@
struct ArtworkInfo
MusicDirTree *mus_first;
MusicDirTree *mus_current;
MusicDirTree *mus_first;
MusicDirTree *mus_current;
- char *graphics_set_current;
- char *sounds_set_current;
- char *music_set_current;
+ char *graphics_set_current
_name
;
+ char *sounds_set_current
_name
;
+ char *music_set_current
_name
;
};
};
@@
-465,7
+485,7
@@
inline boolean ChangeVideoModeIfNeeded(boolean);
Bitmap *LoadImage(char *);
Bitmap *LoadCustomImage(char *);
Bitmap *LoadImage(char *);
Bitmap *LoadCustomImage(char *);
-void ReloadCustomImage(Bitmap *
*
, char *);
+void ReloadCustomImage(Bitmap *, char *);
inline void OpenAudio(void);
inline void CloseAudio(void);
inline void OpenAudio(void);
inline void CloseAudio(void);