summaryrefslogtreecommitdiff
path: root/MapLoading.cpp
diff options
context:
space:
mode:
authorJapa Illo2012-02-22 00:48:06 +0530
committerJapa Illo2012-02-22 00:48:06 +0530
commitce5ec6c3f87fe5d0fb2bf5c50f097057e58aa039 (patch)
treeca24a2043ba743872b6136ecb39ec933dbc6bace /MapLoading.cpp
parentae9dd5511370d8b12354b613f395a20cf86bc461 (diff)
downloadstonesense-ce5ec6c3f87fe5d0fb2bf5c50f097057e58aa039.tar.gz
stonesense-ce5ec6c3f87fe5d0fb2bf5c50f097057e58aa039.tar.bz2
stonesense-ce5ec6c3f87fe5d0fb2bf5c50f097057e58aa039.tar.xz
Added fire effects. also fixed the cursor so it scales with the rest.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'MapLoading.cpp')
-rw-r--r--MapLoading.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/MapLoading.cpp b/MapLoading.cpp
index b8e7f39..d433737 100644
--- a/MapLoading.cpp
+++ b/MapLoading.cpp
@@ -539,84 +539,84 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C
{
case effect_type::Steam:
{
- b->Eff_Steam.density = eff->density;
+ 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:
{
- b->Eff_Mist.density = eff->density;
+ 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:
{
- b->Eff_MaterialDust.density = eff->density;
+ 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:
{
- b->Eff_MagmaMist.density = eff->density;
+ 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:
{
- b->Eff_Smoke.density = eff->density;
+ 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:
{
- b->Eff_Dragonfire.density = eff->density;
+ 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:
{
- b->Eff_Fire.density = eff->density;
+ 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:
{
- b->Eff_Web.density = eff->density;
+ 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:
{
- b->Eff_MaterialGas.density = eff->density;
+ 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:
{
- b->Eff_MaterialVapor.density = eff->density;
+ 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:
{
- b->Eff_OceanWave.density = eff->density;
+ 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:
{
- b->Eff_SeaFoam.density = eff->density;
+ b->Eff_SeaFoam.density += eff->density;
b->Eff_SeaFoam.matt.index = eff->mat_index;
b->Eff_SeaFoam.matt.type = eff->mat_type;
break;