Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-17 04:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge identical help names for dpad-mapped actions.

Browse source
This commit is contained in:
Aloshi 2014-05-14 19:20:18 -05:00
parent f32e8fff5a
commit f8355ef8b3
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Window.cpp
View file

@ -245,12 +245,36 @@ void Window::setHelpPrompts(const std::vector<HelpPrompt>& prompts)
std::vector<HelpPrompt> addPrompts; std::vector<HelpPrompt> addPrompts;
std::map<std::string, bool> seenMap; std::map<std::string, bool> inputSeenMap;
std::map<std::string, int> mappedToSeenMap;
for(auto it = prompts.begin(); it != prompts.end(); it++) for(auto it = prompts.begin(); it != prompts.end(); it++)
{ {
// only add it if the same icon hasn't already been added // only add it if the same icon hasn't already been added
if(seenMap.insert(std::make_pair<std::string, bool>(it->first, true)).second) if(inputSeenMap.insert(std::make_pair<std::string, bool>(it->first, true)).second)
addPrompts.push_back(*it); {
// this symbol hasn't been seen yet, what about the action name?
auto mappedTo = mappedToSeenMap.find(it->second);
if(mappedTo != mappedToSeenMap.end())
{
// yes, it has!
// can we combine? (dpad only)
if((it->first == "up/down" && addPrompts.at(mappedTo->second).first == "left/right") ||
(it->first == "left/right" && addPrompts.at(mappedTo->second).first == "up/down"))
{
// yes!
addPrompts.at(mappedTo->second).first = "up/down/left/right";
// don't need to add this to addPrompts since we just merged
}else{
// no, we can't combine!
addPrompts.push_back(*it);
}
}else{
// no, it hasn't!
mappedToSeenMap.insert(std::pair<std::string, int>(it->second, addPrompts.size()));
addPrompts.push_back(*it);
}
}
} }
// sort prompts so it goes [dpad_all] [dpad_u/d] [dpad_l/r] [a/b/x/y/l/r] [start/select] // sort prompts so it goes [dpad_all] [dpad_u/d] [dpad_l/r] [a/b/x/y/l/r] [start/select]