Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge https://github.com/angavrilov/stonesense

  • Loading branch information...
commit 37a823541538023b9f3d0d1e8039cf32851de68d 2 parents c884d22 + 07e832b
@peterix peterix authored
Showing with 15 additions and 15 deletions.
  1. +15 −15 MapLoading.cpp
View
30 MapLoading.cpp
@@ -9,7 +9,7 @@
#include "ContentLoader.h"
#include "Occlusion_Test.h"
#include <df/plant.h>
-#include <df/effect.h>
+#include <df/flow_info.h>
#include "df/item_constructed.h"
#include "df/itemimprovement.h"
#include "df/itemimprovement_threadst.h"
@@ -596,9 +596,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)
@@ -616,84 +616,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;
Please sign in to comment.
Something went wrong with that request. Please try again.