summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-12-18 00:41:32 (GMT)
committer jacob1 <jfu614@gmail.com>2012-12-18 01:08:46 (GMT)
commit2728cf852b41d6b015582bb4ad95772be58b277b (patch)
tree04786972c7fce7cc66cd8f469bc87a6d37f9df13 /src/simulation
parentf08481a88e083c4cda2465dd74bf442915c395ae (diff)
downloadpowder-2728cf852b41d6b015582bb4ad95772be58b277b.zip
powder-2728cf852b41d6b015582bb4ad95772be58b277b.tar.gz
fix WARP being invisible, make it visible in heat display mode though
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/Simulation.cpp4
-rw-r--r--src/simulation/elements/WARP.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index 21f8109..afb50c5 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -136,6 +136,10 @@ int Simulation::Load(int fullX, int fullY, GameSave * save)
}
}
}
+ if (parts[i].pavg[0] || parts[i].pavg[1])
+ {
+ parts[i].pavg[0] = parts[i].pavg[1] = 0;
+ }
}
parts_lastActiveIndex = NPART-1;
force_stacking_check = 1;
diff --git a/src/simulation/elements/WARP.cpp b/src/simulation/elements/WARP.cpp
index bb8f8e1..5dd19c5 100644
--- a/src/simulation/elements/WARP.cpp
+++ b/src/simulation/elements/WARP.cpp
@@ -43,7 +43,7 @@ Element_WARP::Element_WARP()
HighTemperatureTransition = NT;
Update = &Element_WARP::update;
-
+ Graphics = &Element_WARP::graphics;
}
//#TPT-Directive ElementHeader Element_WARP static int update(UPDATE_FUNC_ARGS)