From 0fdf24d64ab055a97e488eb3775cc7c721156d3c Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Sun, 11 Dec 2016 21:57:43 +0000
Subject: Fix camera jumping on Android when panning past 0/360 mark

---
 src/touchscreengui.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/touchscreengui.h')

diff --git a/src/touchscreengui.h b/src/touchscreengui.h
index d8106a260..b4de1b032 100644
--- a/src/touchscreengui.h
+++ b/src/touchscreengui.h
@@ -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;
-- 
cgit v1.2.3


From 540071002e949dfa7be3999a58be46d75d7631e9 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Sun, 11 Dec 2016 22:17:32 +0000
Subject: Fix segfault on startup error on Android

---
 src/touchscreengui.cpp | 6 ++++--
 src/touchscreengui.h   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/touchscreengui.h')

diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp
index e3c6a39a9..8d210c63a 100644
--- a/src/touchscreengui.cpp
+++ b/src/touchscreengui.cpp
@@ -177,8 +177,10 @@ void AutoHideButtonBar::init(ISimpleTextureSource* tsrc,
 
 AutoHideButtonBar::~AutoHideButtonBar()
 {
-	m_starter.guibutton->setVisible(false);
-	m_starter.guibutton->drop();
+	if (m_starter.guibutton) {
+		m_starter.guibutton->setVisible(false);
+		m_starter.guibutton->drop();
+	}
 }
 
 void AutoHideButtonBar::addButton(touch_gui_button_id button_id,
diff --git a/src/touchscreengui.h b/src/touchscreengui.h
index b4de1b032..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;
 };
 
-- 
cgit v1.2.3