matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tpt.get_numOfParts, add "C" next to temperature in HUD

Browse Source
This commit is contained in:
jacob1 2013-09-28 16:58:01 -04:00
parent c480c9ea19
commit 13d89ce9e1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cat/LegacyLuaAPI.cpp
View File

@ -1757,7 +1757,7 @@ int luatpt_message_box(lua_State* l)
} }
int luatpt_get_numOfParts(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; return 1;
} }
int luatpt_start_getPartIndex(lua_State* l) int luatpt_start_getPartIndex(lua_State* l)

4
src/gui/game/GameView.cpp
View File

@ -2092,7 +2092,7 @@ void GameView::OnDraw()
else else
sampleInfo << " ()"; 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 << ", Life: " << sample.particle.life;
sampleInfo << ", Tmp: " << sample.particle.tmp; sampleInfo << ", Tmp: " << sample.particle.tmp;
sampleInfo << ", Pressure: " << std::fixed << sample.AirPressure; sampleInfo << ", Pressure: " << std::fixed << sample.AirPressure;
@ -2107,7 +2107,7 @@ void GameView::OnDraw()
sampleInfo << c->ElementResolve(sample.particle.type, sample.particle.ctype); sampleInfo << c->ElementResolve(sample.particle.type, sample.particle.ctype);
else else
sampleInfo << c->ElementResolve(sample.particle.type, sample.particle.ctype); 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; 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) if (sample.particle.type == PT_PHOT || sample.particle.type == PT_BIZR || sample.particle.type == PT_BIZRG || sample.particle.type == PT_BIZRS)