Update all the hardcoded filenames inside the level.pak file to be lowercase now the editor no longer forces them to be lower case. (#4802)

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
monroegm-disable-blank-issue-2
rgba16f [Amazon] 4 years ago committed by GitHub
parent 181d12625f
commit c6afb1f0a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -2632,7 +2632,7 @@ void CCryEditApp::OnShowHelpers()
void CCryEditApp::OnEditLevelData() void CCryEditApp::OnEditLevelData()
{ {
auto dir = QFileInfo(GetIEditor()->GetDocument()->GetLevelPathName()).dir(); auto dir = QFileInfo(GetIEditor()->GetDocument()->GetLevelPathName()).dir();
CFileUtil::EditTextFile(dir.absoluteFilePath("LevelData.xml").toUtf8().data()); CFileUtil::EditTextFile(dir.absoluteFilePath("leveldata.xml").toUtf8().data());
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////

@ -31,11 +31,11 @@
#include <AzToolsFramework/Entity/EditorEntityContextBus.h> #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#define MUSIC_LEVEL_LIBRARY_FILE "Music.xml" #define MUSIC_LEVEL_LIBRARY_FILE "music.xml"
#define MATERIAL_LEVEL_LIBRARY_FILE "Materials.xml" #define MATERIAL_LEVEL_LIBRARY_FILE "materials.xml"
#define RESOURCE_LIST_FILE "ResourceList.txt" #define RESOURCE_LIST_FILE "resourcelist.txt"
#define USED_RESOURCE_LIST_FILE "UsedResourceList.txt" #define USED_RESOURCE_LIST_FILE "usedresourcelist.txt"
#define SHADER_LIST_FILE "ShadersList.txt" #define SHADER_LIST_FILE "shaderslist.txt"
#define GetAValue(rgb) ((BYTE)((rgb) >> 24)) #define GetAValue(rgb) ((BYTE)((rgb) >> 24))
@ -185,9 +185,9 @@ bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportE
ExportOcclusionMesh(sLevelPath.toUtf8().data()); ExportOcclusionMesh(sLevelPath.toUtf8().data());
//! Export Level data. //! Export Level data.
CLogFile::WriteLine("Exporting LevelData.xml"); CLogFile::WriteLine("Exporting leveldata.xml");
ExportLevelData(sLevelPath); ExportLevelData(sLevelPath);
CLogFile::WriteLine("Exporting LevelData.xml done."); CLogFile::WriteLine("Exporting leveldata.xml done.");
ExportLevelInfo(sLevelPath); ExportLevelInfo(sLevelPath);
@ -266,26 +266,26 @@ void CGameExporter::ExportOcclusionMesh(const char* pszGamePath)
void CGameExporter::ExportLevelData(const QString& path, bool /*bExportMission*/) void CGameExporter::ExportLevelData(const QString& path, bool /*bExportMission*/)
{ {
IEditor* pEditor = GetIEditor(); IEditor* pEditor = GetIEditor();
pEditor->SetStatusText(QObject::tr("Exporting LevelData.xml...")); pEditor->SetStatusText(QObject::tr("Exporting leveldata.xml..."));
char versionString[256]; char versionString[256];
pEditor->GetFileVersion().ToString(versionString); pEditor->GetFileVersion().ToString(versionString);
XmlNodeRef root = XmlHelpers::CreateXmlNode("LevelData"); XmlNodeRef root = XmlHelpers::CreateXmlNode("leveldata");
root->setAttr("SandboxVersion", versionString); root->setAttr("SandboxVersion", versionString);
XmlNodeRef rootAction = XmlHelpers::CreateXmlNode("LevelDataAction"); XmlNodeRef rootAction = XmlHelpers::CreateXmlNode("leveldataaction");
rootAction->setAttr("SandboxVersion", versionString); rootAction->setAttr("SandboxVersion", versionString);
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Save Level Data XML // Save Level Data XML
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
QString levelDataFile = path + "LevelData.xml"; QString levelDataFile = path + "leveldata.xml";
XmlString xmlData = root->getXML(); XmlString xmlData = root->getXML();
CCryMemFile file; CCryMemFile file;
file.Write(xmlData.c_str(), static_cast<unsigned int>(xmlData.length())); file.Write(xmlData.c_str(), static_cast<unsigned int>(xmlData.length()));
m_levelPak.m_pakFile.UpdateFile(levelDataFile.toUtf8().data(), file); m_levelPak.m_pakFile.UpdateFile(levelDataFile.toUtf8().data(), file);
QString levelDataActionFile = path + "LevelDataAction.xml"; QString levelDataActionFile = path + "leveldataaction.xml";
XmlString xmlDataAction = rootAction->getXML(); XmlString xmlDataAction = rootAction->getXML();
CCryMemFile fileAction; CCryMemFile fileAction;
fileAction.Write(xmlDataAction.c_str(), static_cast<unsigned int>(xmlDataAction.length())); fileAction.Write(xmlDataAction.c_str(), static_cast<unsigned int>(xmlDataAction.length()));
@ -298,7 +298,7 @@ void CGameExporter::ExportLevelData(const QString& path, bool /*bExportMission*/
if (savedEntities) if (savedEntities)
{ {
QString entitiesFile; QString entitiesFile;
entitiesFile = QStringLiteral("%1%2.entities_xml").arg(path, "Mission0"); entitiesFile = QStringLiteral("%1%2.entities_xml").arg(path, "mission0");
m_levelPak.m_pakFile.UpdateFile(entitiesFile.toUtf8().data(), entitySaveBuffer.begin(), static_cast<int>(entitySaveBuffer.size())); m_levelPak.m_pakFile.UpdateFile(entitiesFile.toUtf8().data(), entitySaveBuffer.begin(), static_cast<int>(entitySaveBuffer.size()));
} }
} }
@ -326,7 +326,7 @@ void CGameExporter::ExportLevelInfo(const QString& path)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Save LevelInfo file. // Save LevelInfo file.
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
QString filename = path + "LevelInfo.xml"; QString filename = path + "levelinfo.xml";
XmlString xmlData = root->getXML(); XmlString xmlData = root->getXML();
CCryMemFile file; CCryMemFile file;

@ -86,7 +86,7 @@ bool CLevelInfo::ReadInfo()
usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled); usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
// Set up a default game type for legacy code. // Set up a default game type for legacy code.
m_defaultGameTypeName = "Mission0"; m_defaultGameTypeName = "mission0";
if (usePrefabSystemForLevels) if (usePrefabSystemForLevels)
{ {
@ -96,17 +96,17 @@ bool CLevelInfo::ReadInfo()
AZStd::string levelPath(m_levelPath); AZStd::string levelPath(m_levelPath);
AZStd::string xmlFile(levelPath); AZStd::string xmlFile(levelPath);
xmlFile += "/LevelInfo.xml"; xmlFile += "/levelinfo.xml";
XmlNodeRef rootNode = GetISystem()->LoadXmlFromFile(xmlFile.c_str()); XmlNodeRef rootNode = GetISystem()->LoadXmlFromFile(xmlFile.c_str());
if (rootNode) if (rootNode)
{ {
AZStd::string dataFile(levelPath); AZStd::string dataFile(levelPath);
dataFile += "/LevelDataAction.xml"; dataFile += "/leveldataaction.xml";
XmlNodeRef dataNode = GetISystem()->LoadXmlFromFile(dataFile.c_str()); XmlNodeRef dataNode = GetISystem()->LoadXmlFromFile(dataFile.c_str());
if (!dataNode) if (!dataNode)
{ {
dataFile = levelPath + "/LevelData.xml"; dataFile = levelPath + "/leveldata.xml";
dataNode = GetISystem()->LoadXmlFromFile(dataFile.c_str()); dataNode = GetISystem()->LoadXmlFromFile(dataFile.c_str());
} }
@ -614,7 +614,7 @@ ILevel* CLevelSystem::LoadLevelInternal(const char* _levelName)
} }
{ {
AZStd::string missionXml("Mission_"); AZStd::string missionXml("mission_");
missionXml += pLevelInfo->m_defaultGameTypeName; missionXml += pLevelInfo->m_defaultGameTypeName;
missionXml += ".xml"; missionXml += ".xml";
AZStd::string xmlFile(pLevelInfo->GetPath()); AZStd::string xmlFile(pLevelInfo->GetPath());

Loading…
Cancel
Save