diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-06 13:48:31 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-06 23:35:33 (GMT) |
| commit | 1391de2e3a85ad0cb8c38286e51b0708d3415a43 (patch) | |
| tree | 3d52618f9c4828479a1e40d5b68f946ce4d43868 /src/game/GameView.cpp | |
| parent | 2243c86ef9858b3ea2c0e3e64bf201ec93c9cff7 (diff) | |
| download | powder-1391de2e3a85ad0cb8c38286e51b0708d3415a43.zip powder-1391de2e3a85ad0cb8c38286e51b0708d3415a43.tar.gz | |
Wall names in HUD
Conflicts:
src/game/GameView.cpp
Diffstat (limited to 'src/game/GameView.cpp')
| -rw-r--r-- | src/game/GameView.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index c101543..97a8634 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -1924,18 +1924,18 @@ void GameView::OnDraw() std::stringstream sampleInfo; sampleInfo.precision(2); if(sample.particle.type) - { + { if(showDebug) { sampleInfo << c->ElementResolve(sample.particle.type); if(sample.particle.ctype > 0 && sample.particle.ctype < PT_NUM) sampleInfo << " (" << c->ElementResolve(sample.particle.ctype) << ")"; else - sampleInfo << " ()"; - sampleInfo << ", Pressure: " << std::fixed << sample.AirPressure; + sampleInfo << " ()"; sampleInfo << ", Temp: " << std::fixed << sample.particle.temp -273.15f; sampleInfo << ", Life: " << sample.particle.life; sampleInfo << ", Tmp: " << sample.particle.tmp; + sampleInfo << ", Pressure: " << std::fixed << sample.AirPressure; } else { @@ -1943,12 +1943,17 @@ void GameView::OnDraw() 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; + sampleInfo << ", Pressure: " << std::fixed << sample.AirPressure; } if(sample.particle.type == PT_PHOT) wavelengthGfx = sample.particle.ctype; } + else if (sample.WallType) + { + sampleInfo << c->WallName(sample.WallType); + sampleInfo << ", Pressure: " << std::fixed << sample.AirPressure; + } else { sampleInfo << "Empty, Pressure: " << std::fixed << sample.AirPressure; |