Pso Pointer fix

This commit is contained in:
dexyfex 2017-10-02 03:36:20 +11:00
parent dd9c6e4bfd
commit f673abb1db
2 changed files with 4 additions and 4 deletions

View File

@ -1029,9 +1029,9 @@ namespace CodeWalker.GameFiles
{ {
ErrorXml(sb, aind, ename + ": Map struct type not found: " + HashString(xBlock.NameHash)); ErrorXml(sb, aind, ename + ": Map struct type not found: " + HashString(xBlock.NameHash));
} }
else if ((xStruct.IndexInfo == null) || (xStruct.IndexInfo.NameHash != MetaName.ARRAYINFO)) else if ((xStruct.IndexInfo == null))// || (xStruct.IndexInfo.NameHash != MetaName.ARRAYINFO))
{ {
ErrorXml(sb, aind, ename + ": Map struct was not ARRAYINFO! " + (xStruct == null ? "" : xStruct.ToString())); ErrorXml(sb, aind, ename + ": Map struct was missing IndexInfo! " + (xStruct == null ? "" : xStruct.ToString()));
} }
else if ((kEntry == null) || (iEntry == null)) else if ((kEntry == null) || (iEntry == null))
{ {
@ -1047,7 +1047,7 @@ namespace CodeWalker.GameFiles
} }
else if (iEntry.Unk_5h != 3) else if (iEntry.Unk_5h != 3)
{ {
ErrorXml(sb, aind, ename + ": Map Item was not a structure pointer!"); ErrorXml(sb, aind, ename + ": Map Item was not a structure pointer - TODO!");
} }
else else
{ {

View File

@ -620,7 +620,7 @@ namespace CodeWalker.GameFiles
public uint Unk2 { get; set; } public uint Unk2 { get; set; }
public ushort BlockID { get { return (ushort)(Pointer & 0xFFF); } } //1-based ID public ushort BlockID { get { return (ushort)(Pointer & 0xFFF); } } //1-based ID
public uint ItemOffset { get { return (ushort)((Pointer>>12) & 0xFFFFF); } } //byte offset public uint ItemOffset { get { return ((Pointer>>12) & 0xFFFFF); } } //byte offset
public override string ToString() public override string ToString()