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

NetPlay: Return mapping arrays and player list vectors directly

Browse Source 
Simplifies pad map dialog initialization
This commit is contained in:
Lioncash
2015-08-16 00:58:15 -04:00
parent b1af2a6bbc
commit 11f3ded296
7 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/NetPlayClient.cpp
View File

@ -617,17 +617,15 @@ void NetPlayClient::GetPlayerList(std::string& list, std::vector<int>& pid_list)
}
// called from ---GUI--- thread
void NetPlayClient::GetPlayers(std::vector<const Player *> &player_list)
std::vector<const Player*> NetPlayClient::GetPlayers()
{
std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
std::map<PlayerId, Player>::const_iterator
i = m_players.begin(),
e = m_players.end();
for (; i != e; ++i)
{
const Player *player = &(i->second);
player_list.push_back(player);
}
std::vector<const Player*> players;
for (const auto& pair : m_players)
players.push_back(&pair.second);
return players;
}

2
Source/Core/Core/NetPlayClient.h
View File

@ -54,7 +54,7 @@ public:
~NetPlayClient();
void GetPlayerList(std::string& list, std::vector<int>& pid_list);
void GetPlayers(std::vector<const Player *>& player_list);
std::vector<const Player*> GetPlayers();
bool is_connected;

20
Source/Core/Core/NetPlayServer.cpp
View File

@ -403,31 +403,27 @@ unsigned int NetPlayServer::OnDisconnect(Client& player)
}
// called from ---GUI--- thread
void NetPlayServer::GetPadMapping(PadMapping map[4])
PadMappingArray NetPlayServer::GetPadMapping() const
{
for (int i = 0; i < 4; i++)
map[i] = m_pad_map[i];
return m_pad_map;
}
void NetPlayServer::GetWiimoteMapping(PadMapping map[4])
PadMappingArray NetPlayServer::GetWiimoteMapping() const
{
for (int i = 0; i < 4; i++)
map[i] = m_wiimote_map[i];
return m_wiimote_map;
}
// called from ---GUI--- thread
void NetPlayServer::SetPadMapping(const PadMapping map[4])
void NetPlayServer::SetPadMapping(const PadMappingArray& mappings)
{
for (int i = 0; i < 4; i++)
m_pad_map[i] = map[i];
m_pad_map = mappings;
UpdatePadMapping();
}
// called from ---GUI--- thread
void NetPlayServer::SetWiimoteMapping(const PadMapping map[4])
void NetPlayServer::SetWiimoteMapping(const PadMappingArray& mappings)
{
for (int i = 0; i < 4; i++)
m_wiimote_map[i] = map[i];
m_wiimote_map = mappings;
UpdateWiimoteMapping();
}

8
Source/Core/Core/NetPlayServer.h
View File

@ -34,11 +34,11 @@ public:
bool StartGame();
void GetPadMapping(PadMapping map[]);
void SetPadMapping(const PadMapping map[]);
PadMappingArray GetPadMapping() const;
void SetPadMapping(const PadMappingArray& mappings);
void GetWiimoteMapping(PadMapping map[]);
void SetWiimoteMapping(const PadMapping map[]);
PadMappingArray GetWiimoteMapping() const;
void SetWiimoteMapping(const PadMappingArray& mappings);
void AdjustPadBufferSize(unsigned int size);