Skip to content

Fix first-run crash when assets config fields are missing #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michaelfcs25 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix first-run crash when assets config fields are missing #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 40 additions & 26 deletions OpenClaw/Engine/GameApp/BaseGameApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,22 +550,34 @@ bool BaseGameApp::LoadGameOptions(const char* inConfigFile)
//-------------------------------------------------------------------------
// Assets
//-------------------------------------------------------------------------
TiXmlElement* assetsElem = configRoot->FirstChildElement("Assets");
if (assetsElem)
{
ParseValueFromXmlElem(&m_GameOptions.assetsFolder,
assetsElem->FirstChildElement("AssetsFolder"));
DO_AND_CHECK(ParseValueFromXmlElem(&m_GameOptions.rezArchive,
assetsElem->FirstChildElement("RezArchive")));
DO_AND_CHECK(ParseValueFromXmlElem(&m_GameOptions.customArchive,
assetsElem->FirstChildElement("CustomArchive")));
DO_AND_CHECK(ParseValueFromXmlElem(&m_GameOptions.resourceCacheSize,
assetsElem->FirstChildElement("ResourceCacheSize")));
ParseValueFromXmlElem(&m_GameOptions.tempDir,
assetsElem->FirstChildElement("TempDir"));
DO_AND_CHECK(ParseValueFromXmlElem(&m_GameOptions.savesFile,
assetsElem->FirstChildElement("SavesFile")));
}
TiXmlElement* assetsElem = configRoot->FirstChildElement("Assets");
if (assetsElem)
{
ParseValueFromXmlElem(&m_GameOptions.assetsFolder,
assetsElem->FirstChildElement("AssetsFolder"));
if (!ParseValueFromXmlElem(&m_GameOptions.rezArchive,
assetsElem->FirstChildElement("RezArchive")))
{
LOG_WARNING("Configuration is missing Assets.RezArchive. Using default: " + m_GameOptions.rezArchive);
}
if (!ParseValueFromXmlElem(&m_GameOptions.customArchive,
assetsElem->FirstChildElement("CustomArchive")))
{
LOG_WARNING("Configuration is missing Assets.CustomArchive. Using default: " + m_GameOptions.customArchive);
}
if (!ParseValueFromXmlElem(&m_GameOptions.resourceCacheSize,
assetsElem->FirstChildElement("ResourceCacheSize")))
{
LOG_WARNING("Configuration is missing Assets.ResourceCacheSize. Using default: " + ToStr(m_GameOptions.resourceCacheSize));
}
ParseValueFromXmlElem(&m_GameOptions.tempDir,
assetsElem->FirstChildElement("TempDir"));
if (!ParseValueFromXmlElem(&m_GameOptions.savesFile,
assetsElem->FirstChildElement("SavesFile")))
{
LOG_WARNING("Configuration is missing Assets.SavesFile. Using default: " + m_GameOptions.savesFile);
}
}

//-------------------------------------------------------------------------
// Font
Expand Down Expand Up @@ -1458,16 +1470,18 @@ TiXmlElement* CreateDefaultFontConfig()
return font;
}

TiXmlElement* CreateDefaultAssetsConfig()
{
TiXmlElement* assets = new TiXmlElement("Assets");

XML_ADD_TEXT_ELEMENT("RezArchive", "CLAW.REZ", assets);
XML_ADD_TEXT_ELEMENT("ResourceCacheSize", "50", assets);
XML_ADD_TEXT_ELEMENT("TempDir", ".", assets);
XML_ADD_TEXT_ELEMENT("SavesFile", "SAVES.XML", assets);

return assets;
TiXmlElement* CreateDefaultAssetsConfig()
{
TiXmlElement* assets = new TiXmlElement("Assets");

XML_ADD_TEXT_ELEMENT("AssetsFolder", "", assets);
XML_ADD_TEXT_ELEMENT("RezArchive", "CLAW.REZ", assets);
XML_ADD_TEXT_ELEMENT("CustomArchive", "ASSETS.ZIP", assets);
XML_ADD_TEXT_ELEMENT("ResourceCacheSize", "50", assets);
XML_ADD_TEXT_ELEMENT("TempDir", ".", assets);
XML_ADD_TEXT_ELEMENT("SavesFile", "SAVES.XML", assets);

return assets;
}

TiXmlElement* CreateDefaultConsoleConfig()
Expand Down