From e1146396bc043782b288226c027bc28857ccf4d2 Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Sun, 7 Apr 2013 20:33:00 +0200
Subject: fix mesh leak in camera class

---
 src/camera.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/camera.h')

diff --git a/src/camera.h b/src/camera.h
index fc43d1176..989dcb718 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -173,6 +173,9 @@ private:
 	// If 0, left-click digging animation
 	// If 1, right-click digging animation
 	s32 m_digging_button;
+
+	//dummymesh for camera
+	irr::scene::IAnimatedMesh* m_dummymesh;
 };
 
 #endif
-- 
cgit v1.2.3


From 7cd5eb4c77de9fda4946de7e1c2384d0c2a0253e Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 7 Apr 2013 15:41:33 -1000
Subject: Swing the camera down when the player lands on the ground, based on
 the velocity the surface is hit with.

---
 src/camera.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/camera.h')

diff --git a/src/camera.h b/src/camera.h
index 989dcb718..0ed5c20d2 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -166,6 +166,8 @@ private:
 	s32 m_view_bobbing_state;
 	// Speed of view bobbing animation
 	f32 m_view_bobbing_speed;
+	// Fall view bobbing
+	f32 m_view_bobbing_fall;
 
 	// Digging animation frame (0 <= m_digging_anim < 1)
 	f32 m_digging_anim;
-- 
cgit v1.2.3