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

Fix string being read in as bool

This commit is contained in:
Phillip Stephens 2015-10-12 23:48:44 -07:00
parent da2adf350a
commit 804f0c8b7d
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,11 +35,11 @@ struct WorldTeleporter : IScriptObject
Value<float> unknown12; Value<float> unknown12;
/* Trilogy additions (property count 26) */ /* Trilogy additions (property count 26) */
String<-1> audioStream;
Value<bool> unknown13; Value<bool> unknown13;
Value<bool> unknown14; Value<float> unknown14;
Value<float> unknown15; Value<float> unknown15;
Value<float> unknown16; Value<float> unknown16;
Value<float> unknown17;
void read(Athena::io::IStreamReader& __dna_reader) void read(Athena::io::IStreamReader& __dna_reader)
{ {
@ -89,19 +89,18 @@ struct WorldTeleporter : IScriptObject
if (propertyCount == 26) if (propertyCount == 26)
{ {
audioStream = __dna_reader.readString();
unknown13 = __dna_reader.readBool(); unknown13 = __dna_reader.readBool();
unknown14 = __dna_reader.readBool(); unknown14 = __dna_reader.readFloatBig();
unknown15 = __dna_reader.readFloatBig(); unknown15 = __dna_reader.readFloatBig();
unknown16 = __dna_reader.readFloatBig(); unknown16 = __dna_reader.readFloatBig();
unknown17 = __dna_reader.readFloatBig();
} }
else else
{ {
unknown13 = false; unknown13 = false;
unknown14 = false; unknown14 = 0.0;
unknown15 = 0.0; unknown15 = 0.0;
unknown16 = 0.0; unknown16 = 0.0;
unknown17 = 0.0;
} }
} }
@ -153,11 +152,11 @@ struct WorldTeleporter : IScriptObject
if (propertyCount == 26) if (propertyCount == 26)
{ {
__dna_writer.writeString(audioStream);
__dna_writer.writeBool(unknown13); __dna_writer.writeBool(unknown13);
__dna_writer.writeBool(unknown14); __dna_writer.writeFloatBig(unknown14);
__dna_writer.writeFloatBig(unknown15); __dna_writer.writeFloatBig(unknown15);
__dna_writer.writeFloatBig(unknown16); __dna_writer.writeFloatBig(unknown16);
__dna_writer.writeFloatBig(unknown17);
} }
} }
@ -209,19 +208,18 @@ struct WorldTeleporter : IScriptObject
if (propertyCount == 26) if (propertyCount == 26)
{ {
audioStream = __dna_docin.readString("audioStream");
unknown13 = __dna_docin.readBool("unknown13"); unknown13 = __dna_docin.readBool("unknown13");
unknown14 = __dna_docin.readBool("unknown14"); unknown14 = __dna_docin.readFloat("unknown14");
unknown15 = __dna_docin.readFloat("unknown15"); unknown15 = __dna_docin.readFloat("unknown15");
unknown16 = __dna_docin.readFloat("unknown16"); unknown16 = __dna_docin.readFloat("unknown16");
unknown17 = __dna_docin.readFloat("unknown17");
} }
else else
{ {
unknown13 = false; unknown13 = false;
unknown14 = false; unknown14 = 0.0;
unknown15 = 0.0; unknown15 = 0.0;
unknown16 = 0.0; unknown16 = 0.0;
unknown17 = 0.0;
} }
} }
@ -273,11 +271,11 @@ struct WorldTeleporter : IScriptObject
if (propertyCount == 26) if (propertyCount == 26)
{ {
__dna_docout.writeString("audioStream", audioStream);
__dna_docout.writeBool("unknown13", unknown13); __dna_docout.writeBool("unknown13", unknown13);
__dna_docout.writeBool("unknown14", unknown14); __dna_docout.writeFloat("unknown14", unknown14);
__dna_docout.writeFloat("unknown15", unknown15); __dna_docout.writeFloat("unknown15", unknown15);
__dna_docout.writeFloat("unknown16", unknown16); __dna_docout.writeFloat("unknown16", unknown16);
__dna_docout.writeFloat("unknown17", unknown17);
} }
} }