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

In this commit, I replaced spaces with tabs in CONV.cpp, had help with

Browse Source 
some minor performance optimizations, and added Tmp2 to the hud for
CONV.
This commit is contained in:
Jakav-N 2022-11-21 16:40:48 -07:00
parent 63610f54d1
commit a6d73dec48
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2305,7 +2305,8 @@ void GameView::OnDraw()
// only elements that use .tmp2 show it in the debug HUD
if (type == PT_CRAY || type == PT_DRAY || type == PT_EXOT || type == PT_LIGH || type == PT_SOAP || type == PT_TRON
|| type == PT_VIBR || type == PT_VIRS || type == PT_WARP || type == PT_LCRY || type == PT_CBNW || type == PT_TSNS
|| type == PT_DTEC || type == PT_LSNS || type == PT_PSTN || type == PT_LDTC || type == PT_VSNS || type == PT_LITH)
|| type == PT_DTEC || type == PT_LSNS || type == PT_PSTN || type == PT_LDTC || type == PT_VSNS || type == PT_LITH
|| type == PT_CONV)
sampleInfo << ", Tmp2: " << sample.particle.tmp2;
sampleInfo << ", Pressure: " << sample.AirPressure;

16
src/simulation/elements/CONV.cpp
View File

@ -63,9 +63,9 @@ static int update(UPDATE_FUNC_ARGS)
continue;
int rt = TYP(r);
if (rt != PT_CLNE && rt != PT_PCLN &&
rt != PT_BCLN && rt != PT_STKM &&
rt != PT_PBCN && rt != PT_STKM2 &&
rt != PT_CONV && rt < PT_NUM)
rt != PT_BCLN && rt != PT_STKM &&
rt != PT_PBCN && rt != PT_STKM2 &&
rt != PT_CONV && rt < PT_NUM)
{
parts[i].ctype = rt;
if (rt == PT_LIFE)
@ -81,13 +81,13 @@ static int update(UPDATE_FUNC_ARGS)
if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES)
{
r = sim->photons[y+ry][x+rx];
if (!r || (restrictElement && TYP(r) != restrictElement && parts[i].tmp2 != 1) || (restrictElement && TYP(r) == restrictElement && parts[i].tmp2 == 1))
r = pmap[y+ry][x+rx];
if (!r || (restrictElement && TYP(r) != restrictElement && parts[i].tmp2 != 1) || (restrictElement && TYP(r) == restrictElement && parts[i].tmp2 == 1))
continue;
if (!r || (restrictElement && ((TYP(r) == restrictElement) == (parts[i].tmp2 == 1))))
r = pmap[y+ry][x+rx];
if (!r || (restrictElement && ((TYP(r) == restrictElement) == (parts[i].tmp2 == 1))))
continue;
if (TYP(r) != PT_CONV && TYP(r) != PT_DMND && TYP(r) != ctype)
{
sim->create_part(ID(r), x+rx, y+ry, TYP(parts[i].ctype), ID(parts[i].ctype));
sim->create_part(ID(r), x+rx, y+ry, TYP(parts[i].ctype), ID(parts[i].ctype));
}
}
}