ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2676 from Stevoisiak/SpellingCorrections 

Minor spelling corrections
This commit is contained in:
Markus Wick 2015-08-15 18:36:56 +02:00
parent e28fa1588f 7248f9b524
commit 3469694b46
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/AudioCommon/aldlist.cpp
View File

@ -335,7 +335,7 @@ s32 ALDeviceList::GetNextFilteredDevice()
} }
/* /*
* Internal function to detemine max number of Sources that can be generated * Internal function to determine max number of Sources that can be generated
*/ */
u32 ALDeviceList::GetMaxNumSources() u32 ALDeviceList::GetMaxNumSources()
{ {

6
Source/Core/Core/Boot/Boot_BS2Emu.cpp
View File

@ -229,7 +229,7 @@ bool CBoot::SetupWiiMemory(DiscIO::IVolume::ECountry country)
if (!settingsFileHandle.WriteBytes(gen.GetData(), SettingsHandler::SETTINGS_SIZE)) if (!settingsFileHandle.WriteBytes(gen.GetData(), SettingsHandler::SETTINGS_SIZE))
{ {
PanicAlertT("SetupWiiMemory: Cant create setting.txt file"); PanicAlertT("SetupWiiMemory: Can't create setting.txt file");
return false; return false;
} }
// Write the 256 byte setting.txt to memory. // Write the 256 byte setting.txt to memory.
@ -240,7 +240,7 @@ bool CBoot::SetupWiiMemory(DiscIO::IVolume::ECountry country)
/* /*
Set hardcoded global variables to Wii memory. These are partly collected from Set hardcoded global variables to Wii memory. These are partly collected from
Wiibrew. These values are needed for the games to function correctly. A few WiiBrew. These values are needed for the games to function correctly. A few
values in this region will also be placed here by the game as it boots. values in this region will also be placed here by the game as it boots.
They are: They are:
0x80000038 Start of FST 0x80000038 Start of FST
@ -315,7 +315,7 @@ bool CBoot::EmulatedBS2_Wii()
{ {
INFO_LOG(BOOT, "Faking Wii BS2..."); INFO_LOG(BOOT, "Faking Wii BS2...");
// setup Wii memory // Setup Wii memory
DiscIO::IVolume::ECountry country_code = DiscIO::IVolume::COUNTRY_UNKNOWN; DiscIO::IVolume::ECountry country_code = DiscIO::IVolume::COUNTRY_UNKNOWN;
if (DVDInterface::VolumeIsValid()) if (DVDInterface::VolumeIsValid())
country_code = DVDInterface::GetVolume().GetCountry(); country_code = DVDInterface::GetVolume().GetCountry();

4
Source/Core/Core/HW/GCMemcard.h
View File

@ -116,7 +116,7 @@ struct Header //Offset Size Description
// end Serial in libogc // end Serial in libogc
u8 deviceID[2]; //0x0020 2 0 if formated in slot A 1 if formated in slot B u8 deviceID[2]; //0x0020 2 0 if formated in slot A 1 if formated in slot B
u8 SizeMb[2]; //0x0022 2 Size of memcard in Mbits u8 SizeMb[2]; //0x0022 2 Size of memcard in Mbits
u16 Encoding; //0x0024 2 Encoding (ASCII or japanese) u16 Encoding; //0x0024 2 Encoding (ASCII or Japanese)
u8 Unused1[468]; //0x0026 468 Unused (0xff) u8 Unused1[468]; //0x0026 468 Unused (0xff)
u16 UpdateCounter; //0x01fa 2 Update Counter (?, probably unused) u16 UpdateCounter; //0x01fa 2 Update Counter (?, probably unused)
u16 Checksum; //0x01fc 2 Additive Checksum u16 Checksum; //0x01fc 2 Additive Checksum
@ -139,7 +139,7 @@ struct Header //Offset Size Description
// Nintendo format algorithm. // Nintendo format algorithm.
// Constants are fixed by the GC SDK // Constants are fixed by the GC SDK
// Changing the constants will break memorycard support // Changing the constants will break memory card support
Header(int slot = 0, u16 sizeMb = MemCard2043Mb, bool ascii = true) Header(int slot = 0, u16 sizeMb = MemCard2043Mb, bool ascii = true)
{ {
memset(this, 0xFF, BLOCK_SIZE); memset(this, 0xFF, BLOCK_SIZE);

12
Source/Core/DiscIO/VolumeCreator.cpp
View File

@ -178,7 +178,7 @@ static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _Part
}; };
SPartitionGroup PartitionGroup[4]; SPartitionGroup PartitionGroup[4];
// read all partitions // Read all partitions
for (SPartitionGroup& group : PartitionGroup) for (SPartitionGroup& group : PartitionGroup)
{ {
for (u32 i = 0; i < numPartitions; i++) for (u32 i = 0; i < numPartitions; i++)
@ -190,9 +190,9 @@ static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _Part
} }
} }
// return the partition type specified or number // Return the partition type specified or number
// types: 0 = game, 1 = firmware update, 2 = channel installer // types: 0 = game, 1 = firmware update, 2 = channel installer
// some partitions on ssbb use the ascii title id of the demo VC game they hold... // some partitions on SSBB use the ASCII title id of the demo VC game they hold...
for (size_t i = 0; i < PartitionGroup[_PartitionGroup].PartitionsVec.size(); i++) for (size_t i = 0; i < PartitionGroup[_PartitionGroup].PartitionsVec.size(); i++)
{ {
const SPartition& rPartition = PartitionGroup[_PartitionGroup].PartitionsVec.at(i); const SPartition& rPartition = PartitionGroup[_PartitionGroup].PartitionsVec.at(i);
@ -216,18 +216,18 @@ EDiscType GetDiscType(IBlobReader& _rReader)
u32 WADMagic = Reader.Read32(0x02); u32 WADMagic = Reader.Read32(0x02);
u32 GCMagic = Reader.Read32(0x1C); u32 GCMagic = Reader.Read32(0x1C);
// check for Wii // Check for Wii
if (WiiMagic == 0x5D1C9EA3 && WiiContainerMagic != 0) if (WiiMagic == 0x5D1C9EA3 && WiiContainerMagic != 0)
return DISC_TYPE_WII; return DISC_TYPE_WII;
if (WiiMagic == 0x5D1C9EA3 && WiiContainerMagic == 0) if (WiiMagic == 0x5D1C9EA3 && WiiContainerMagic == 0)
return DISC_TYPE_WII_CONTAINER; return DISC_TYPE_WII_CONTAINER;
// check for WAD // Check for WAD
// 0x206962 for boot2 wads // 0x206962 for boot2 wads
if (WADMagic == 0x00204973 || WADMagic == 0x00206962) if (WADMagic == 0x00204973 || WADMagic == 0x00206962)
return DISC_TYPE_WAD; return DISC_TYPE_WAD;
// check for GC // Check for GC
if (GCMagic == 0xC2339F3D) if (GCMagic == 0xC2339F3D)
return DISC_TYPE_GC; return DISC_TYPE_GC;