diff options
| author | jacob1 <jfu614@gmail.com> | 2013-09-28 20:58:01 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-09-28 20:58:01 (GMT) |
| commit | 13d89ce9e15c7f4cc93809cfe0367993afa14b85 (patch) | |
| tree | 6dbd3ab8dc42a47b188ed0ce8b0095141dfb366e | |
| parent | c480c9ea19ba5757830d0bb2274ca6b142ef4b4b (diff) | |
| download | powder-13d89ce9e15c7f4cc93809cfe0367993afa14b85.zip powder-13d89ce9e15c7f4cc93809cfe0367993afa14b85.tar.gz | |
Fix tpt.get_numOfParts, add "C" next to temperature in HUD
| -rw-r--r-- | src/cat/LegacyLuaAPI.cpp | 2 | ||||
| -rw-r--r-- | src/gui/game/GameView.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cat/LegacyLuaAPI.cpp b/src/cat/LegacyLuaAPI.cpp index 9c32ad5..58891ef 100644 --- a/src/cat/LegacyLuaAPI.cpp +++ b/src/cat/LegacyLuaAPI.cpp @@ -1757,7 +1757,7 @@ int luatpt_message_box(lua_State* l) } int luatpt_get_numOfParts(lua_State* l) { - lua_pushinteger(l, luacon_sim->parts_lastActiveIndex); + lua_pushinteger(l, luacon_sim->NUM_PARTS); return 1; } int luatpt_start_getPartIndex(lua_State* l) diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp index 6eb5830..12904f1 100644 --- a/src/gui/game/GameView.cpp +++ b/src/gui/game/GameView.cpp @@ -2092,7 +2092,7 @@ void GameView::OnDraw() else sampleInfo << " ()"; } - sampleInfo << ", Temp: " << std::fixed << sample.particle.temp -273.15f; + sampleInfo << ", Temp: " << std::fixed << sample.particle.temp -273.15f << " C"; sampleInfo << ", Life: " << sample.particle.life; sampleInfo << ", Tmp: " << sample.particle.tmp; sampleInfo << ", Pressure: " << std::fixed << sample.AirPressure; @@ -2107,7 +2107,7 @@ void GameView::OnDraw() sampleInfo << c->ElementResolve(sample.particle.type, sample.particle.ctype); else sampleInfo << c->ElementResolve(sample.particle.type, sample.particle.ctype); - sampleInfo << ", Temp: " << std::fixed << sample.particle.temp -273.15f; + sampleInfo << ", Temp: " << std::fixed << sample.particle.temp - 273.15f << " C"; sampleInfo << ", Pressure: " << std::fixed << sample.AirPressure; } if (sample.particle.type == PT_PHOT || sample.particle.type == PT_BIZR || sample.particle.type == PT_BIZRG || sample.particle.type == PT_BIZRS) |