AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 05:07:43 +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

4
Runtime/World/CPatterned.cpp
View File

@@ -381,7 +381,7 @@ void CPatterned::Touch(CActor& act, CStateManager& mgr) {
}
}
std::experimental::optional<zeus::CAABox> CPatterned::GetTouchBounds() const { return GetBoundingBox(); }
rstl::optional<zeus::CAABox> CPatterned::GetTouchBounds() const { return GetBoundingBox(); }
bool CPatterned::CanRenderUnsorted(const urde::CStateManager& mgr) const {
return x64_modelData->GetAnimationData()->GetParticleDB().AreAnySystemsDrawnWithModel()
@@ -1069,7 +1069,7 @@ void CPatterned::SetupPlayerCollision(bool v) {
void CPatterned::LaunchProjectile(const zeus::CTransform& gunXf, CStateManager& mgr, int maxAllowed,
EProjectileAttrib attrib, bool playerHoming,
const std::experimental::optional<TLockedToken<CGenDescription>>& visorParticle,
const rstl::optional<TLockedToken<CGenDescription>>& visorParticle,
u16 visorSfx, bool sendCollideMsg, const zeus::CVector3f& scale) {
CProjectileInfo* pInfo = GetProjectileInfo();
if (pInfo->Token().IsLoaded()) {