AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-17 08:57:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved EGame to Common

Browse Source
This commit is contained in:
parax0
2016-08-13 01:43:55 -06:00
parent de18044ae0
commit 74574c318e
45 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/GameProject/CGameExporter.cpp
View File

@@ -80,7 +80,7 @@ void CGameExporter::CopyDiscData()
continue;
// Hack to determine game
if (Game() == eUnknownVersion)
if (Game() == eUnknownGame)
{
TWideString Name = FullPath.GetFileName(false);
if (Name == L"MetroidCWP") SetGame(ePrimeDemo);
@@ -107,7 +107,7 @@ void CGameExporter::CopyDiscData()
#endif
}
ASSERT(Game() != eUnknownVersion);
ASSERT(Game() != eUnknownGame);
mpProject->SetGame(Game());
mpProject->SetProjectName(CMasterTemplate::FindGameName(Game()));
}

8
src/Core/GameProject/CGameProject.h
View File

@@ -3,9 +3,9 @@
#include "CPackage.h"
#include "CResourceStore.h"
#include "Core/Resource/EGame.h"
#include <Common/FileUtil.h>
#include <Common/CAssetID.h>
#include <Common/EGame.h>
#include <Common/FileUtil.h>
#include <Common/TString.h>
#include <Common/types.h>
@@ -29,12 +29,12 @@ class CGameProject
public:
CGameProject()
: mGame(eUnknownVersion)
: mGame(eUnknownGame)
, mProjectName("Unnamed Project")
{}
CGameProject(const TWideString& rkProjRootDir)
: mGame(eUnknownVersion)
: mGame(eUnknownGame)
, mProjectName("Unnamed Project")
, mProjectRoot(rkProjRootDir)
, mResourceDBPath(L"ResourceDB.rdb")

2
src/Core/GameProject/CResourceEntry.cpp
View File

@@ -25,7 +25,7 @@ CResourceEntry::CResourceEntry(CResourceStore *pStore, const CAssetID& rkID,
mpDirectory = mpStore->GetVirtualDirectory(rkDir, Transient, true);
if (mpDirectory) mpDirectory->AddChild(L"", this);
mGame = ((Transient || !mpStore->ActiveProject()) ? eUnknownVersion : mpStore->ActiveProject()->Game());
mGame = ((Transient || !mpStore->ActiveProject()) ? eUnknownGame : mpStore->ActiveProject()->Game());
}
CResourceEntry::~CResourceEntry()