Attempt to fix build for MSVC

diff --git a/src/camera.cpp b/src/camera.cpp
index 97571c77dbc5aca30e06e8db6ece1668769f13d5..2a15386d9e150df07a919c5e44b745e57a88d7ed 100644 (file)
--- 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 58a0fb2bd9c3ef377f119dcea5982afbc9cd30b1..31aa9330751b81afbadc343c6daead026725a5e8 100644 (file)
--- 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);
        }
 }