From 23481711447cd82b1de160e16e1d231d41f18ffe Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 8 May 2015 01:21:23 -0400 Subject: [PATCH] Fix compilation for non-client builds, and fix signed comparison warning --- src/nodedef.h | 1 + src/unittest/test_schematic.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/nodedef.h b/src/nodedef.h index efd7f0923..68f6c8c37 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include +#include "util/numeric.h" #include "mapnode.h" #ifndef SERVER #include "client/tile.h" diff --git a/src/unittest/test_schematic.cpp b/src/unittest/test_schematic.cpp index c9e970459..24bacf6c5 100644 --- a/src/unittest/test_schematic.cpp +++ b/src/unittest/test_schematic.cpp @@ -79,7 +79,7 @@ void TestSchematic::testMtsSerializeDeserialize(INodeDefManager *ndef) schem.slice_probs = new u8[size.Y]; for (size_t i = 0; i != volume; i++) schem.schemdata[i] = MapNode(test_schem_data[i], MTSCHEM_PROB_ALWAYS, 0); - for (size_t y = 0; y != size.Y; y++) + for (s16 y = 0; y != size.Y; y++) schem.slice_probs[y] = MTSCHEM_PROB_ALWAYS; UASSERT(schem.serializeToMts(&ss, names)); @@ -116,7 +116,7 @@ void TestSchematic::testLuaTableSerialize(INodeDefManager *ndef) schem.slice_probs = new u8[size.Y]; for (size_t i = 0; i != volume; i++) schem.schemdata[i] = MapNode(test_schem_data2[i], MTSCHEM_PROB_ALWAYS, 0); - for (size_t y = 0; y != size.Y; y++) + for (s16 y = 0; y != size.Y; y++) schem.slice_probs[y] = MTSCHEM_PROB_ALWAYS; std::vector names;