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

Minor CStateManager fixes, CScriptColorModulate imps

Browse Source
This commit is contained in:
Phillip Stephens
2016-08-18 11:34:06 -07:00
parent 9ca7f9c9e4
commit 0ef4dbc7d2
8 changed files with 211 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/CStateManager.cpp
View File

@@ -237,7 +237,7 @@ void CStateManager::UpdateThermalVisor()
}
}
void CStateManager::RenderLast(TUniqueId)
bool CStateManager::RenderLast(TUniqueId)
{
}
@@ -376,6 +376,13 @@ void CStateManager::SendScriptMsg(TUniqueId dest, TUniqueId src, EScriptObjectMe
SendScriptMsg(ent, src, msg);
}
void CStateManager::SendScriptMsgAlways(TUniqueId dest, TUniqueId src, EScriptObjectMessage msg)
{
CEntity* dst = ObjectById(dest);
if (dst)
dst->AcceptScriptMsg(msg, src, *this);
}
void CStateManager::SendScriptMsg(TUniqueId src, TEditorId dest,
EScriptObjectMessage msg, EScriptObjectState state)
{
@@ -562,7 +569,7 @@ void CStateManager::InitializeState(ResId mlvlId, TAreaId aid, ResId mreaId)
CPlayerState::EItemType iType = CPlayerState::EItemType(i);
u32 spawnPu = sp->GetPowerup(iType);
u32 statePu = x8b8_playerState->GetItemCapacity(iType);
u32 statePu = x8b8_playerState->GetItemAmount(iType);
if (statePu < spawnPu)
x8b8_playerState->InitializePowerUp(iType, spawnPu - statePu);