2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 23:47:42 +00:00

Humungous refactor

This commit is contained in:
Jack Andersen
2016-03-04 13:04:53 -10:00
parent 552ec1db4a
commit 783fb4c4fe
330 changed files with 2943 additions and 3077 deletions

View File

@@ -1,10 +1,10 @@
#include "CFactoryMgr.hpp"
#include "IObj.hpp"
namespace pshag
namespace urde
{
CFactoryFnReturn CFactoryMgr::MakeObject(const SObjectTag& tag, pshag::CInputStream& in,
CFactoryFnReturn CFactoryMgr::MakeObject(const SObjectTag& tag, urde::CInputStream& in,
const CVParamTransfer& paramXfer)
{
auto search = m_factories.find(tag.type);
@@ -23,12 +23,12 @@ CFactoryFnReturn CFactoryMgr::MakeObjectFromMemory(const SObjectTag& tag, void*
if (compressed)
{
CZipInputStream r(std::make_unique<Athena::io::MemoryReader>(buf, size));
CZipInputStream r(std::make_unique<athena::io::MemoryReader>(buf, size));
return search->second(tag, r, paramXfer);
}
else
{
Athena::io::MemoryReader r(buf, size);
athena::io::MemoryReader r(buf, size);
return search->second(tag, r, paramXfer);
}
}