AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename ePrimeKioskDemo enumerator to ePrimeDemo

This commit is contained in:
parax0 2015-09-07 13:02:55 -06:00
parent f3ff394361
commit f82b3a20a9
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resource/EFormatVersion.h
View File

@ -4,7 +4,7 @@
// Global version enum that can be easily shared between loaders // Global version enum that can be easily shared between loaders
enum EGame enum EGame
{ {
ePrimeKioskDemo = 0, ePrimeDemo = 0,
ePrime = 1, ePrime = 1,
eEchoesDemo = 2, eEchoesDemo = 2,
eEchoes = 3, eEchoes = 3,

4
Resource/cooker/CMaterialCooker.cpp
View File

@ -336,7 +336,7 @@ void CMaterialCooker::WriteCookedMatSet(CMaterialSet *pSet, EGame Version, COutp
switch (Version) switch (Version)
{ {
case ePrimeKioskDemo: case ePrimeDemo:
case ePrime: case ePrime:
case eEchoesDemo: case eEchoesDemo:
case eEchoes: case eEchoes:
@ -353,7 +353,7 @@ void CMaterialCooker::WriteCookedMaterial(CMaterial *pMat, EGame Version, COutpu
switch (Version) switch (Version)
{ {
case ePrimeKioskDemo: case ePrimeDemo:
case ePrime: case ePrime:
case eEchoesDemo: case eEchoesDemo:
case eEchoes: case eEchoes:

4
Resource/cooker/CModelCooker.cpp
View File

@ -240,7 +240,7 @@ void CModelCooker::WriteCookedModel(CModel *pModel, EGame Version, COutputStream
switch (Version) switch (Version)
{ {
case ePrimeKioskDemo: case ePrimeDemo:
case ePrime: case ePrime:
case eEchoesDemo: case eEchoesDemo:
case eEchoes: case eEchoes:
@ -257,7 +257,7 @@ u32 CModelCooker::GetCMDLVersion(EGame Version)
{ {
switch (Version) switch (Version)
{ {
case ePrimeKioskDemo: case ePrimeDemo:
case ePrime: case ePrime:
return 0x2; return 0x2;
case eEchoesDemo: case eEchoesDemo:

4
Resource/factory/CAreaLoader.cpp
View File

@ -480,7 +480,7 @@ CGameArea* CAreaLoader::LoadMREA(CInputStream& MREA)
switch (Loader.mVersion) switch (Loader.mVersion)
{ {
case ePrimeKioskDemo: case ePrimeDemo:
case ePrime: case ePrime:
Loader.ReadHeaderPrime(); Loader.ReadHeaderPrime();
Loader.ReadGeometryPrime(); Loader.ReadGeometryPrime();
@ -524,7 +524,7 @@ EGame CAreaLoader::GetFormatVersion(u32 version)
{ {
switch (version) switch (version)
{ {
case 0xC: return ePrimeKioskDemo; case 0xC: return ePrimeDemo;
case 0xF: return ePrime; case 0xF: return ePrime;
case 0x15: return eEchoesDemo; case 0x15: return eEchoesDemo;
case 0x19: return eEchoes; case 0x19: return eEchoes;

4
Resource/factory/CFontLoader.cpp
View File

@ -13,7 +13,7 @@ CFont* CFontLoader::LoadFont(CInputStream& FONT)
mpFont->mLineHeight = FONT.ReadLong(); mpFont->mLineHeight = FONT.ReadLong();
mpFont->mVerticalOffset = FONT.ReadLong(); mpFont->mVerticalOffset = FONT.ReadLong();
mpFont->mLineMargin = FONT.ReadLong(); mpFont->mLineMargin = FONT.ReadLong();
if (mVersion > ePrimeKioskDemo) FONT.Seek(0x4, SEEK_CUR); if (mVersion > ePrimeDemo) FONT.Seek(0x4, SEEK_CUR);
FONT.Seek(0x2, SEEK_CUR); FONT.Seek(0x2, SEEK_CUR);
mpFont->mDefaultSize = FONT.ReadLong(); mpFont->mDefaultSize = FONT.ReadLong();
mpFont->mFontName = FONT.ReadString(); mpFont->mFontName = FONT.ReadString();
@ -110,7 +110,7 @@ EGame CFontLoader::GetFormatVersion(u32 Version)
{ {
switch (Version) switch (Version)
{ {
case 1: return ePrimeKioskDemo; case 1: return ePrimeDemo;
case 2: return ePrime; case 2: return ePrime;
case 4: return eEchoes; case 4: return eEchoes;
case 5: return eCorruption; case 5: return eCorruption;

2
Resource/factory/CMaterialLoader.cpp
View File

@ -606,7 +606,7 @@ CMaterialSet* CMaterialLoader::LoadMaterialSet(CInputStream& Mat, EGame Version)
Loader.mpFile = &Mat; Loader.mpFile = &Mat;
Loader.mVersion = Version; Loader.mVersion = Version;
if ((Version >= ePrimeKioskDemo) && (Version <= eEchoes)) if ((Version >= ePrimeDemo) && (Version <= eEchoes))
Loader.ReadPrimeMatSet(); Loader.ReadPrimeMatSet();
else else
Loader.ReadCorruptionMatSet(); Loader.ReadCorruptionMatSet();

6
Resource/factory/CStringLoader.cpp
View File

@ -175,10 +175,10 @@ CStringTable* CStringLoader::LoadSTRG(CInputStream& STRG)
{ {
STRG.Seek(Magic, SEEK_SET); STRG.Seek(Magic, SEEK_SET);
if ((STRG.EoF()) || (STRG.ReadShort() == 0xFFFF)) if ((STRG.EoF()) || (STRG.ReadShort() == 0xFFFF))
Version = ePrimeKioskDemo; Version = ePrimeDemo;
} }
if (Version != ePrimeKioskDemo) if (Version != ePrimeDemo)
{ {
Log::FileError(STRG.GetSourceString(), "Invalid STRG magic: " + StringUtil::ToHexString(Magic)); Log::FileError(STRG.GetSourceString(), "Invalid STRG magic: " + StringUtil::ToHexString(Magic));
return nullptr; return nullptr;
@ -202,7 +202,7 @@ CStringTable* CStringLoader::LoadSTRG(CInputStream& STRG)
Loader.mpStringTable = new CStringTable(); Loader.mpStringTable = new CStringTable();
Loader.mVersion = Version; Loader.mVersion = Version;
if (Version == ePrimeKioskDemo) Loader.LoadPrimeDemoSTRG(STRG); if (Version == ePrimeDemo) Loader.LoadPrimeDemoSTRG(STRG);
else if (Version < eCorruption) Loader.LoadPrimeSTRG(STRG); else if (Version < eCorruption) Loader.LoadPrimeSTRG(STRG);
else Loader.LoadCorruptionSTRG(STRG); else Loader.LoadCorruptionSTRG(STRG);

2
Resource/factory/CWorldLoader.cpp
View File

@ -330,7 +330,7 @@ EGame CWorldLoader::GetFormatVersion(u32 Version)
{ {
switch (Version) switch (Version)
{ {
case 0xD: return ePrimeKioskDemo; case 0xD: return ePrimeDemo;
case 0x11: return ePrime; case 0x11: return ePrime;
case 0x14: return eEchoesDemo; case 0x14: return eEchoesDemo;
case 0x17: return eEchoes; case 0x17: return eEchoes;