diff options
| author | Caldfir | 2012-04-17 20:32:30 -0700 |
|---|---|---|
| committer | Caldfir | 2012-04-17 20:32:30 -0700 |
| commit | e0b93a5e334f61060dc02212c079f2bfdf7a5471 (patch) | |
| tree | 0c6eb497058faef8857846d93a3bbb9fa7a6408b /MapLoading.cpp | |
| parent | 24e538eeec0c966be264f47174b329f086ce51f2 (diff) | |
| parent | 15e3b726c3e68d2985aecd95d2a33bf4550caaa1 (diff) | |
| download | stonesense-e0b93a5e334f61060dc02212c079f2bfdf7a5471.tar.gz stonesense-e0b93a5e334f61060dc02212c079f2bfdf7a5471.tar.bz2 stonesense-e0b93a5e334f61060dc02212c079f2bfdf7a5471.tar.xz | |
Merge https://github.com/peterix/stonesense
Diffstat (limited to 'MapLoading.cpp')
| -rw-r--r-- | MapLoading.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/MapLoading.cpp b/MapLoading.cpp index d1ea9ec..228c05e 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,
@@ -742,8 +740,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");
}
|
