ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-11-25 08:22:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in reading some PSO arrays

Browse Source
This commit is contained in:
dexy 2019-01-13 19:25:53 +11:00
parent 9506069e35
commit 6ecfe0f235
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CodeWalker.Core/GameFiles/GameFileCache.cs
View File

@ -2641,7 +2641,8 @@ namespace CodeWalker.GameFiles
{ } { }
if (entry.NameLower == "popgroups.ymt") if (entry.NameLower == "popgroups.ymt")
{ } { }
if (entry.NameLower == "clip_sets.ymt")
{ }
} }
} }

6
CodeWalker.Core/GameFiles/MetaTypes/PsoTypes.cs
View File

@ -15909,7 +15909,7 @@ namespace CodeWalker.GameFiles
{ {
return null; return null;
} }
var entryoffset = (arr.Pointer & 0xFFFFFF) >> 12; var entryoffset = (arr.Pointer >> 12) & 0xFFFFF;
var arrentry = pso.DataMapSection.Entries[(int)entryid - 1]; var arrentry = pso.DataMapSection.Entries[(int)entryid - 1];
int totoffset = arrentry.Offset + (int)entryoffset; int totoffset = arrentry.Offset + (int)entryoffset;
uint[] readdata = ConvertDataArrayRaw<uint>(data, totoffset, arr.Count1); uint[] readdata = ConvertDataArrayRaw<uint>(data, totoffset, arr.Count1);
@ -15949,7 +15949,7 @@ namespace CodeWalker.GameFiles
{ {
return null; return null;
} }
var entryoffset = (arr.Pointer & 0xFFFFFF) >> 12; var entryoffset = (arr.Pointer >> 12) & 0xFFFFF;
var arrentry = pso.DataMapSection.Entries[(int)entryid - 1]; var arrentry = pso.DataMapSection.Entries[(int)entryid - 1];
int totoffset = arrentry.Offset + (int)entryoffset; int totoffset = arrentry.Offset + (int)entryoffset;
float[] readdata = ConvertDataArrayRaw<float>(data, totoffset, arr.Count1); float[] readdata = ConvertDataArrayRaw<float>(data, totoffset, arr.Count1);
@ -15978,7 +15978,7 @@ namespace CodeWalker.GameFiles
{ {
return null; return null;
} }
var entryoffset = (arr.Pointer & 0xFFFFFF) >> 12; var entryoffset = (arr.Pointer >> 12) & 0xFFFFF;
var arrentry = pso.DataMapSection.Entries[(int)entryid - 1]; var arrentry = pso.DataMapSection.Entries[(int)entryid - 1];
int totoffset = arrentry.Offset + (int)entryoffset; int totoffset = arrentry.Offset + (int)entryoffset;
ushort[] readdata = ConvertDataArrayRaw<ushort>(data, totoffset, arr.Count1); ushort[] readdata = ConvertDataArrayRaw<ushort>(data, totoffset, arr.Count1);