MoNTE48
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
kwolekr 2015-05-08 01:21:23 -04:00
parent 2dba29ebf2
commit f091bbd563
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nodedef.h
View File

@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <iostream> #include <iostream>
#include <map> #include <map>
#include <list> #include <list>
#include "util/numeric.h"
#include "mapnode.h" #include "mapnode.h"
#ifndef SERVER #ifndef SERVER
#include "client/tile.h" #include "client/tile.h"

4
src/unittest/test_schematic.cpp
View File

@ -79,7 +79,7 @@ void TestSchematic::testMtsSerializeDeserialize(INodeDefManager *ndef)
schem.slice_probs = new u8[size.Y]; schem.slice_probs = new u8[size.Y];
for (size_t i = 0; i != volume; i++) for (size_t i = 0; i != volume; i++)
schem.schemdata[i] = MapNode(test_schem_data[i], MTSCHEM_PROB_ALWAYS, 0); 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; schem.slice_probs[y] = MTSCHEM_PROB_ALWAYS;
UASSERT(schem.serializeToMts(&ss, names)); UASSERT(schem.serializeToMts(&ss, names));
@ -116,7 +116,7 @@ void TestSchematic::testLuaTableSerialize(INodeDefManager *ndef)
schem.slice_probs = new u8[size.Y]; schem.slice_probs = new u8[size.Y];
for (size_t i = 0; i != volume; i++) for (size_t i = 0; i != volume; i++)
schem.schemdata[i] = MapNode(test_schem_data2[i], MTSCHEM_PROB_ALWAYS, 0); 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; schem.slice_probs[y] = MTSCHEM_PROB_ALWAYS;
std::vector<std::string> names; std::vector<std::string> names;