AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:44:56 +00:00
Code Issues Projects Releases Wiki Activity

Working CScriptGunTurret

Browse Source
This commit is contained in:
Jack Andersen
2019-02-17 19:47:46 -10:00
parent 6441bcc3a2
commit 48eaa2545b
63 changed files with 1340 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/AutoMapper/CAutoMapper.cpp
View File

@@ -124,12 +124,14 @@ bool CAutoMapper::CheckLoadComplete() {
if (!x3c_hintBeacon.IsLoaded())
return false;
x4_loadPhase = ELoadPhase::LoadUniverse;
[[fallthrough]];
case ELoadPhase::LoadUniverse:
if (!x8_mapu.IsLoaded())
return false;
x14_dummyWorlds.resize(x8_mapu->GetNumMapWorldDatas());
SetCurWorldAssetId(x24_world->IGetWorldAssetId());
x4_loadPhase = ELoadPhase::Done;
[[fallthrough]];
case ELoadPhase::Done:
return true;
default:

1
Runtime/AutoMapper/CMappableObject.cpp
View File

@@ -85,6 +85,7 @@ std::pair<zeus::CColor, zeus::CColor> CMappableObject::GetDoorColors(int curArea
case EMappableObjectType::PlasmaDoorFloor:
case EMappableObjectType::PlasmaDoorFloor2:
colorIdx = 4;
break;
default:
break;
}