AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 05:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Windows fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-01-28 22:28:35 -10:00
parent 4dd40f519e
commit ad2681f857
178 changed files with 303 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/CScriptActor.cpp
View File

@@ -176,7 +176,7 @@ EWeaponCollisionResponseTypes CScriptActor::GetCollisionResponseType(const zeus:
return CActor::GetCollisionResponseType(v1, v2, wMode, w);
}
std::experimental::optional<zeus::CAABox> CScriptActor::GetTouchBounds() const {
rstl::optional<zeus::CAABox> CScriptActor::GetTouchBounds() const {
if (GetActive() && x68_material.HasMaterial(EMaterialTypes::Solid))
return {CPhysicsActor::GetBoundingBox()};
return {};