miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-08-31 18:47:14 +03:00
committed by pelya
parent 31d0ceb39e
commit 5f478c96e9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/sdl_v.cpp
View File

@@ -576,11 +576,6 @@ int VideoDriver_SDL::PollEvent()
_right_button_clicked = true; _right_button_clicked = true;
_right_button_down_pos.x = ev.motion.x; _right_button_down_pos.x = ev.motion.x;
_right_button_down_pos.y = ev.motion.y; _right_button_down_pos.y = ev.motion.y;
#ifdef __ANDROID__
// Right button click on Android - cancel whatever action we were doing
ResetObjectToPlace();
ToolbarSelectLastTool();
#endif
break; break;
#ifdef __ANDROID__ #ifdef __ANDROID__

5
src/window.cpp
View File

@@ -3244,6 +3244,11 @@ void HandleMouseEvents()
_right_button_clicked = false; _right_button_clicked = false;
click = MC_RIGHT; click = MC_RIGHT;
_input_events_this_tick++; _input_events_this_tick++;
#if defined(__ANDROID__) || 1
// Two-finger touch on Android - cancel whatever action we were doing
ResetObjectToPlace();
ToolbarSelectLastTool();
#endif
} else if(!_left_button_down && !left_button_released) { } else if(!_left_button_down && !left_button_released) {
click = MC_LEFT_UP; click = MC_LEFT_UP;
left_button_released = true; left_button_released = true;