From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 18 Mar 2012 17:08:13 +0000 (+0200)
Subject: Attempt to fix build for MSVC
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=c54a40df0665b72c0d58641ce2e8fceecb8d2e22;p=zefram%2Fminetest%2Fminetest_engine.git

Attempt to fix build for MSVC
---

diff --git a/src/camera.cpp b/src/camera.cpp
index 97571c77..2a15386d 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -279,15 +279,15 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
 		if(m_digging_anim > 0.5)
 			frac = 2.0 * (m_digging_anim - 0.5);
 		// This value starts from 1 and settles to 0
-		f32 ratiothing = pow((1.0 - tool_reload_ratio), 0.5);
-		//f32 ratiothing2 = pow(ratiothing, 0.5);
+		f32 ratiothing = pow((1.0f - tool_reload_ratio), 0.5f);
+		//f32 ratiothing2 = pow(ratiothing, 0.5f);
 		f32 ratiothing2 = (easeCurve(ratiothing*0.5))*2.0;
-		wield_position.Y -= frac * 25.0 * pow(ratiothing2, 1.7);
+		wield_position.Y -= frac * 25.0 * pow(ratiothing2, 1.7f);
 		//wield_position.Z += frac * 5.0 * ratiothing2;
-		wield_position.X -= frac * 35.0 * pow(ratiothing2, 1.1);
-		wield_rotation.Y += frac * 70.0 * pow(ratiothing2, 1.4);
-		//wield_rotation.X -= frac * 15.0 * pow(ratiothing2, 1.4);
-		//wield_rotation.Z += frac * 15.0 * pow(ratiothing2, 1.0);
+		wield_position.X -= frac * 35.0 * pow(ratiothing2, 1.1f);
+		wield_rotation.Y += frac * 70.0 * pow(ratiothing2, 1.4f);
+		//wield_rotation.X -= frac * 15.0 * pow(ratiothing2, 1.4f);
+		//wield_rotation.Z += frac * 15.0 * pow(ratiothing2, 1.0f);
 	}
 	if (m_digging_button != -1)
 	{
diff --git a/src/connection.cpp b/src/connection.cpp
index 58a0fb2b..31aa9330 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -992,9 +992,9 @@ void Connection::serve(u16 port)
 	}
 	catch(SocketException &e){
 		// Create event
-		ConnectionEvent e;
-		e.bindFailed();
-		putEvent(e);
+		ConnectionEvent ce;
+		ce.bindFailed();
+		putEvent(ce);
 	}
 }