projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added headless mode (no window) for automated tape tests using 'autotest'
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 009cbf81bc9dda05036e1ffaae98499be7ed3809..dd007f7f283450c8c433afbe3e2dc8f3df3f8bca 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-85,6
+85,7
@@
/* values for touch control */
#define TOUCH_CONTROL_VIRTUAL_BUTTONS "virtual_buttons"
#define TOUCH_CONTROL_WIPE_GESTURES "wipe_gestures"
/* values for touch control */
#define TOUCH_CONTROL_VIRTUAL_BUTTONS "virtual_buttons"
#define TOUCH_CONTROL_WIPE_GESTURES "wipe_gestures"
+#define TOUCH_CONTROL_FOLLOW_FINGER "follow_finger"
#define TOUCH_CONTROL_DEFAULT TOUCH_CONTROL_VIRTUAL_BUTTONS
#define TOUCH_CONTROL_DEFAULT TOUCH_CONTROL_VIRTUAL_BUTTONS
@@
-92,9
+93,12
@@
#define TOUCH_DROP_DISTANCE_DEFAULT 5
#define TOUCH_DROP_DISTANCE_DEFAULT 5
-/* values for s
creen keyboard on
mobile devices */
+/* values for s
pecial settings for
mobile devices */
#if defined(PLATFORM_ANDROID)
#if defined(PLATFORM_ANDROID)
+#define USE_TOUCH_INPUT_OVERLAY
+#define USE_COMPLETE_DISPLAY
#define HAS_SCREEN_KEYBOARD
#define HAS_SCREEN_KEYBOARD
+#define SCREEN_KEYBOARD_POS(h) ((h) / 2)
#endif
#endif
@@
-504,6
+508,7
@@
#define SOUNDSINFO_FILENAME "soundsinfo.conf"
#define MUSICINFO_FILENAME "musicinfo.conf"
#define ARTWORKINFO_CACHE_FILE "artworkinfo.cache"
#define SOUNDSINFO_FILENAME "soundsinfo.conf"
#define MUSICINFO_FILENAME "musicinfo.conf"
#define ARTWORKINFO_CACHE_FILE "artworkinfo.cache"
+#define LEVELTEMPLATE_FILENAME "template.level"
#define LEVELFILE_EXTENSION "level"
#define TAPEFILE_EXTENSION "tape"
#define SCOREFILE_EXTENSION "score"
#define LEVELFILE_EXTENSION "level"
#define TAPEFILE_EXTENSION "tape"
#define SCOREFILE_EXTENSION "score"
@@
-721,14
+726,6
@@
}
}
-/* type definitions */
-#if defined(TARGET_SDL2)
-typedef int (*EventFilter)(void *, Event *);
-#else
-typedef int (*EventFilter)(const Event *);
-#endif
-
-
/* structure definitions */
struct ProgramInfo
/* structure definitions */
struct ProgramInfo
@@
-764,6
+761,11
@@
struct ProgramInfo
char *(*window_title_function)(void);
void (*exit_message_function)(char *, va_list);
void (*exit_function)(int);
char *(*window_title_function)(void);
void (*exit_message_function)(char *, va_list);
void (*exit_function)(int);
+
+ boolean global_scores;
+ boolean many_scores_per_name;
+
+ boolean headless;
};
struct OptionInfo
};
struct OptionInfo
@@
-783,6
+785,7
@@
struct OptionInfo
char *special_flags;
char *special_flags;
+ boolean mytapes;
boolean serveronly;
boolean network;
boolean verbose;
boolean serveronly;
boolean network;
boolean verbose;
@@
-794,6
+797,9
@@
struct VideoSystemInfo
int default_depth;
int width, height, depth;
int window_width, window_height;
int default_depth;
int width, height, depth;
int window_width, window_height;
+ int display_width, display_height;
+ int screen_width, screen_height;
+ int screen_xoffset, screen_yoffset;
boolean fullscreen_available;
boolean fullscreen_enabled;
boolean fullscreen_available;
boolean fullscreen_enabled;
@@
-808,6
+814,10
@@
struct VideoSystemInfo
unsigned int frame_delay_value;
boolean shifted_up;
unsigned int frame_delay_value;
boolean shifted_up;
+ int shifted_up_pos;
+ int shifted_up_pos_last;
+ unsigned int shifted_up_delay;
+ unsigned int shifted_up_delay_value;
boolean initialized;
};
boolean initialized;
};
@@
-909,6
+919,11
@@
struct GfxInfo
int cursor_mode;
};
int cursor_mode;
};
+struct OverlayInfo
+{
+ boolean active;
+};
+
struct JoystickInfo
{
int status;
struct JoystickInfo
{
int status;
@@
-956,6
+971,8
@@
struct SetupEditorInfo
boolean el_dx_boulderdash;
boolean el_chars;
boolean el_steel_chars;
boolean el_dx_boulderdash;
boolean el_chars;
boolean el_steel_chars;
+
+ boolean el_classic;
boolean el_custom;
boolean el_user_defined;
boolean el_dynamic;
boolean el_custom;
boolean el_user_defined;
boolean el_dynamic;
@@
-1372,6
+1389,7
@@
extern struct OptionInfo options;
extern struct VideoSystemInfo video;
extern struct AudioSystemInfo audio;
extern struct GfxInfo gfx;
extern struct VideoSystemInfo video;
extern struct AudioSystemInfo audio;
extern struct GfxInfo gfx;
+extern struct OverlayInfo overlay;
extern struct AnimInfo anim;
extern struct ArtworkInfo artwork;
extern struct JoystickInfo joystick;
extern struct AnimInfo anim;
extern struct ArtworkInfo artwork;
extern struct JoystickInfo joystick;
@@
-1405,6
+1423,7
@@
extern int FrameCounter;
void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
int);
void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
int);
+void InitScoresInfo();
void SetWindowTitle();
void InitWindowTitleFunction(char *(*window_title_function)(void));
void SetWindowTitle();
void InitWindowTitleFunction(char *(*window_title_function)(void));
@@
-1426,6
+1445,9
@@
void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int, int));
void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int));
void InitGfxCustomArtworkInfo();
void InitGfxOtherSettings();
void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int));
void InitGfxCustomArtworkInfo();
void InitGfxOtherSettings();
+void InitOverlayInfo();
+void SetOverlayActive(boolean);
+boolean GetOverlayActive();
void SetDrawDeactivationMask(int);
void SetDrawBackgroundMask(int);
void SetWindowBackgroundBitmap(Bitmap *);
void SetDrawDeactivationMask(int);
void SetDrawBackgroundMask(int);
void SetWindowBackgroundBitmap(Bitmap *);
@@
-1488,7
+1510,6
@@
void OpenAudio(void);
void CloseAudio(void);
void SetAudioMode(boolean);
void CloseAudio(void);
void SetAudioMode(boolean);
-void InitEventFilter(EventFilter);
boolean PendingEvent(void);
void NextEvent(Event *event);
void PeekEvent(Event *event);
boolean PendingEvent(void);
void NextEvent(Event *event);
void PeekEvent(Event *event);
@@
-1496,7
+1517,7
@@
Key GetEventKey(KeyEvent *, boolean);
KeyMod HandleKeyModState(Key, int);
KeyMod GetKeyModState();
KeyMod GetKeyModStateFromEvents();
KeyMod HandleKeyModState(Key, int);
KeyMod GetKeyModState();
KeyMod GetKeyModStateFromEvents();
-void StartTextInput(int, int);
+void StartTextInput(int, int
, int, int
);
void StopTextInput();
boolean CheckCloseWindowEvent(ClientMessageEvent *);
void StopTextInput();
boolean CheckCloseWindowEvent(ClientMessageEvent *);