diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-05-08 01:21:23 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-05-08 01:21:34 -0400 |
| commit | f091bbd563dcd477c2c22b9180e776947dc3749b (patch) | |
| tree | 027eb7c93975a646c9bc20fd62a4ac1e0606232a /src | |
| parent | 2dba29ebf20e95068872b758a9c16daeb4c74440 (diff) | |
| download | minetest-f091bbd563dcd477c2c22b9180e776947dc3749b.tar.gz minetest-f091bbd563dcd477c2c22b9180e776947dc3749b.tar.bz2 minetest-f091bbd563dcd477c2c22b9180e776947dc3749b.zip | |
Fix compilation for non-client builds, and fix signed comparison warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/nodedef.h | 1 | ||||
| -rw-r--r-- | 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 <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 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<std::string> names; |