AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 03:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Implement --warp command-line arguments

Browse Source
This commit is contained in:
Jack Andersen
2018-10-17 18:51:59 -10:00
parent 8d839d8a17
commit f433821320
10 changed files with 115 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/MP1/MP1.hpp
View File

@@ -118,6 +118,12 @@ public:
x134_gameState.reset(new CGameState());
g_GameState = x134_gameState.get();
}
void StreamInGameState(CBitStreamReader& stream, u32 saveIdx)
{
x134_gameState.reset(new CGameState(stream, saveIdx));
g_GameState = x134_gameState.get();
}
};
#if MP1_USE_BOO
@@ -281,6 +287,7 @@ public:
void AddWorldPaks();
void ResetGameState();
void StreamNewGameState(CBitStreamReader&, u32 idx);
void RefreshGameState();
void CheckTweakManagerDebugOptions() {}
void SetMFGameBuilt(bool b) { x160_25_mfGameBuilt = b; }
void SetScreenFading(bool b) { x160_26_screenFading = b; }
@@ -336,6 +343,10 @@ public:
void ListWorlds(hecl::Console*, const std::vector<std::string>&);
void WarpTo(hecl::Console*, const std::vector<std::string>&);
hecl::Console* Console() const { return m_console.get(); }
int m_warpWorldIdx = -1;
TAreaId m_warpAreaId = 0;
u64 m_warpLayerBits = 0;
};
}