summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-09-01 17:36:43 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-09-01 17:36:43 (GMT)
commit9bc06a2fc4d7d4ce82da7323a567402d7688d3d3 (patch)
tree3aeeec3a14c3b0671699a12fd7f37eabda3f8979
parent9751c962b1d76b890b83682c1b094b4641a2c2d9 (diff)
downloadpowder-9bc06a2fc4d7d4ce82da7323a567402d7688d3d3.zip
powder-9bc06a2fc4d7d4ce82da7323a567402d7688d3d3.tar.gz
"Molten X" for mouseover with lava, fixes #165
-rw-r--r--src/game/GameView.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 943e4af..99ab0f2 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -1944,7 +1944,11 @@ void GameView::OnDraw()
}
else
{
- sampleInfo << c->ElementResolve(sample.particle.type) << ", Pressure: " << std::fixed << sample.AirPressure;
+ if(sample.particle.type == PT_LAVA && sample.particle.ctype > 0 && sample.particle.ctype < PT_NUM)
+ sampleInfo << "Molten " << c->ElementResolve(sample.particle.ctype);
+ else
+ sampleInfo << c->ElementResolve(sample.particle.type);
+ sampleInfo << ", Pressure: " << std::fixed << sample.AirPressure;
sampleInfo << ", Temp: " << std::fixed << sample.particle.temp -273.15f;
}
if(sample.particle.type == PT_PHOT)