AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CScriptDistanceFog: Brace conditionals where applicable

This commit is contained in:
Lioncash 2020-05-07 13:44:13 -04:00
parent 470d649604
commit 33411ceeca
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Runtime/World/CScriptDistanceFog.cpp
View File

@ -23,10 +23,11 @@ CScriptDistanceFog::CScriptDistanceFog(TUniqueId uid, std::string_view name, con
, x60_explicit(expl) , x60_explicit(expl)
{ {
if (zeus::close_enough(rangeDelta, zeus::skZero2f) && zeus::close_enough(colorDelta, 0.f)) if (zeus::close_enough(rangeDelta, zeus::skZero2f) && zeus::close_enough(colorDelta, 0.f)) {
x61_nonZero = false; x61_nonZero = false;
else } else {
x61_nonZero = true; x61_nonZero = true;
}
} }
void CScriptDistanceFog::Accept(IVisitor& visitor) { visitor.Visit(this); } void CScriptDistanceFog::Accept(IVisitor& visitor) { visitor.Visit(this); }
@ -34,24 +35,29 @@ void CScriptDistanceFog::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CScriptDistanceFog::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) { void CScriptDistanceFog::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) {
CEntity::AcceptScriptMsg(msg, objId, stateMgr); CEntity::AcceptScriptMsg(msg, objId, stateMgr);
if (x4_areaId == kInvalidAreaId || !GetActive()) if (x4_areaId == kInvalidAreaId || !GetActive()) {
return; return;
}
if (msg == EScriptObjectMessage::InitializedInArea) { if (msg == EScriptObjectMessage::InitializedInArea) {
if (!x60_explicit) if (!x60_explicit) {
return; return;
}
CGameArea::CAreaFog* fog = stateMgr.GetWorld()->GetArea(x4_areaId)->GetAreaFog(); CGameArea::CAreaFog* fog = stateMgr.GetWorld()->GetArea(x4_areaId)->GetAreaFog();
if (x34_mode == ERglFogMode::None) if (x34_mode == ERglFogMode::None) {
fog->DisableFog(); fog->DisableFog();
else } else {
fog->SetFogExplicit(x34_mode, x38_color, x3c_range); fog->SetFogExplicit(x34_mode, x38_color, x3c_range);
}
} else if (msg == EScriptObjectMessage::Action) { } else if (msg == EScriptObjectMessage::Action) {
if (x61_nonZero) { if (x61_nonZero) {
CGameArea::CAreaFog* fog = stateMgr.GetWorld()->GetArea(x4_areaId)->GetAreaFog(); CGameArea::CAreaFog* fog = stateMgr.GetWorld()->GetArea(x4_areaId)->GetAreaFog();
if (x34_mode == ERglFogMode::None) if (x34_mode == ERglFogMode::None) {
fog->RollFogOut(x48_rangeDelta.x(), x44_colorDelta, x38_color); fog->RollFogOut(x48_rangeDelta.x(), x44_colorDelta, x38_color);
else } else {
fog->FadeFog(x34_mode, x38_color, x3c_range, x44_colorDelta, x48_rangeDelta); fog->FadeFog(x34_mode, x38_color, x3c_range, x44_colorDelta, x48_rangeDelta);
}
} }
CWorld* world = stateMgr.GetWorld(); CWorld* world = stateMgr.GetWorld();