AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-20 18:29:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Segfault fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-11-16 15:24:46 -10:00
parent 79ec379c66
commit cfea90e9d2
8 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/Tweaks/CTweakManager.cpp
View File

@@ -1,8 +1,8 @@
#include "CTweakManager.h"
#include "Core/GameProject/CGameProject.h"
#include "Core/GameProject/CResourceIterator.h"
#include "Core/Tweaks/CTweakLoader.h"
#include "Core/Tweaks/CTweakCooker.h"
#include "Core/Tweaks/CTweakLoader.h"
CTweakManager::CTweakManager(CGameProject* pInProject)
: mpProject(pInProject)
@@ -16,16 +16,18 @@ CTweakManager::~CTweakManager()
void CTweakManager::LoadTweaks()
{
ASSERT( mTweakObjects.empty() );
ASSERT(mTweakObjects.empty());
// MP1 - Load all tweak assets into memory
if (mpProject->Game() <= EGame::Prime)
{
for (TResourceIterator<EResourceType::Tweaks> It(mpProject->ResourceStore()); It; ++It)
{
CTweakData* pTweaks = (CTweakData*) It->Load();
pTweaks->Lock();
mTweakObjects.push_back(pTweaks);
if (CTweakData* pTweaks = (CTweakData*)It->Load())
{
pTweaks->Lock();
mTweakObjects.push_back(pTweaks);
}
}
}
@@ -40,9 +42,7 @@ void CTweakManager::LoadTweaks()
{
// For Wii builds, there is another game-dependent subfolder.
EGame Game = mpProject->Game();
TString GameName = (Game == EGame::Prime ? "MP1" :
Game == EGame::Echoes ? "MP2" :
"MP3");
TString GameName = (Game == EGame::Prime ? "MP1" : Game == EGame::Echoes ? "MP2" : "MP3");
mStandardFilePath = mpProject->DiscFilesystemRoot(false) / GameName / "Standard.ntwk";
// MP3 might actually be FrontEnd