Skip to content

Commit 7b853b5

Browse files
committed
fix: Fix read mhwilds
1 parent a2a778d commit 7b853b5

File tree

5 files changed

+9
-18
lines changed

5 files changed

+9
-18
lines changed

RszTool/Enums.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public enum GameVersion
154154
re7rt = re2rt,
155155
re4 = 7,
156156
dd2 = re4,
157-
rszmhwilds = re4,
157+
mhwilds = re4,
158158
sf6 = 8,
159159
gtrick,
160160
apollo,

RszTool/FileHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ public unsafe object ReadObject(Type type)
732732
Stream.Read(buffer, 0, size);
733733
fixed (byte* p = buffer)
734734
{
735-
return Marshal.PtrToStructure((IntPtr)p, type);
735+
return Marshal.PtrToStructure((IntPtr)p, type)!;
736736
}
737737
}
738738
finally { ArrayPool<byte>.Shared.Return(buffer); }

RszTool/RszFile/RszFileOption.cs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,11 @@ public class RszFileOption
1010
public RszFileOption(GameName gameName)
1111
{
1212
GameName = gameName;
13-
Version = gameName switch
13+
if (!Enum.TryParse(gameName.ToString(), out GameVersion version))
1414
{
15-
GameName.re4 => GameVersion.re4,
16-
GameName.re2 => GameVersion.re2,
17-
GameName.re2rt => GameVersion.re2rt,
18-
GameName.re3 => GameVersion.re3,
19-
GameName.re3rt => GameVersion.re3rt,
20-
GameName.re7 => GameVersion.re7,
21-
GameName.re7rt => GameVersion.re7rt,
22-
GameName.re8 => GameVersion.re8,
23-
GameName.dmc5 => GameVersion.dmc5,
24-
GameName.mhrise => GameVersion.mhrise,
25-
GameName.sf6 => GameVersion.sf6,
26-
_ => GameVersion.unknown,
27-
};
15+
throw new Exception($"GameVersion {GameName} not found.");
16+
}
17+
Version = version;
2818
RszParser = RszParser.GetInstance($"rsz{gameName}.json");
2919
EnumParser = EnumParser.GetInstance($"Data\\Enums\\{gameName}_enum.json");
3020
}

RszTool/RszFile/RszInstance.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ public static bool WriteNormalField(FileHandler handler, RszField field, object
313313

314314
public static Type RszFieldTypeToCSharpType(RszFieldType fieldType)
315315
{
316-
if (!RszFieldTypeToCSharpTypeDict.TryGetValue(fieldType, out Type type))
316+
if (!RszFieldTypeToCSharpTypeDict.TryGetValue(fieldType, out Type? type))
317317
{
318318
throw new NotSupportedException($"Not support type {fieldType}");
319319
}

RszTool/RszFile/UserFile.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ public UserFile(RszFileOption option, FileHandler fileHandler) : base(option, fi
4242
{
4343
return Option.GameName switch
4444
{
45-
_ => Extension
45+
GameName.mhwilds => ".3",
46+
_ => ".2"
4647
};
4748
}
4849

0 commit comments

Comments
 (0)