summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/localplayer.cpp1
-rw-r--r--src/minimap.cpp2
-rw-r--r--src/threading/thread.cpp3
-rw-r--r--src/util/serialize.cpp2
4 files changed, 6 insertions, 2 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index e55464479..fd781f940 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -42,6 +42,7 @@ LocalPlayer::LocalPlayer(IGameDef *gamedef, const char *name):
last_pitch(0),
last_yaw(0),
last_keyPressed(0),
+ camera_impact(0.f),
last_animation(NO_ANIM),
hotbar_image(""),
hotbar_selected_image(""),
diff --git a/src/minimap.cpp b/src/minimap.cpp
index a6eff0680..ded8470c5 100644
--- a/src/minimap.cpp
+++ b/src/minimap.cpp
@@ -216,6 +216,8 @@ Mapper::Mapper(IrrlichtDevice *device, Client *client)
this->m_shdrsrc = client->getShaderSource();
this->m_ndef = client->getNodeDefManager();
+ m_angle = 0.f;
+
// Initialize static settings
m_enable_shaders = g_settings->getBool("enable_shaders");
m_surface_mode_scan_height =
diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp
index 57b551503..8688c4cbf 100644
--- a/src/threading/thread.cpp
+++ b/src/threading/thread.cpp
@@ -264,7 +264,8 @@ DWORD WINAPI Thread::threadProc(LPVOID param)
thr->m_running = false;
g_logger.deregisterThread();
- return NULL;
+ // 0 is returned here to avoid an unnecessary ifdef clause
+ return 0;
}
diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp
index ced5fc7cf..99cb990f1 100644
--- a/src/util/serialize.cpp
+++ b/src/util/serialize.cpp
@@ -229,7 +229,7 @@ std::string deSerializeLongString(std::istream &is)
Buffer<char> buf2(s_size);
is.read(&buf2[0], s_size);
- if (is.gcount() != s_size)
+ if ((u32)is.gcount() != s_size)
throw SerializationError("deSerializeLongString: couldn't read all chars");
s.reserve(s_size);