From 5da6896d51ae3ee5140dc1041eff44a616751231 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Fri, 5 Dec 2014 16:09:49 +1000
Subject: [PATCH] Fix MSVC build
Note: The unit test was technically incorrect for all platforms but passes due to implicit casting
---
src/hud.cpp | 2 +-
src/test.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hud.cpp b/src/hud.cpp
index eb2dca573..59e8b8f27 100644
--- a/src/hud.cpp
+++ b/src/hud.cpp
@@ -238,7 +238,7 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
void Hud::drawLuaElements(v3s16 camera_offset) {
- uint32_t text_height = g_fontengine->getTextHeight();
+ u32 text_height = g_fontengine->getTextHeight();
irr::gui::IGUIFont* font = g_fontengine->getFont();
for (size_t i = 0; i != player->maxHudId(); i++) {
HudElement *e = player->getHud(i);
diff --git a/src/test.cpp b/src/test.cpp
index a12c12c63..30252d85b 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -555,7 +555,7 @@ struct TestSettings: public TestBase
UASSERT(fabs(np.spread.Z - 250) < 0.001);
UASSERT(np.seed == 12345);
UASSERT(np.octaves == 5);
- UASSERT(fabs(np.persist == 0.7) < 0.001);
+ UASSERT(fabs(np.persist - 0.7) < 0.001);
np.offset = 3.5;
np.octaves = 6;
--
GitLab