AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update submodules, minor fixes

This commit is contained in:
Phillip Stephens 2019-08-25 18:29:25 -07:00
parent f96ad00478
commit 2a60b9fbf4
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/CGameState.cpp
View File

@ -74,7 +74,7 @@ CWorldState::CWorldState(CAssetId id) : x0_mlvlId(id), x4_areaId(0) {
} }
CWorldState::CWorldState(CBitStreamReader& reader, CAssetId mlvlId, const CSaveWorld& saveWorld) : x0_mlvlId(mlvlId) { CWorldState::CWorldState(CBitStreamReader& reader, CAssetId mlvlId, const CSaveWorld& saveWorld) : x0_mlvlId(mlvlId) {
x4_areaId = reader.ReadEncoded(32); x4_areaId = TAreaId(reader.ReadEncoded(32));
x10_desiredAreaAssetId = u32(reader.ReadEncoded(32)); x10_desiredAreaAssetId = u32(reader.ReadEncoded(32));
x8_relayTracker = std::make_shared<CRelayTracker>(reader, saveWorld); x8_relayTracker = std::make_shared<CRelayTracker>(reader, saveWorld);
xc_mapWorldInfo = std::make_shared<CMapWorldInfo>(reader, saveWorld, mlvlId); xc_mapWorldInfo = std::make_shared<CMapWorldInfo>(reader, saveWorld, mlvlId);

5
Runtime/CStateManager.cpp
View File

@ -1188,7 +1188,7 @@ void CStateManager::SendScriptMsgAlways(TUniqueId dest, TUniqueId src, EScriptOb
} }
void CStateManager::SendScriptMsg(TUniqueId src, TEditorId dest, EScriptObjectMessage msg, EScriptObjectState state) { void CStateManager::SendScriptMsg(TUniqueId src, TEditorId dest, EScriptObjectMessage msg, EScriptObjectState state) {
CEntity* ent = ObjectById(src); //CEntity* ent = GetObjectById(src);
auto search = GetIdListForScript(dest); auto search = GetIdListForScript(dest);
if (search.first != x890_scriptIdMap.cend()) { if (search.first != x890_scriptIdMap.cend()) {
for (auto it = search.first; it != search.second; ++it) { for (auto it = search.first; it != search.second; ++it) {
@ -1462,8 +1462,7 @@ void CStateManager::ApplyDamageToWorld(TUniqueId damager, const CActor& actor, c
if (bomb && player) { if (bomb && player) {
if (player->GetFrozenState()) { if (player->GetFrozenState()) {
g_GameState->SystemOptions().IncrementFrozenBallCount(); g_GameState->SystemOptions().IncrementFrozenBallCount();
CHUDMemoParms info = {0.f, true, true, true}; MP1::CSamusHud::DisplayHudMemo(u"", CHUDMemoParms{0.f, true, true, true});
MP1::CSamusHud::DisplayHudMemo(u"", info);
player->UnFreeze(*this); player->UnFreeze(*this);
} else { } else {
if ((weapon->GetAttribField() & EProjectileAttrib::Bombs) == EProjectileAttrib::Bombs) if ((weapon->GetAttribField() & EProjectileAttrib::Bombs) == EProjectileAttrib::Bombs)

2
amuse

@ -1 +1 @@
Subproject commit 529efa72b4136abb77c0e35c587a2ff80a76989a Subproject commit ea84a7e35bfca9a14c5f403274e43045f31bc4f1

2
hecl

@ -1 +1 @@
Subproject commit 15c13163e8825d343eecd6a334c2042fbbca4814 Subproject commit e7fa2f25920188ada7ad67c9ec794fe114a1edfb

2
hecl-gui

@ -1 +1 @@
Subproject commit 0ed3cda78bbf70d79b45167dac8a02860132f650 Subproject commit 6963baacbc54f52e9e95564b90adf6eb550983c5