summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/Src/VolumeCreator.cpp
diff options
context:
space:
mode:
authorsl1nk3.s <sl1nk3.s@gmail.com>2009-06-08 02:25:21 +0000
committersl1nk3.s <sl1nk3.s@gmail.com>2009-06-08 02:25:21 +0000
commit97691461ca43fce9e0b376957434d3869fc1fd0e (patch)
tree8dc3987e4132bd98735f5e24cad086cdc7eaf4af /Source/Core/DiscIO/Src/VolumeCreator.cpp
parentb701802fcf630c5d8b41add4d19c31e34e511e26 (diff)
Fix savestate name for wad games, crashfix for some wad files without MakerID (thanks lpfaint99), fix for US games using SJIS string (Megaman 9 is one of them) can't do the same for PAL games as it would break special chars = we do need an unicode build
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3368 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/VolumeCreator.cpp')
-rw-r--r--Source/Core/DiscIO/Src/VolumeCreator.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/Src/VolumeCreator.cpp b/Source/Core/DiscIO/Src/VolumeCreator.cpp
index 76ad2aa0a4..eb335043bd 100644
--- a/Source/Core/DiscIO/Src/VolumeCreator.cpp
+++ b/Source/Core/DiscIO/Src/VolumeCreator.cpp
@@ -133,8 +133,7 @@ bool IsVolumeWadFile(const IVolume *_rVolume)
u32 MagicWord = 0;
_rVolume->Read(0x02, 4, (u8*)&MagicWord);
- return (Common::swap32(MagicWord) == 0x00204973);
- // That would be 0x00206962 for boot2 wads
+ return (Common::swap32(MagicWord) == 0x00204973 || Common::swap32(MagicWord) == 0x00206962);
}
IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _PartitionGroup, u32 _VolumeType, u32 _VolumeNum, bool Korean)
@@ -227,9 +226,8 @@ EDiscType GetDiscType(IBlobReader& _rReader)
{
u32 MagicWord = Reader.Read32(0x02);
- // That would be 0x206962 for boot2 wads
- // Should we add them too ?
- if (MagicWord == 0x00204973)
+ // 0x206962 for boot2 wads
+ if (MagicWord == 0x00204973 || MagicWord == 0x00206962)
return(DISC_TYPE_WAD);
}