projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with reanimating killed player by CE condition
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index d6ede9ffd169ed8808177c144864940f957fe260..9a8d117b85f1f2c7e6f78c3b35d8b582d0e9f311 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-57,6
+57,7
@@
int button_status = MB_NOT_PRESSED;
boolean motion_status = FALSE;
int wheel_steps = DEFAULT_WHEEL_STEPS;
boolean keyrepeat_status = TRUE;
boolean motion_status = FALSE;
int wheel_steps = DEFAULT_WHEEL_STEPS;
boolean keyrepeat_status = TRUE;
+boolean textinput_status = FALSE;
int redraw_mask = REDRAW_NONE;
int redraw_mask = REDRAW_NONE;
@@
-117,7
+118,11
@@
void InitNetworkInfo(boolean enabled, boolean connected, boolean serveronly,
void InitRuntimeInfo()
{
void InitRuntimeInfo()
{
+#if defined(HAS_TOUCH_DEVICE)
+ runtime.uses_touch_device = TRUE;
+#else
runtime.uses_touch_device = FALSE;
runtime.uses_touch_device = FALSE;
+#endif
}
void InitScoresInfo(void)
}
void InitScoresInfo(void)
@@
-320,8
+325,9
@@
void InitGfxOtherSettings(void)
gfx.cursor_mode_override = CURSOR_UNDEFINED;
gfx.cursor_mode_final = gfx.cursor_mode;
gfx.cursor_mode_override = CURSOR_UNDEFINED;
gfx.cursor_mode_final = gfx.cursor_mode;
- gfx.mouse_x = 0;
- gfx.mouse_y = 0;
+ // prevent initially displaying custom mouse cursor in upper left corner
+ gfx.mouse_x = POS_OFFSCREEN;
+ gfx.mouse_y = POS_OFFSCREEN;
}
void InitTileCursorInfo(void)
}
void InitTileCursorInfo(void)
@@
-570,6
+576,7
@@
void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
video.window_scaling_available = WINDOW_SCALING_STATUS;
video.window_scaling_available = WINDOW_SCALING_STATUS;
+ video.frame_counter = 0;
video.frame_delay = 0;
video.frame_delay_value = GAME_FRAME_DELAY;
video.frame_delay = 0;
video.frame_delay_value = GAME_FRAME_DELAY;
@@
-1690,7
+1697,7
@@
KeyMod HandleKeyModState(Key key, int key_status)
{
KeyMod new_modifier = KMOD_None;
{
KeyMod new_modifier = KMOD_None;
- switch(key)
+ switch
(key)
{
case KSYM_Shift_L:
new_modifier = KMOD_Shift_L;
{
case KSYM_Shift_L:
new_modifier = KMOD_Shift_L;
@@
-1747,6
+1754,8
@@
KeyMod GetKeyModStateFromEvents(void)
void StartTextInput(int x, int y, int width, int height)
{
void StartTextInput(int x, int y, int width, int height)
{
+ textinput_status = TRUE;
+
#if defined(HAS_SCREEN_KEYBOARD)
SDL_StartTextInput();
#if defined(HAS_SCREEN_KEYBOARD)
SDL_StartTextInput();
@@
-1761,6
+1770,8
@@
void StartTextInput(int x, int y, int width, int height)
void StopTextInput(void)
{
void StopTextInput(void)
{
+ textinput_status = FALSE;
+
#if defined(HAS_SCREEN_KEYBOARD)
SDL_StopTextInput();
#if defined(HAS_SCREEN_KEYBOARD)
SDL_StopTextInput();