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 #3793 from mathieui/netplay-disc-num 

Add information about disc number in the netplay setup
This commit is contained in:
Matthew Parlane 2016-05-06 09:19:54 +12:00
parent dbd67c6b06 f36cd77da4
commit 1cfeacd5b6
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Core/DolphinWX/NetPlay/NetWindow.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <cstddef> #include <cstddef>
#include <sstream> #include <sstream>
#include <string> #include <string>
@ -69,18 +70,37 @@ static std::string BuildGameName(const GameListItem& game)
{ {
// Lang needs to be consistent // Lang needs to be consistent
DiscIO::IVolume::ELanguage const lang = DiscIO::IVolume::LANGUAGE_ENGLISH; DiscIO::IVolume::ELanguage const lang = DiscIO::IVolume::LANGUAGE_ENGLISH;
std::vector<std::string> info;
if (!game.GetUniqueID().empty())
info.push_back(game.GetUniqueID());
if (game.GetRevision() != 0)
{
std::string rev_str = "Revision ";
info.push_back(rev_str + std::to_string((long long)game.GetRevision()));
}
std::string name(game.GetName(lang)); std::string name(game.GetName(lang));
if (game.GetRevision() != 0) int disc_number = game.GetDiscNumber() + 1;
return name + " (" + game.GetUniqueID() + ", Revision " + std::to_string((long long)game.GetRevision()) + ")";
std::string lower_name = name;
std::transform(lower_name.begin(), lower_name.end(), lower_name.begin(), ::tolower);
if (disc_number > 1 &&
lower_name.find(std::string(wxString::Format("disc %i", disc_number))) == std::string::npos &&
lower_name.find(std::string(wxString::Format("disc%i", disc_number))) == std::string::npos)
{
std::string disc_text = "Disc ";
info.push_back(disc_text + std::to_string(disc_number));
}
if (info.empty())
return name;
else else
{ {
if (game.GetUniqueID().empty()) std::ostringstream ss;
{ std::copy(info.begin(), info.end() -1, std::ostream_iterator<std::string>(ss, ", "));
return game.GetName(); ss << info.back();
} return name + " (" + ss.str() + ")";
return name + " (" + game.GetUniqueID() + ")";
} }
} }