moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-11-07 01:45:08 -05:00
Code Issues Releases Wiki Activity

(Android) Only simulate holding down fast key if fast_move is toggled to true

Browse Source
This commit is contained in:
Craig Robbins 2015-05-29 22:32:13 +10:00
parent 522acf920f
commit addf3ee165
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/game.cpp
View File

@ -1620,6 +1620,11 @@ private:
bool m_cache_enable_fog; bool m_cache_enable_fog;
f32 m_cache_mouse_sensitivity; f32 m_cache_mouse_sensitivity;
f32 m_repeat_right_click_time; f32 m_repeat_right_click_time;
#ifdef __ANDROID__
bool m_cache_hold_aux1;
#endif
}; };
Game::Game() : Game::Game() :
@ -1653,6 +1658,11 @@ Game::Game() :
m_repeat_right_click_time = g_settings->getFloat("repeat_rightclick_time"); m_repeat_right_click_time = g_settings->getFloat("repeat_rightclick_time");
m_cache_mouse_sensitivity = rangelim(m_cache_mouse_sensitivity, 0.001, 100.0); m_cache_mouse_sensitivity = rangelim(m_cache_mouse_sensitivity, 0.001, 100.0);
#ifdef __ANDROID__
m_cache_hold_aux1 = false; // This is initialised properly later
#endif
} }
@ -1759,6 +1769,11 @@ void Game::run()
set_light_table(g_settings->getFloat("display_gamma")); set_light_table(g_settings->getFloat("display_gamma"));
#ifdef __ANDROID__
m_cache_hold_aux1 = g_settings->getBool("fast_move")
&& client->checkPrivilege("fast");
#endif
while (device->run() && !(*kill || g_gamecallback->shutdown_requested)) { while (device->run() && !(*kill || g_gamecallback->shutdown_requested)) {
/* Must be called immediately after a device->run() call because it /* Must be called immediately after a device->run() call because it
@ -2747,8 +2762,14 @@ void Game::toggleFast(float *statustext_time)
*statustext_time = 0; *statustext_time = 0;
statustext = msg[fast_move]; statustext = msg[fast_move];
if (fast_move && !client->checkPrivilege("fast")) bool has_fast_privs = client->checkPrivilege("fast");
if (fast_move && !has_fast_privs)
statustext += L" (note: no 'fast' privilege)"; statustext += L" (note: no 'fast' privilege)";
#ifdef __ANDROID__
m_cache_hold_aux1 = fast_move && has_fast_privs;
#endif
} }
@ -2998,11 +3019,15 @@ void Game::updatePlayerControl(const CameraOrientation &cam)
); );
#ifdef ANDROID #ifdef ANDROID
/* For Android, invert the meaning of holding down the fast button (i.e. /* For Android, simulate holding down AUX1 (fast move) if the user has
* holding down the fast button -- if there is one -- means walk) * the fast_move setting toggled on. If there is an aux1 key defined for
* Android then its meaning is inverted (i.e. holding aux1 means walk and
* not fast)
*/ */
if (m_cache_hold_aux1) {
control.aux1 = control.aux1 ^ true; control.aux1 = control.aux1 ^ true;
keypress_bits ^= ((u32)(1U << 5)); keypress_bits ^= ((u32)(1U << 5));
}
#endif #endif
client->setPlayerControl(control); client->setPlayerControl(control);