projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040125-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index d05943775b1e7de7aba3bf502239588bbae01ae4..af6b95a259e841b9775811103dd640ad1317be01 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-55,10
+55,10
@@
#define DEFAULT_KEY_DOWN KSYM_Down
#if defined(PLATFORM_MACOSX)
#define DEFAULT_KEY_SNAP KSYM_Control_L
#define DEFAULT_KEY_DOWN KSYM_Down
#if defined(PLATFORM_MACOSX)
#define DEFAULT_KEY_SNAP KSYM_Control_L
-#define DEFAULT_KEY_
BOMB
KSYM_KP_Enter
+#define DEFAULT_KEY_
DROP
KSYM_KP_Enter
#else
#else
-#define DEFAULT_KEY_SNAP KSYM_
Shift
_L
-#define DEFAULT_KEY_
BOMB KSYM_Shift
_R
+#define DEFAULT_KEY_SNAP KSYM_
Control
_L
+#define DEFAULT_KEY_
DROP KSYM_Control
_R
#endif
#define DEFAULT_KEY_OKAY KSYM_Return
#define DEFAULT_KEY_CANCEL KSYM_Escape
#endif
#define DEFAULT_KEY_OKAY KSYM_Return
#define DEFAULT_KEY_CANCEL KSYM_Escape
@@
-521,18
+521,13
@@
struct SetupJoystickInfo
int xleft, xmiddle, xright;
int yupper, ymiddle, ylower;
int xleft, xmiddle, xright;
int yupper, ymiddle, ylower;
- int snap;
- int bomb;
+ int snap, drop;
};
struct SetupKeyboardInfo
{
};
struct SetupKeyboardInfo
{
- Key left;
- Key right;
- Key up;
- Key down;
- Key snap;
- Key bomb;
+ Key left, right, up, down;
+ Key snap, drop;
};
struct SetupInputInfo
};
struct SetupInputInfo
@@
-622,7
+617,7
@@
struct TreeInfo
/* fields for "type == TREE_TYPE_LEVEL_DIR" */
/* fields for "type == TREE_TYPE_LEVEL_DIR" */
- char *
filename;
/* tree info sub-directory basename (may be ".") */
+ char *
subdir;
/* tree info sub-directory basename (may be ".") */
char *fullpath; /* complete path relative to tree base directory */
char *basepath; /* absolute base path of tree base directory */
char *identifier; /* identifier string for configuration files */
char *fullpath; /* complete path relative to tree base directory */
char *basepath; /* absolute base path of tree base directory */
char *identifier; /* identifier string for configuration files */
@@
-638,6
+633,9
@@
struct TreeInfo
char *sounds_path; /* path to optional custom sounds set (level only) */
char *music_path; /* path to optional custom music set (level only) */
char *sounds_path; /* path to optional custom sounds set (level only) */
char *music_path; /* path to optional custom music set (level only) */
+ char *level_filename; /* filename of level file (for packed level file) */
+ char *level_filetype; /* type of levels in level directory or level file */
+
int levels; /* number of levels in level series */
int first_level; /* first level number (to allow start with 0 or 1) */
int last_level; /* last level number (automatically calculated) */
int levels; /* number of levels in level series */
int first_level; /* first level number (to allow start with 0 or 1) */
int last_level; /* last level number (automatically calculated) */