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 #1543 from comex/utf8-issues 

stupid utf-8 stuff
This commit is contained in:
comex 2014-11-14 15:03:36 -05:00
parent be44fdf0ec 0cf8ab175b
commit 8c26b0207d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
View File

@ -46,7 +46,7 @@ UCodeInterface* UCodeFactory(u32 crc, DSPHLE *dsphle, bool wii)
// nddemo, Star Fox // nddemo, Star Fox
case 0x07f88145: // bustamove, Ikaruga, F-Zero GX, Robotech Battle Cry, Star Soldier, Soul Calibur 2, case 0x07f88145: // bustamove, Ikaruga, F-Zero GX, Robotech Battle Cry, Star Soldier, Soul Calibur 2,
// Zelda:OOT, Tony Hawk, Viewtiful Joe // Zelda:OOT, Tony Hawk, Viewtiful Joe
case 0xe2136399: // Billy Hatcher, Dragon Ball Z, Mario Party 5, TMNT, 1080° Avalanche case 0xe2136399: // Billy Hatcher, Dragon Ball Z, Mario Party 5, TMNT, 1080° Avalanche
case 0x3389a79e: // MP1/MP2 Wii (Metroid Prime Trilogy) case 0x3389a79e: // MP1/MP2 Wii (Metroid Prime Trilogy)
INFO_LOG(DSPHLE, "CRC %08x: AX ucode chosen", crc); INFO_LOG(DSPHLE, "CRC %08x: AX ucode chosen", crc);
return new AXUCode(dsphle, crc); return new AXUCode(dsphle, crc);

11
Tools/check-includes.py
View File

@ -76,7 +76,16 @@ def show_differences(bad, good):
def check_file(path): def check_file(path):
print('Checking %s' % path) print('Checking %s' % path)
lines = (l.strip() for l in open(path).read().split('\n')) try:
try:
data = open(path, encoding='utf-8').read()
except TypeError: # py2
data = open(path).read().decode('utf-8')
except UnicodeDecodeError:
sys.stderr.write('%s: bad UTF-8 data\n' % path)
return
lines = (l.strip() for l in data.split('\n'))
lines = exclude_if_blocks(lines) lines = exclude_if_blocks(lines)
includes = list(filter_includes(lines)) includes = list(filter_includes(lines))
sorted_includes = sort_includes(includes) sorted_includes = sort_includes(includes)