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

Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix

Browse Source
This commit is contained in:
Rodolfo Bogado
2013-08-13 17:30:22 -03:00
parent 9e0fc8b42d a791733c27
commit 85f91d66ba
27 changed files with 621 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/NetWindow.cpp
View File

@ -409,7 +409,7 @@ void NetPlayDiag::GetNetSettings(NetSettings &settings)
settings.m_Controllers[i] = SConfig::GetInstance().m_SIDevice[i];
}
const std::string& NetPlayDiag::FindGame()
std::string NetPlayDiag::FindGame()
{
// find path for selected game, sloppy..
for (u32 i = 0 ; auto game = m_game_list->GetISO(i); ++i)

2
Source/Core/DolphinWX/Src/NetWindow.h
View File

@ -92,7 +92,7 @@ private:
void OnAdjustBuffer(wxCommandEvent& event);
void OnConfigPads(wxCommandEvent& event);
void GetNetSettings(NetSettings &settings);
const std::string& FindGame();
std::string FindGame();
wxListBox* m_player_lbox;
wxTextCtrl* m_chat_text;