From 513ed472916e49d1929a1c180540eb1070a7a3d9 Mon Sep 17 00:00:00 2001 From: Japa Illo Date: Thu, 12 Apr 2012 00:57:11 +0530 Subject: Fixed compatibility. Signed-off-by: Japa Illo --- MapLoading.cpp | 11 +++++------ 1 file 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* allBuildings, vector* allConstructions, - vector< vector >* allLayers) + vector< vector >* allLayers) { if(config.skipMaps) return; @@ -239,9 +239,7 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C vector grass; vector 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 > layers; - if(!Maps::ReadGeology( layers )) + vector< vector > layers; + vector geoidx; + if(!Maps::ReadGeology( &layers, &geoidx )) { LogError("Can't get region geology.\n"); } -- cgit v1.2.1