AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 03:07:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into urde-tags

Browse Source
This commit is contained in:
Jack Andersen
2016-03-04 14:03:41 -10:00
parent 8c9eca1858 783fb4c4fe
commit 9ade279902
337 changed files with 2998 additions and 3016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DataSpec/DNAMP1/ScriptObjects/Oculus.hpp
View File

@@ -31,7 +31,7 @@ struct Oculus : IScriptObject
/* Trilogy addition */
Value<float> unknown8;
void read(Athena::io::IStreamReader& __dna_reader)
void read(athena::io::IStreamReader& __dna_reader)
{
IScriptObject::read(__dna_reader);
/* name */
@@ -71,7 +71,7 @@ struct Oculus : IScriptObject
unknown8 = 0.0;
}
void write(Athena::io::IStreamWriter& __dna_writer) const
void write(athena::io::IStreamWriter& __dna_writer) const
{
IScriptObject::write(__dna_writer);
/* name */
@@ -109,7 +109,7 @@ struct Oculus : IScriptObject
__dna_writer.writeFloatBig(unknown8);
}
void read(Athena::io::YAMLDocReader& __dna_docin)
void read(athena::io::YAMLDocReader& __dna_docin)
{
IScriptObject::read(__dna_docin);
/* name */
@@ -149,7 +149,7 @@ struct Oculus : IScriptObject
unknown8 = 0.0;
}
void write(Athena::io::YAMLDocWriter& __dna_docout) const
void write(athena::io::YAMLDocWriter& __dna_docout) const
{
IScriptObject::write(__dna_docout);
/* name */
@@ -189,7 +189,7 @@ struct Oculus : IScriptObject
static const char* DNAType()
{
return "Retro::DNAMP1::Oculus";
return "urde::DNAMP1::Oculus";
}
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,

2
DataSpec/DNAMP1/ScriptObjects/Parameters.cpp
View File

@@ -10,7 +10,7 @@ UniqueID32 AnimationParameters::getCINF(PAKRouter<PAKBridge>& pakRouter) const
{
if (!animationCharacterSet)
return UniqueID32();
const NOD::Node* node;
const nod::Node* node;
const PAK::Entry* ancsEnt = pakRouter.lookupEntry(animationCharacterSet, &node);
ANCS ancs;
{

10
DataSpec/DNAMP1/ScriptObjects/Ridley.hpp
View File

@@ -124,7 +124,7 @@ struct Ridley : IScriptObject
/* Trilogy addition */
DamageInfo damageInfo9;
void read(Athena::io::IStreamReader& __dna_reader)
void read(athena::io::IStreamReader& __dna_reader)
{
IScriptObject::read(__dna_reader);
/* name */
@@ -234,7 +234,7 @@ struct Ridley : IScriptObject
damageInfo9.read(__dna_reader);
}
void write(Athena::io::IStreamWriter& __dna_writer) const
void write(athena::io::IStreamWriter& __dna_writer) const
{
IScriptObject::write(__dna_writer);
/* name */
@@ -344,7 +344,7 @@ struct Ridley : IScriptObject
damageInfo9.write(__dna_writer);
}
void read(Athena::io::YAMLDocReader& __dna_docin)
void read(athena::io::YAMLDocReader& __dna_docin)
{
IScriptObject::read(__dna_docin);
/* name */
@@ -454,7 +454,7 @@ struct Ridley : IScriptObject
__dna_docin.enumerate("damageInfo9", damageInfo9);
}
void write(Athena::io::YAMLDocWriter& __dna_docout) const
void write(athena::io::YAMLDocWriter& __dna_docout) const
{
IScriptObject::write(__dna_docout);
/* name */
@@ -566,7 +566,7 @@ struct Ridley : IScriptObject
static const char* DNAType()
{
return "Retro::DNAMP1::Ridley";
return "urde::DNAMP1::Ridley";
}
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,

10
DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp
View File

@@ -41,7 +41,7 @@ struct WorldTeleporter : IScriptObject
Value<float> unknown15;
Value<float> unknown16;
void read(Athena::io::IStreamReader& __dna_reader)
void read(athena::io::IStreamReader& __dna_reader)
{
IScriptObject::read(__dna_reader);
/* name */
@@ -104,7 +104,7 @@ struct WorldTeleporter : IScriptObject
}
}
void write(Athena::io::IStreamWriter& __dna_writer) const
void write(athena::io::IStreamWriter& __dna_writer) const
{
IScriptObject::write(__dna_writer);
/* name */
@@ -160,7 +160,7 @@ struct WorldTeleporter : IScriptObject
}
}
void read(Athena::io::YAMLDocReader& __dna_docin)
void read(athena::io::YAMLDocReader& __dna_docin)
{
IScriptObject::read(__dna_docin);
/* name */
@@ -223,7 +223,7 @@ struct WorldTeleporter : IScriptObject
}
}
void write(Athena::io::YAMLDocWriter& __dna_docout) const
void write(athena::io::YAMLDocWriter& __dna_docout) const
{
IScriptObject::write(__dna_docout);
/* name */
@@ -281,7 +281,7 @@ struct WorldTeleporter : IScriptObject
static const char* DNAType()
{
return "Retro::DNAMP1::WorldTeleporter";
return "urde::DNAMP1::WorldTeleporter";
}
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const