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

Changed double-click behavior in the POI list dialog, readded and fixed error message for incorrect struct property count in SCLY

Browse Source
This commit is contained in:
parax0
2016-01-18 16:10:26 -07:00
parent 8611e692a9
commit 26485b1151
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/Resource/Factory/CScriptLoader.cpp
View File

@@ -167,7 +167,12 @@ void CScriptLoader::LoadStructMP1(IInputStream& SCLY, CPropertyStruct *pStruct,
Version = pTemp->VersionForPropertyCount(FilePropCount);
if (Version == -1)
Log::FileWarning(SCLY.GetSourceString(), StructStart, "Struct \"" + pTemp->Name() + "\" template prop count doesn't match file");
{
TIDString IDString = pTemp->IDString(true);
if (!IDString.IsEmpty()) IDString = " (" + IDString + ")";
Log::FileWarning(SCLY.GetSourceString(), StructStart, "Struct \"" + pTemp->Name() + "\"" + IDString + " template prop count doesn't match file");
}
}
// Parse properties
@@ -260,8 +265,13 @@ void CScriptLoader::LoadStructMP2(IInputStream& SCLY, CPropertyStruct *pStruct,
u16 NumProperties = SCLY.ReadShort();
Version = pTemp->VersionForPropertyCount(NumProperties);
//if ((NumProperties != PropCount) && (mVersion < eReturns))
// Log::FileWarning(SCLY.GetSourceString(), SCLY.Tell() - 2, "Struct \"" + pTemp->Name() + "\" template property count doesn't match file");
if ((NumProperties != PropCount) && (mVersion < eReturns))
{
TIDString IDString = pTemp->IDString(true);
if (!IDString.IsEmpty()) IDString = " (" + IDString + ")";
Log::FileWarning(SCLY.GetSourceString(), StructStart, "Struct \"" + pTemp->Name() + "\"" + IDString + " template prop count doesn't match file");
}
PropCount = NumProperties;
}

18
src/Core/Resource/Script/IPropertyTemplate.cpp
View File

@@ -16,10 +16,20 @@ bool IPropertyTemplate::IsInVersion(u32 Version) const
TIDString IPropertyTemplate::IDString(bool FullPath) const
{
TIDString out;
if (mpParent && FullPath) out = mpParent->IDString(true) + ":";
out += TIDString::HexString(mID, true, true, 8);
return out;
if (mID != 0xFFFFFFFF)
{
TIDString out;
if (mpParent && FullPath)
{
out = mpParent->IDString(true);
if (!out.IsEmpty()) out += ":";
}
out += TIDString::HexString(mID, true, true, 8);
return out;
}
else return "";
}
CStructTemplate* IPropertyTemplate::RootStruct()