diff options
| author | est31 <MTest31@outlook.com> | 2016-12-22 23:16:00 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-12-22 23:16:00 +0100 |
| commit | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (patch) | |
| tree | 1e9ef1be1b3295a8673d6e4f0bdeb4c2d3a6015f /src/touchscreengui.h | |
| parent | 8077612dcb48221281e726a60eb97bf73fde462b (diff) | |
| parent | 231ac33d34dfaaddf292c5f31b1eae43eeefba2d (diff) | |
| download | minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.tar.gz minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.tar.bz2 minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.zip | |
Merge 0.4.15 changes into stable-0.4
0.4.15 release!
Diffstat (limited to 'src/touchscreengui.h')
| -rw-r--r-- | src/touchscreengui.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/touchscreengui.h b/src/touchscreengui.h index d8106a260..53fc6d683 100644 --- a/src/touchscreengui.h +++ b/src/touchscreengui.h @@ -75,7 +75,7 @@ struct button_info { float repeatdelay; irr::EKEY_CODE keycode; std::vector<int> ids; - IGUIButton* guibutton; + IGUIButton* guibutton = NULL; bool immediate_release; }; @@ -147,8 +147,14 @@ public: void init(ISimpleTextureSource* tsrc); - double getYaw() { return m_camera_yaw; } + double getYawChange() { + double res = m_camera_yaw_change; + m_camera_yaw_change = 0; + return res; + } + double getPitch() { return m_camera_pitch; } + line3d<f32> getShootline() { return m_shootline; } void step(float dtime); @@ -170,7 +176,7 @@ private: bool m_visible; // is the gui visible /* value in degree */ - double m_camera_yaw; + double m_camera_yaw_change; double m_camera_pitch; line3d<f32> m_shootline; |