diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp index 96e4ba81f..abf973f1e 100644 --- a/src/gui/game/GameView.cpp +++ b/src/gui/game/GameView.cpp @@ -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; diff --git a/src/simulation/elements/CONV.cpp b/src/simulation/elements/CONV.cpp index 19c0c2c37..2795f06eb 100644 --- a/src/simulation/elements/CONV.cpp +++ b/src/simulation/elements/CONV.cpp @@ -81,9 +81,9 @@ static int update(UPDATE_FUNC_ARGS) if (x+rx>=0 && y+ry>=0 && x+rxphotons[y+ry][x+rx]; - if (!r || (restrictElement && TYP(r) != restrictElement)) + if (!r || (restrictElement && ((TYP(r) == restrictElement) == (parts[i].tmp2 == 1)))) r = pmap[y+ry][x+rx]; - if (!r || (restrictElement && TYP(r) != restrictElement)) + if (!r || (restrictElement && ((TYP(r) == restrictElement) == (parts[i].tmp2 == 1)))) continue; if (TYP(r) != PT_CONV && TYP(r) != PT_DMND && TYP(r) != ctype) {