summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJapa Illo2012-04-12 00:57:11 +0530
committerJapa Illo2012-04-12 00:57:11 +0530
commit513ed472916e49d1929a1c180540eb1070a7a3d9 (patch)
tree5fd2634d475bbd48475239cb2b45d0f934cf3274
parenta38817a87b43f7f267ced28489daf095940c986e (diff)
downloadstonesense-513ed472916e49d1929a1c180540eb1070a7a3d9.tar.gz
stonesense-513ed472916e49d1929a1c180540eb1070a7a3d9.tar.bz2
stonesense-513ed472916e49d1929a1c180540eb1070a7a3d9.tar.xz
Fixed compatibility.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
-rw-r--r--MapLoading.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/MapLoading.cpp b/MapLoading.cpp
index 19ab329..1f94eb2 100644
--- a/MapLoading.cpp
+++ b/MapLoading.cpp
@@ -206,7 +206,7 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C
uint16_t Flags/*not in use*/,
vector<Buildings::t_building>* allBuildings,
vector<df::construction>* allConstructions,
- vector< vector <uint16_t> >* allLayers)
+ vector< vector <int16_t> >* allLayers)
{
if(config.skipMaps)
return;
@@ -239,9 +239,7 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C
vector <df::block_square_event_grassst * > grass;
vector <df::block_square_event_world_constructionst * > worldconstructions;
Maps::SortBlockEvents(
- CellX,
- CellY,
- CellZ,
+ trueBlock,
&veins,
&ices,
&splatter,
@@ -744,8 +742,9 @@ WorldSegment* ReadMapSegment(int x, int y, int z, int sizex, int sizey, int size
TranslateGroundMaterialNames();*/
// get region geology
- vector< vector <uint16_t> > layers;
- if(!Maps::ReadGeology( layers ))
+ vector< vector <int16_t> > layers;
+ vector<df::coord2d> geoidx;
+ if(!Maps::ReadGeology( &layers, &geoidx ))
{
LogError("Can't get region geology.\n");
}