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

Merge branch 'shader-refactor'

Browse Source
This commit is contained in:
Jack Andersen
2019-05-10 13:10:12 -10:00
parent c3527e1688 bf3ac9e34b
commit 486c925a45
76 changed files with 4161 additions and 2117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/CGameArea.cpp
View File

@@ -1081,7 +1081,7 @@ void CGameArea::FillInStaticGeometry(bool textures) {
TToken<CModel> nullModel;
inst.m_instance = std::make_unique<CBooModel>(nullModel, nullptr, &inst.m_surfaces, matSet, vbo, ibo,
inst.x34_aabb, inst.x0_visorFlags, 0, nullptr);
inst.x34_aabb, inst.x0_visorFlags, 0);
}
return true;

2
Runtime/World/CScriptPickup.cpp
View File

@@ -138,7 +138,7 @@ void CScriptPickup::Touch(CActor& act, CStateManager& mgr) {
}
}
mgr.GetPlayerState()->InitializePowerUp(x258_itemType, x260_capacity);
mgr.GetPlayerState()->AddPowerUp(x258_itemType, x260_capacity);
mgr.GetPlayerState()->IncrPickup(x258_itemType, x25c_amount);
mgr.FreeScriptObject(GetUniqueId());
SendScriptMsgs(EScriptObjectState::Arrived, mgr, EScriptObjectMessage::None);

2
Runtime/World/CScriptPlayerStateChange.cpp
View File

@@ -19,7 +19,7 @@ void CScriptPlayerStateChange::Accept(IVisitor& visitor) { visitor.Visit(this);
void CScriptPlayerStateChange::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) {
if (GetActive() && msg == EScriptObjectMessage::SetToZero) {
stateMgr.GetPlayerState()->InitializePowerUp(CPlayerState::EItemType(x34_itemType), x3c_itemCapacity);
stateMgr.GetPlayerState()->AddPowerUp(CPlayerState::EItemType(x34_itemType), x3c_itemCapacity);
stateMgr.GetPlayerState()->IncrPickup(CPlayerState::EItemType(x34_itemType), x38_itemCount);
if (x44_ctrlCmdOpt == EControlCommandOption::Filtered && x40_ctrl == EControl::Filtered) {