projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added command line option to drop file into program window
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 6706f2014241f2b935cbbb5fedb6e74ffbda1d32..51d783b77ffac3508c2755e187d885be7176412e 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-197,6
+197,8
@@
#define DEFAULT_KEY_SNAP_RIGHT KSYM_UNDEFINED
#define DEFAULT_KEY_SNAP_UP KSYM_UNDEFINED
#define DEFAULT_KEY_SNAP_DOWN KSYM_UNDEFINED
#define DEFAULT_KEY_SNAP_RIGHT KSYM_UNDEFINED
#define DEFAULT_KEY_SNAP_UP KSYM_UNDEFINED
#define DEFAULT_KEY_SNAP_DOWN KSYM_UNDEFINED
+#define DEFAULT_KEY_SPEED_FAST KSYM_f
+#define DEFAULT_KEY_SPEED_SLOW KSYM_s
// default debug setup keys and values
#define DEFAULT_FRAME_DELAY_0 20 // 100 % speed
// default debug setup keys and values
#define DEFAULT_FRAME_DELAY_0 20 // 100 % speed
@@
-1061,6
+1063,8
@@
struct OptionInfo
char *identifier;
char *level_nr;
char *identifier;
char *level_nr;
+ char *drop_file;
+
int display_nr;
boolean mytapes;
int display_nr;
boolean mytapes;
@@
-1114,6
+1118,8
@@
struct AudioSystemInfo
char *device_name;
int device_fd;
char *device_name;
int device_fd;
+ int sample_rate;
+
int num_channels;
int music_channel;
int first_sound_channel;
int num_channels;
int music_channel;
int first_sound_channel;
@@
-1335,8
+1341,8
@@
struct SetupLevelSetupInfo
struct SetupEditorCascadeInfo
{
boolean el_bd;
struct SetupEditorCascadeInfo
{
boolean el_bd;
- boolean el_bd
_native
;
- boolean el_bd_effects;
+ boolean el_bd
x
;
+ boolean el_bd
x
_effects;
boolean el_em;
boolean el_emc;
boolean el_rnd;
boolean el_em;
boolean el_emc;
boolean el_rnd;
@@
-1382,6
+1388,9
@@
struct SetupShortcutInfo
Key snap_right;
Key snap_up;
Key snap_down;
Key snap_right;
Key snap_up;
Key snap_down;
+
+ Key speed_fast;
+ Key speed_slow;
};
struct SetupSystemInfo
};
struct SetupSystemInfo
@@
-1439,6
+1448,7
@@
struct SetupInternalInfo
boolean menu_shortcuts_tape;
boolean menu_shortcuts_sound;
boolean menu_shortcuts_snap;
boolean menu_shortcuts_tape;
boolean menu_shortcuts_sound;
boolean menu_shortcuts_snap;
+ boolean menu_shortcuts_speed;
boolean info_title;
boolean info_elements;
boolean info_title;
boolean info_elements;
@@
-1489,6
+1499,7
@@
struct SetupInfo
boolean team_mode;
boolean handicap;
boolean skip_levels;
boolean team_mode;
boolean handicap;
boolean skip_levels;
+ boolean allow_skipping_levels;
boolean increment_levels;
boolean auto_play_next_level;
boolean count_score_after_game;
boolean increment_levels;
boolean auto_play_next_level;
boolean count_score_after_game;
@@
-1516,10
+1527,10
@@
struct SetupInfo
boolean bd_skip_hatching;
boolean bd_scroll_delay;
boolean bd_show_invisible_outbox;
boolean bd_skip_hatching;
boolean bd_scroll_delay;
boolean bd_show_invisible_outbox;
- int bd_smooth_movements; // not boolean -- can also be "AUTO"
- int bd_pushing_graphics; // not boolean -- can also be "AUTO"
- int bd_up_down_graphics; // not boolean -- can also be "AUTO"
- int bd_skip_falling_sounds; // not boolean -- can also be "AUTO"
+ int bd_smooth_movements; // not boolean -- can also be "
MODE_
AUTO"
+ int bd_pushing_graphics; // not boolean -- can also be "
MODE_
AUTO"
+ int bd_up_down_graphics; // not boolean -- can also be "
MODE_
AUTO"
+ int bd_skip_falling_sounds; // not boolean -- can also be "
MODE_
AUTO"
int bd_palette_c64;
int bd_palette_c64dtv;
int bd_palette_atari;
int bd_palette_c64;
int bd_palette_c64dtv;
int bd_palette_atari;
@@
-1534,13
+1545,14
@@
struct SetupInfo
char *graphics_set;
char *sounds_set;
char *music_set;
char *graphics_set;
char *sounds_set;
char *music_set;
- int override_level_graphics; // not boolean -- can also be "AUTO"
- int override_level_sounds; // not boolean -- can also be "AUTO"
- int override_level_music; // not boolean -- can also be "AUTO"
+ int override_level_graphics; // not boolean -- can also be "
MODE_
AUTO"
+ int override_level_sounds; // not boolean -- can also be "
MODE_
AUTO"
+ int override_level_music; // not boolean -- can also be "
MODE_
AUTO"
int volume_simple;
int volume_loops;
int volume_music;
int volume_simple;
int volume_loops;
int volume_music;
+ boolean audio_sample_rate_44100;
boolean network_mode;
int network_player_nr;
boolean network_mode;
int network_player_nr;
@@
-2048,6
+2060,7
@@
KeyMod GetKeyModStateFromEvents(void);
void StartTextInput(int, int, int, int);
void StopTextInput(void);
void PushUserEvent(int, int, int);
void StartTextInput(int, int, int, int);
void StopTextInput(void);
void PushUserEvent(int, int, int);
+void PushDropEvent(char *);
boolean PendingEscapeKeyEvent(void);
void InitJoysticks(void);
boolean PendingEscapeKeyEvent(void);
void InitJoysticks(void);