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 cheat codes not working anymore after changing player name
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index 5ccf3fb3784650147bc1f70aed77af72925dd0bb..4f27d60a614cd0fb0649814fe7538391d6168d3f 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-300,7
+300,18
@@
void InitGfxOtherSettings()
void InitOverlayInfo()
{
void InitOverlayInfo()
{
+ overlay.enabled = FALSE;
overlay.active = FALSE;
overlay.active = FALSE;
+
+#if defined(PLATFORM_ANDROID)
+ if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS))
+ overlay.enabled = TRUE;
+#endif
+}
+
+void SetOverlayEnabled(boolean enabled)
+{
+ overlay.enabled = enabled;
}
void SetOverlayActive(boolean active)
}
void SetOverlayActive(boolean active)
@@
-318,6
+329,11
@@
void SetDrawDeactivationMask(int draw_deactivation_mask)
gfx.draw_deactivation_mask = draw_deactivation_mask;
}
gfx.draw_deactivation_mask = draw_deactivation_mask;
}
+int GetDrawDeactivationMask()
+{
+ return gfx.draw_deactivation_mask;
+}
+
void SetDrawBackgroundMask(int draw_background_mask)
{
gfx.draw_background_mask = draw_background_mask;
void SetDrawBackgroundMask(int draw_background_mask)
{
gfx.draw_background_mask = draw_background_mask;
@@
-1567,9
+1583,9
@@
KeyMod GetKeyModStateFromEvents()
void StartTextInput(int x, int y, int width, int height)
{
#if defined(TARGET_SDL2)
void StartTextInput(int x, int y, int width, int height)
{
#if defined(TARGET_SDL2)
+#if defined(HAS_SCREEN_KEYBOARD)
SDL_StartTextInput();
SDL_StartTextInput();
-#if defined(HAS_SCREEN_KEYBOARD)
if (y + height > SCREEN_KEYBOARD_POS(video.height))
{
video.shifted_up_pos = y + height - SCREEN_KEYBOARD_POS(video.height);
if (y + height > SCREEN_KEYBOARD_POS(video.height))
{
video.shifted_up_pos = y + height - SCREEN_KEYBOARD_POS(video.height);
@@
-1583,9
+1599,9
@@
void StartTextInput(int x, int y, int width, int height)
void StopTextInput()
{
#if defined(TARGET_SDL2)
void StopTextInput()
{
#if defined(TARGET_SDL2)
+#if defined(HAS_SCREEN_KEYBOARD)
SDL_StopTextInput();
SDL_StopTextInput();
-#if defined(HAS_SCREEN_KEYBOARD)
if (video.shifted_up)
{
video.shifted_up_pos = 0;
if (video.shifted_up)
{
video.shifted_up_pos = 0;
@@
-1634,3
+1650,8
@@
boolean CheckJoystickOpened(int nr)
{
return SDLCheckJoystickOpened(nr);
}
{
return SDLCheckJoystickOpened(nr);
}
+
+void ClearJoystickState()
+{
+ SDLClearJoystickState();
+}