projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030104-2-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 5072584ee6441e9e1cdd6d68513b701072ede24b..d393bfc00fd6c5f057410c14786db7774c6e92fd 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-71,6
+71,7
@@
#define MV_BIT_RIGHT 1
#define MV_BIT_UP 2
#define MV_BIT_DOWN 3
#define MV_BIT_RIGHT 1
#define MV_BIT_UP 2
#define MV_BIT_DOWN 3
+#define NUM_MV_DIRECTIONS 4
#define MV_NO_MOVING 0
#define MV_LEFT (1 << MV_BIT_LEFT)
#define MV_NO_MOVING 0
#define MV_LEFT (1 << MV_BIT_LEFT)
@@
-83,7
+84,7
@@
#define KEY_BUTTON (KEY_BUTTON_1 | KEY_BUTTON_2)
#define KEY_ACTION (KEY_MOTION | KEY_BUTTON)
#define KEY_BUTTON (KEY_BUTTON_1 | KEY_BUTTON_2)
#define KEY_ACTION (KEY_MOTION | KEY_BUTTON)
-#define
LOG_MV_DIR
(x) ((x) == MV_LEFT ? MV_BIT_LEFT : \
+#define
MV_DIR_BIT
(x) ((x) == MV_LEFT ? MV_BIT_LEFT : \
(x) == MV_RIGHT ? MV_BIT_RIGHT : \
(x) == MV_UP ? MV_BIT_UP : MV_BIT_DOWN)
(x) == MV_RIGHT ? MV_BIT_RIGHT : \
(x) == MV_UP ? MV_BIT_UP : MV_BIT_DOWN)
@@
-239,17
+240,19
@@
struct OptionInfo
char *display_name;
char *server_host;
int server_port;
char *display_name;
char *server_host;
int server_port;
+
char *ro_base_directory;
char *rw_base_directory;
char *level_directory;
char *graphics_directory;
char *sounds_directory;
char *music_directory;
char *ro_base_directory;
char *rw_base_directory;
char *level_directory;
char *graphics_directory;
char *sounds_directory;
char *music_directory;
+ char *execute_command;
+
boolean serveronly;
boolean network;
boolean verbose;
boolean debug;
boolean serveronly;
boolean network;
boolean verbose;
boolean debug;
- char *debug_command;
};
struct VideoSystemInfo
};
struct VideoSystemInfo
@@
-329,6
+332,19
@@
struct SetupInputInfo
struct SetupKeyboardInfo key;
};
struct SetupKeyboardInfo key;
};
+struct SetupEditorInfo
+{
+ boolean el_boulderdash;
+ boolean el_emerald_mine;
+ boolean el_more;
+ boolean el_sokoban;
+ boolean el_supaplex;
+ boolean el_diamond_caves;
+ boolean el_dx_boulderdash;
+ boolean el_chars;
+ boolean el_custom;
+};
+
struct SetupShortcutInfo
{
Key save_game;
struct SetupShortcutInfo
{
Key save_game;
@@
-365,6
+381,7
@@
struct SetupInfo
boolean override_level_sounds;
boolean override_level_music;
boolean override_level_sounds;
boolean override_level_music;
+ struct SetupEditorInfo editor;
struct SetupShortcutInfo shortcut;
struct SetupInputInfo input[MAX_PLAYERS];
};
struct SetupShortcutInfo shortcut;
struct SetupInputInfo input[MAX_PLAYERS];
};