piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove incorrect usage of "ASCII" and "ANSI"

Browse Source 
Windows-1252 was sometimes being referred to as ASCII or ANSI
in Dolphin, which is incorrect. ASCII is only a subset of
Windows-1252, and ANSI is (rather improperly) used in Windows
to refer to the current code page (which often is 1252 on
Western systems, but can also be something entirely different).

The commit also replaces "SJIS" with "Shift JIS". "SJIS"
isn't misleading, but "Shift JIS" is more commonly used.
This commit is contained in:
JosJuice
2016-12-26 15:49:39 +01:00
parent 4ebd369218
commit 0f1ce0e1f4
13 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/Core/HW/GCMemcard.cpp
View File

@ -22,7 +22,7 @@ static void ByteSwap(u8* valueA, u8* valueB)
*valueB = tmp;
}
GCMemcard::GCMemcard(const std::string& filename, bool forceCreation, bool ascii)
GCMemcard::GCMemcard(const std::string& filename, bool forceCreation, bool shift_jis)
: m_valid(false), m_fileName(filename)
{
// Currently there is a string freeze. instead of adding a new message about needing r/w
@ -34,9 +34,10 @@ GCMemcard::GCMemcard(const std::string& filename, bool forceCreation, bool ascii
{
if (!AskYesNoT("\"%s\" does not exist.\n Create a new 16MB Memcard?", filename.c_str()))
return;
ascii = AskYesNoT("Format as ASCII (NTSC\\PAL)?\nChoose no for Shift JIS (NTSC-J)");
shift_jis =
AskYesNoT("Format as Shift JIS (Japanese)?\nChoose no for Windows-1252 (Western)");
}
Format(ascii);
Format(shift_jis);
return;
}
else
@ -226,9 +227,9 @@ void GCMemcard::InitDirBatPointers()
}
}
bool GCMemcard::IsAsciiEncoding() const
bool GCMemcard::IsShiftJIS() const
{
return hdr.Encoding == 0;
return hdr.Encoding == 1;
}
bool GCMemcard::Save()
@ -1223,14 +1224,14 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8* delays) const
return frames;
}
bool GCMemcard::Format(u8* card_data, bool ascii, u16 SizeMb)
bool GCMemcard::Format(u8* card_data, bool shift_jis, u16 SizeMb)
{
if (!card_data)
return false;
memset(card_data, 0xFF, BLOCK_SIZE * 3);
memset(card_data + BLOCK_SIZE * 3, 0, BLOCK_SIZE * 2);
*((Header*)card_data) = Header(SLOT_A, SizeMb, ascii);
*((Header*)card_data) = Header(SLOT_A, SizeMb, shift_jis);
*((Directory*)(card_data + BLOCK_SIZE)) = Directory();
*((Directory*)(card_data + BLOCK_SIZE * 2)) = Directory();
@ -1239,7 +1240,7 @@ bool GCMemcard::Format(u8* card_data, bool ascii, u16 SizeMb)
return true;
}
bool GCMemcard::Format(bool ascii, u16 SizeMb)
bool GCMemcard::Format(bool shift_jis, u16 SizeMb)
{
memset(&hdr, 0xFF, BLOCK_SIZE);
memset(&dir, 0xFF, BLOCK_SIZE);
@ -1247,7 +1248,7 @@ bool GCMemcard::Format(bool ascii, u16 SizeMb)
memset(&bat, 0, BLOCK_SIZE);
memset(&bat_backup, 0, BLOCK_SIZE);
hdr = Header(SLOT_A, SizeMb, ascii);
hdr = Header(SLOT_A, SizeMb, shift_jis);
dir = dir_backup = Directory();
bat = bat_backup = BlockAlloc(SizeMb);