Fix compilation for non-client builds, and fix signed comparison warning

diff --git a/src/nodedef.h b/src/nodedef.h
index efd7f09230baec063c6f538e749d0084ad9c1356..68f6c8c378f3b4d41dace78abb1a8f96009fa8f3 100644 (file)
--- 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 <iostream>
 #include <map>
 #include <list>
+#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 c9e9704590535eda83abc9392c5b9d88f3416a6a..24bacf6c5a4e36476497226d2d47083bc9c91e85 100644 (file)
--- 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<std::string> names;