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

Merged in new property names; fixed games being able to rename UnknownStruct* templates in other games

Browse Source
This commit is contained in:
Aruki
2018-10-13 21:40:09 -06:00
parent cf219cf17a
commit 5a56764815
99 changed files with 642 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Resource/Script/NPropertyMap.cpp
View File

@@ -231,8 +231,8 @@ const char* GetPropertyName(u32 ID, const char* pkTypeName)
}
/** Returns whether the specified name is in the map. */
bool IsValidPropertyName(u32 ID, const char* pkTypeName)
/** Returns whether the specified ID is in the map. */
bool IsValidPropertyID(u32 ID, const char* pkTypeName)
{
SNameKey Key = CreateKey(ID, pkTypeName);
auto MapFind = gNameMap.find(Key);

4
src/Core/Resource/Script/Property/CPropertyNameGenerator.cpp
View File

@@ -52,7 +52,7 @@ void CPropertyNameGenerator::Generate(const SPropertyNameGenerationParameters& r
mIsRunning = true;
mFinishedRunning = false;
// Convert valid type pairs into hashes.
// Convert the type pair map.
// Also, replace the normal type name list with whatever is in the ID pairs list we were given.
if (!rkParams.ValidIdPairs.empty())
{
@@ -267,5 +267,5 @@ bool CPropertyNameGenerator::IsValidPropertyID(u32 ID, const char* pkType)
return false;
}
else
return NPropertyMap::IsValidPropertyName(ID, pkType);
return NPropertyMap::IsValidPropertyID(ID, pkType);
}

2
src/Core/Resource/Script/Property/CSoundProperty.h
View File

@@ -18,7 +18,7 @@ public:
Arc.SerializePrimitive( ValueRef(pData), 0 );
}
virtual TString ValueAsString(void* pData)
virtual TString ValueAsString(void* pData) const
{
return TString::FromInt32( Value(pData), 0, 10 );
}