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

Fixed new GCPad/Wiimote plugin IniFile code to handle saving/loading of values with leading/trailing whitespace. Was causing issues with gamepads that had trailing whitespace in their names. Also, reordered drum pad colors in the GUI to match their physical layout.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5404 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-04-24 20:09:01 +00:00
parent 23689387e1
commit 8d5c9f30ad
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Plugins/InputPluginCommon/Src/IniFile.cpp
View File

@ -66,7 +66,15 @@ void IniFile::Save( std::ostream& file )
Section::const_iterator si = i->second.begin(), Section::const_iterator si = i->second.begin(),
se = i->second.end(); se = i->second.end();
for ( ; si != se; ++si ) for ( ; si != se; ++si )
file << si->first << " = " << si->second << '\n'; {
file << si->first << " = ";
// if value has quotes or whitespace, surround it with quotes
if (si->second.find_first_of("\"\t ") != std::string::npos)
file << '"' << si->second << '"';
else
file << si->second;
file << '\n';
}
} }
} }
@ -103,7 +111,13 @@ void IniFile::Load( std::istream& file )
std::istringstream ss(line); std::istringstream ss(line);
std::string key; std::getline( ss, key, '=' ); std::string key; std::getline( ss, key, '=' );
std::string val; std::getline( ss, val ); std::string val; std::getline( ss, val );
(*section)[ TrimChars(key,space) ] = TrimChars(val,space); val = TrimChars(val,space);
// handle quote surrounded values
if (val.length() > 1)
if ('"' == val[0])
val = val.substr(1, val.length()-2);
(*section)[ TrimChars(key,space) ] = val;
break; break;
} }
} }

4
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/Attachment/Drums.cpp
View File

@ -20,16 +20,16 @@ static const u8 drums_id[] = { 0x01, 0x00, 0xa4, 0x20, 0x01, 0x03 };
const u16 drum_pad_bitmasks[] = const u16 drum_pad_bitmasks[] =
{ {
DRUMS_RED, DRUMS_RED,
DRUMS_YELLOW,
DRUMS_BLUE, DRUMS_BLUE,
DRUMS_GREEN, DRUMS_GREEN,
DRUMS_YELLOW,
DRUMS_ORANGE, DRUMS_ORANGE,
DRUMS_BASS, DRUMS_BASS,
}; };
const char* drum_pad_names[] = const char* drum_pad_names[] =
{ {
"Red","Blue","Green","Yellow","Orange","Bass" "Red","Yellow","Blue","Green","Orange","Bass"
}; };
const u16 drum_button_bitmasks[] = const u16 drum_button_bitmasks[] =