summaryrefslogtreecommitdiff
path: root/MapLoading.cpp
diff options
context:
space:
mode:
authorJapa2012-08-20 07:59:42 +0530
committerJapa2012-08-20 07:59:42 +0530
commit9410fbcb1759e41481808d495ec442cbda87fac8 (patch)
treeb8ccc4368ad92771d0a5bca83799874a5a72a50b /MapLoading.cpp
parent7fcef5ebab2887ce4a7c5fddec3c18d037cd5994 (diff)
downloadstonesense-9410fbcb1759e41481808d495ec442cbda87fac8.tar.gz
stonesense-9410fbcb1759e41481808d495ec442cbda87fac8.tar.bz2
stonesense-9410fbcb1759e41481808d495ec442cbda87fac8.tar.xz
Tidied up some error messages, fixed some sprites.
Non-errors are now put into verbose logging, because end-users don't need to see that stuff. Also fixed a few other things.
Diffstat (limited to 'MapLoading.cpp')
-rw-r--r--MapLoading.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/MapLoading.cpp b/MapLoading.cpp
index 1f94eb2..569beac 100644
--- a/MapLoading.cpp
+++ b/MapLoading.cpp
@@ -8,8 +8,8 @@
#include "Creatures.h"
#include "ContentLoader.h"
#include "Occlusion_Test.h"
+#include <df/flow_info.h>
#include <df/plant.h>
-#include <df/effect.h>
#include "df/item_constructed.h"
#include "df/itemimprovement.h"
#include "df/itemimprovement_threadst.h"
@@ -538,9 +538,9 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C
}
//add effects
- for(auto iter = trueBlock->effects.begin(); iter != trueBlock->effects.end(); iter++)
+ for(auto iter = trueBlock->flows.begin(); iter != trueBlock->flows.end(); iter++)
{
- df::effect * eff = *iter;
+ df::flow_info * eff = *iter;
assert(eff != NULL);
Block* b = segment.getBlock( eff->x, eff->y, eff->z);
if(!b)
@@ -558,84 +558,84 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C
}
switch(eff->type)
{
- case effect_type::Steam:
+ case flow_type::Steam:
{
b->Eff_Steam.density += eff->density;
b->Eff_Steam.matt.index = eff->mat_index;
b->Eff_Steam.matt.type = eff->mat_type;
break;
}
- case effect_type::Mist:
+ case flow_type::Mist:
{
b->Eff_Mist.density += eff->density;
b->Eff_Mist.matt.index = eff->mat_index;
b->Eff_Mist.matt.type = eff->mat_type;
break;
}
- case effect_type::MaterialDust:
+ case flow_type::MaterialDust:
{
b->Eff_MaterialDust.density += eff->density;
b->Eff_MaterialDust.matt.index = eff->mat_index;
b->Eff_MaterialDust.matt.type = eff->mat_type;
break;
}
- case effect_type::MagmaMist:
+ case flow_type::MagmaMist:
{
b->Eff_MagmaMist.density += eff->density;
b->Eff_MagmaMist.matt.index = eff->mat_index;
b->Eff_MagmaMist.matt.type = eff->mat_type;
break;
}
- case effect_type::Smoke:
+ case flow_type::Smoke:
{
b->Eff_Smoke.density += eff->density;
b->Eff_Smoke.matt.index = eff->mat_index;
b->Eff_Smoke.matt.type = eff->mat_type;
break;
}
- case effect_type::Dragonfire:
+ case flow_type::Dragonfire:
{
b->Eff_Dragonfire.density += eff->density;
b->Eff_Dragonfire.matt.index = eff->mat_index;
b->Eff_Dragonfire.matt.type = eff->mat_type;
break;
}
- case effect_type::Fire:
+ case flow_type::Fire:
{
b->Eff_Fire.density += eff->density;
b->Eff_Fire.matt.index = eff->mat_index;
b->Eff_Fire.matt.type = eff->mat_type;
break;
}
- case effect_type::Web:
+ case flow_type::Web:
{
b->Eff_Web.density += eff->density;
b->Eff_Web.matt.index = eff->mat_index;
b->Eff_Web.matt.type = eff->mat_type;
break;
}
- case effect_type::MaterialGas:
+ case flow_type::MaterialGas:
{
b->Eff_MaterialGas.density += eff->density;
b->Eff_MaterialGas.matt.index = eff->mat_index;
b->Eff_MaterialGas.matt.type = eff->mat_type;
break;
}
- case effect_type::MaterialVapor:
+ case flow_type::MaterialVapor:
{
b->Eff_MaterialVapor.density += eff->density;
b->Eff_MaterialVapor.matt.index = eff->mat_index;
b->Eff_MaterialVapor.matt.type = eff->mat_type;
break;
}
- case effect_type::OceanWave:
+ case flow_type::OceanWave:
{
b->Eff_OceanWave.density += eff->density;
b->Eff_OceanWave.matt.index = eff->mat_index;
b->Eff_OceanWave.matt.type = eff->mat_type;
break;
}
- case effect_type::SeaFoam:
+ case flow_type::SeaFoam:
{
b->Eff_SeaFoam.density += eff->density;
b->Eff_SeaFoam.matt.index = eff->mat_index;