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

Update submodules, minor fixes

Browse Source
This commit is contained in:
Phillip Stephens
2019-08-25 18:29:25 -07:00
parent f96ad00478
commit 2a60b9fbf4
5 changed files with 6 additions and 7 deletions
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) {
x4_areaId = reader.ReadEncoded(32);
x4_areaId = TAreaId(reader.ReadEncoded(32));
x10_desiredAreaAssetId = u32(reader.ReadEncoded(32));
x8_relayTracker = std::make_shared<CRelayTracker>(reader, saveWorld);
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) {
CEntity* ent = ObjectById(src);
//CEntity* ent = GetObjectById(src);
auto search = GetIdListForScript(dest);
if (search.first != x890_scriptIdMap.cend()) {
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 (player->GetFrozenState()) {
g_GameState->SystemOptions().IncrementFrozenBallCount();
CHUDMemoParms info = {0.f, true, true, true};
MP1::CSamusHud::DisplayHudMemo(u"", info);
MP1::CSamusHud::DisplayHudMemo(u"", CHUDMemoParms{0.f, true, true, true});
player->UnFreeze(*this);
} else {
if ((weapon->GetAttribField() & EProjectileAttrib::Bombs) == EProjectileAttrib::Bombs)

2
amuse

Submodule amuse updated: 529efa72b4...ea84a7e35b

2
hecl

Submodule hecl updated: 15c13163e8...e7fa2f2592

2
hecl-gui

Submodule hecl-gui updated: 0ed3cda78b...6963baacbc