diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2016-03-06 14:31:16 -0500 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-04-28 14:43:18 -0400 |
| commit | b662a4577d692329b9ca83525e6039f2ddcd1ac1 (patch) | |
| tree | d1f59d395f47320149560bef4278dc0e6a194473 /src/client/joystick_controller.cpp | |
| parent | 7f4cdbcbe9b5b4655c2c5eba2043628487668e24 (diff) | |
| download | minetest-b662a4577d692329b9ca83525e6039f2ddcd1ac1.tar.gz minetest-b662a4577d692329b9ca83525e6039f2ddcd1ac1.tar.bz2 minetest-b662a4577d692329b9ca83525e6039f2ddcd1ac1.zip | |
Clean up getTime helpers
This increases size of the getTime return values to 64 bits.
It also removes the TimeGetter classes since the getTime functions
are now very precise.
Diffstat (limited to 'src/client/joystick_controller.cpp')
| -rw-r--r-- | src/client/joystick_controller.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/joystick_controller.cpp b/src/client/joystick_controller.cpp index cb9d64b9f..905ca6420 100644 --- a/src/client/joystick_controller.cpp +++ b/src/client/joystick_controller.cpp @@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "keys.h" #include "settings.h" #include "gettime.h" +#include "porting.h" #include "../util/string.h" bool JoystickButtonCmb::isTriggered(const irr::SEvent::SJoystickEvent &ev) const @@ -199,7 +200,7 @@ bool JoystickController::handleEvent(const irr::SEvent::SJoystickEvent &ev) if (ev.Joystick != m_joystick_id) return false; - m_internal_time = getTimeMs() / 1000.f; + m_internal_time = porting::getTimeMs() / 1000.f; std::bitset<KeyType::INTERNAL_ENUM_COUNT> keys_pressed; |