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

HUD: Show GLOW and LITH ctype as number, don't show ctype for elements which use it as data storage (such as PHOT or PRTI)

Browse Source
This commit is contained in:
jacob1 2021-07-13 21:48:55 -04:00
parent 9ac8b00b8d
commit c93b72c800
No known key found for this signature in database
GPG Key ID: 4E58A32D510E1995
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2174,14 +2174,16 @@ void GameView::OnDraw()
else else
{ {
sampleInfo << c->ElementResolve(type, ctype); sampleInfo << c->ElementResolve(type, ctype);
if (wavelengthGfx) if (wavelengthGfx || type == PT_EMBR || type == PT_PRTI || type == PT_PRTO)
sampleInfo << " (" << ctype << ")"; {
// Do nothing, ctype is meaningless for these elements
}
// Some elements store extra LIFE info in upper bits of ctype, instead of tmp/tmp2 // Some elements store extra LIFE info in upper bits of ctype, instead of tmp/tmp2
else if (type == PT_CRAY || type == PT_DRAY || type == PT_CONV || type == PT_LDTC) else if (type == PT_CRAY || type == PT_DRAY || type == PT_CONV || type == PT_LDTC)
sampleInfo << " (" << c->ElementResolve(TYP(ctype), ID(ctype)) << ")"; sampleInfo << " (" << c->ElementResolve(TYP(ctype), ID(ctype)) << ")";
else if (type == PT_CLNE || type == PT_BCLN || type == PT_PCLN || type == PT_PBCN || type == PT_DTEC) else if (type == PT_CLNE || type == PT_BCLN || type == PT_PCLN || type == PT_PBCN || type == PT_DTEC)
sampleInfo << " (" << c->ElementResolve(ctype, sample.particle.tmp) << ")"; sampleInfo << " (" << c->ElementResolve(ctype, sample.particle.tmp) << ")";
else if (c->IsValidElement(ctype)) else if (c->IsValidElement(ctype) && type != PT_GLOW && type != PT_WIRE && type != PT_SOAP && type != PT_LITH)
sampleInfo << " (" << c->ElementResolve(ctype, 0) << ")"; sampleInfo << " (" << c->ElementResolve(ctype, 0) << ")";
else if (ctype) else if (ctype)
sampleInfo << " (" << ctype << ")"; sampleInfo << " (" << ctype << ")";