Remove view_bobbing bool in settings (#5644)

desttinghim · Zeno- · commit ee9985387f5b · 2017-04-23T17:24:10.000+10:00
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
@@ -492,9 +492,6 @@ cloud_height (Cloud height) int 120
 #    Values larger than 26 will start to produce sharp cutoffs at cloud area corners.
 cloud_radius (Cloud radius) int 12
 
-#    Enables view bobbing when walking.
-view_bobbing (Enable view bobbing) bool true
-
 #    Multiplier for view bobbing.
 #    For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double.
 view_bobbing_amount (View bobbing factor) float 1.0
diff --git a/minetest.conf.example b/minetest.conf.example
@@ -569,10 +569,6 @@
 #    type: int
 # cloud_radius = 12
 
-#    Enables view bobbing when walking.
-#    type: bool
-# view_bobbing = true
-
 #    Multiplier for view bobbing.
 #    For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double.
 #    type: float
@@ -1815,4 +1811,3 @@
 #    Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers.
 #    type: int
 # profiler_print_interval = 0
-
diff --git a/src/camera.cpp b/src/camera.cpp
@@ -102,7 +102,6 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
 	m_cache_view_bobbing_amount = g_settings->getFloat("view_bobbing_amount");
 	m_cache_fov                 = g_settings->getFloat("fov");
 	m_cache_zoom_fov            = g_settings->getFloat("zoom_fov");
-	m_cache_view_bobbing        = g_settings->getBool("view_bobbing");
 	m_nametags.clear();
 }
 
@@ -467,7 +466,6 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
 	const bool swimming = (movement_XZ || player->swimming_vertical) && player->in_liquid;
 	const bool climbing = movement_Y && player->is_climbing;
 	if ((walking || swimming || climbing) &&
-			m_cache_view_bobbing &&
 			(!g_settings->getBool("free_move") || !m_client->checkLocalPrivilege("fly")))
 	{
 		// Start animation
diff --git a/src/camera.h b/src/camera.h
@@ -231,7 +231,6 @@ class Camera
 	f32 m_cache_view_bobbing_amount;
 	f32 m_cache_fov;
 	f32 m_cache_zoom_fov;
-	bool m_cache_view_bobbing;
 
 	std::list<Nametag *> m_nametags;
 };
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
@@ -171,7 +171,6 @@ void set_default_settings(Settings *settings)
 
 	// Effects
 	settings->setDefault("directional_colored_fog", "true");
-	settings->setDefault("view_bobbing", "true");
 	settings->setDefault("inventory_items_animations", "false");
 	settings->setDefault("mip_map", "false");
 	settings->setDefault("anisotropic_filter", "false");

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,`
`102`	`102`	`m_cache_view_bobbing_amount = g_settings->getFloat("view_bobbing_amount");`
`103`	`103`	`m_cache_fov = g_settings->getFloat("fov");`
`104`	`104`	`m_cache_zoom_fov = g_settings->getFloat("zoom_fov");`
`105`		`- m_cache_view_bobbing = g_settings->getBool("view_bobbing");`
`106`	`105`	`m_nametags.clear();`
`107`	`106`	`}`
`108`	`107`
`@@ -467,7 +466,6 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,`
`467`	`466`	`const bool swimming = (movement_XZ \|\| player->swimming_vertical) && player->in_liquid;`
`468`	`467`	`const bool climbing = movement_Y && player->is_climbing;`
`469`	`468`	`if ((walking \|\| swimming \|\| climbing) &&`
`470`		`- m_cache_view_bobbing &&`
`471`	`469`	`(!g_settings->getBool("free_move") \|\| !m_client->checkLocalPrivilege("fly")))`
`472`	`470`	`{`
`473`	`471`	`// Start animation`