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

Merge branch 'master' of https://github.com/AxioDL/PathShagged

This commit is contained in:
Jack Andersen 2015-11-29 14:22:40 -10:00
parent 00be480ee2 3c369a6d7b
commit dd8ac05793
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DataSpec/DNAMP1/SCLY.cpp
View File

@ -64,7 +64,7 @@ void SCLY::addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
void SCLY::ScriptLayer::addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
{
for (const std::shared_ptr<IScriptObject>& obj : objects)
for (const std::unique_ptr<IScriptObject>& obj : objects)
obj->addCMDLRigPairs(pakRouter, addTo);
}
@ -76,7 +76,7 @@ void SCLY::nameIDs(PAKRouter<PAKBridge>& pakRouter) const
void SCLY::ScriptLayer::nameIDs(PAKRouter<PAKBridge>& pakRouter) const
{
for (const std::shared_ptr<IScriptObject>& obj : objects)
for (const std::unique_ptr<IScriptObject>& obj : objects)
obj->nameIDs(pakRouter);
}
@ -119,10 +119,10 @@ void SCLY::ScriptLayer::read(Athena::io::IStreamReader& rs)
if (iter != SCRIPT_OBJECT_DB.end())
{
std::shared_ptr<IScriptObject> obj((*iter)->a());
std::unique_ptr<IScriptObject> obj((*iter)->a());
obj->type = type;
obj->read(rs);
objects.push_back(obj);
objects.push_back(std::move(obj));
size_t actualLen = rs.position() - start;
if (actualLen != len)
Log.report(LogVisor::FatalError, _S("Error while reading object of type 0x%.2X, did not read the expected amount of data, read 0x%x, expected 0x%x"), (atUint32)type, actualLen, len);
@ -148,10 +148,10 @@ void SCLY::ScriptLayer::fromYAML(Athena::io::YAMLDocReader& rs)
if (iter != SCRIPT_OBJECT_DB.end())
{
std::shared_ptr<IScriptObject> obj((*iter)->a());
std::unique_ptr<IScriptObject> obj((*iter)->a());
obj->fromYAML(rs);
obj->type = type;
objects.push_back(obj);
objects.push_back(std::move(obj));
}
else
Log.report(LogVisor::FatalError, _S("Unable to find type 0x%X in object database"), (atUint32)type);
@ -165,7 +165,7 @@ void SCLY::ScriptLayer::write(Athena::io::IStreamWriter& ws) const
{
ws.writeUByte(unknown);
ws.writeUint32Big(objectCount);
for (const std::shared_ptr<IScriptObject>& obj : objects)
for (const std::unique_ptr<IScriptObject>& obj : objects)
{
ws.writeByte(obj->type);
obj->write(ws);
@ -175,7 +175,7 @@ void SCLY::ScriptLayer::write(Athena::io::IStreamWriter& ws) const
size_t SCLY::ScriptLayer::binarySize(size_t __isz) const
{
__isz += 5;
for (const std::shared_ptr<IScriptObject>& obj : objects)
for (const std::unique_ptr<IScriptObject>& obj : objects)
{
__isz += 1;
__isz = obj->binarySize(__isz);
@ -188,7 +188,7 @@ void SCLY::ScriptLayer::toYAML(Athena::io::YAMLDocWriter& ws) const
ws.writeUByte("unknown", unknown);
ws.writeUint32("objectCount", objectCount);
ws.enterSubVector("objects");
for (const std::shared_ptr<IScriptObject>& obj : objects)
for (const std::unique_ptr<IScriptObject>& obj : objects)
{
ws.enterSubRecord(nullptr);
ws.writeUByte("type", obj->type);

2
DataSpec/DNAMP1/SCLY.hpp
View File

@ -25,7 +25,7 @@ struct SCLY : BigYAML
Delete _d;
Value<atUint8> unknown;
Value<atUint32> objectCount;
Vector<std::shared_ptr<IScriptObject>, DNA_COUNT(objectCount)> objects;
Vector<std::unique_ptr<IScriptObject>, DNA_COUNT(objectCount)> objects;
void read(Athena::io::IStreamReader &rs);
void write(Athena::io::IStreamWriter &ws) const;
size_t binarySize(size_t __isz) const;