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

Rename CSavwWorld to CWorldSaveGameInfo

Browse Source
This commit is contained in:
Phillip Stephens
2021-06-04 22:27:52 -07:00
parent 354d3a0199
commit 95f44be694
22 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/CGameOptions.cpp
View File

@@ -5,7 +5,7 @@
#include "Runtime/CGameHintInfo.hpp"
#include "Runtime/CGameState.hpp"
#include "Runtime/CMemoryCardSys.hpp"
#include "Runtime/CSaveWorld.hpp"
#include "Runtime/CWorldSaveGameInfo.hpp"
#include "Runtime/CSimplePool.hpp"
#include "Runtime/CStateManager.hpp"
#include "Runtime/GameGlobalObjects.hpp"
@@ -120,7 +120,7 @@ CPersistentOptions::CPersistentOptions(CBitStreamReader& stream) {
const auto& memWorlds = g_MemoryCardSys->GetMemoryWorlds();
size_t cinematicCount = 0;
for (const auto& world : memWorlds) {
TLockedToken<CSaveWorld> saveWorld =
TLockedToken<CWorldSaveGameInfo> saveWorld =
g_SimplePool->GetObj(SObjectTag{FOURCC('SAVW'), world.second.GetSaveWorldAssetId()});
cinematicCount += saveWorld->GetCinematicCount();
}
@@ -132,7 +132,7 @@ CPersistentOptions::CPersistentOptions(CBitStreamReader& stream) {
}
for (const auto& world : memWorlds) {
TLockedToken<CSaveWorld> saveWorld =
TLockedToken<CWorldSaveGameInfo> saveWorld =
g_SimplePool->GetObj(SObjectTag{FOURCC('SAVW'), world.second.GetSaveWorldAssetId()});
auto stateIt = cinematicStates.cbegin();
@@ -164,7 +164,7 @@ void CPersistentOptions::PutTo(CBitStreamWriter& w) const {
const auto& memWorlds = g_MemoryCardSys->GetMemoryWorlds();
for (const auto& world : memWorlds) {
const TLockedToken<CSaveWorld> saveWorld =
const TLockedToken<CWorldSaveGameInfo> saveWorld =
g_SimplePool->GetObj(SObjectTag{FOURCC('SAVW'), world.second.GetSaveWorldAssetId()});
for (const auto& cineId : saveWorld->GetCinematics()) {