luanti-org · Aug 16, 2017
diff --git a/‎src/ban.h
+1-1 b/‎src/ban.h
+1-1
diff --git a/‎src/camera.cpp
+9-10 b/‎src/camera.cpp
+9-10
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class BanManager
 {
 public:
-	BanManager(const std::string &bannfilepath);
+	BanManager(const std::string &banfilepath);
 	~BanManager();
 	void load();
 	void save();
 
@@ -283,8 +283,7 @@ void Camera::addArmInertia(f32 player_yaw)
 	}
 }
 
-void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
-		f32 tool_reload_ratio, ClientEnvironment &c_env)
+void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, f32 tool_reload_ratio)
 {
 	// Get player position
 	// Smooth the movement when walking up stairs
@@ -408,19 +407,19 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
 
 		// Calculate new position
 		bool abort = false;
-		for (int i = BS; i <= BS*2.75; i++)
-		{
-			my_cp.X = m_camera_position.X + m_camera_direction.X*-i;
-			my_cp.Z = m_camera_position.Z + m_camera_direction.Z*-i;
+		for (int i = BS; i <= BS * 2.75; i++) {
+			my_cp.X = m_camera_position.X + m_camera_direction.X * -i;
+			my_cp.Z = m_camera_position.Z + m_camera_direction.Z * -i;
 			if (i > 12)
-				my_cp.Y = m_camera_position.Y + (m_camera_direction.Y*-i);
+				my_cp.Y = m_camera_position.Y + (m_camera_direction.Y * -i);
 
 			// Prevent camera positioned inside nodes
 			INodeDefManager *nodemgr = m_client->ndef();
-			MapNode n = c_env.getClientMap().getNodeNoEx(floatToInt(my_cp, BS));
+			MapNode n = m_client->getEnv().getClientMap()
+				.getNodeNoEx(floatToInt(my_cp, BS));
+
 			const ContentFeatures& features = nodemgr->get(n);
-			if(features.walkable)
-			{
+			if (features.walkable) {
 				my_cp.X += m_camera_direction.X*-1*-BS/2;
 				my_cp.Z += m_camera_direction.Z*-1*-BS/2;
 				my_cp.Y += m_camera_direction.Y*-1*-BS/2;
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,`
`30`	`30`	`class BanManager`
`31`	`31`	`{`
`32`	`32`	`public:`
`33`		`- BanManager(const std::string &bannfilepath);`
	`33`	`+ BanManager(const std::string &banfilepath);`
`34`	`34`	`~BanManager();`
`35`	`35`	`void load();`
`36`	`36`	`void save();`