Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update submodule. Use new text input for mac addresses etc.

Browse Source
This commit is contained in:
Henrik Rydgard 2014-07-18 12:07:52 +02:00
parent 27b4403cae
commit 135795a664
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/GameSettingsScreen.cpp
View File

@ -377,8 +377,14 @@ void GameSettingsScreen::CreateViews() {
systemSettings->Add(new ItemHeader(s->T("Networking")));
systemSettings->Add(new CheckBox(&g_Config.bEnableWlan, s->T("Enable networking", "Enable networking/wlan (beta)")));
#ifdef _WIN32
systemSettings->Add(new PopupTextInputChoice(&g_Config.proAdhocServer, s->T("Change proAdhocServer Address"), "", screenManager()));
systemSettings->Add(new PopupTextInputChoice(&g_Config.localMacAddress, s->T("Change Mac Address"), "", screenManager()));
#else
systemSettings->Add(new Choice(s->T("Change proAdhocServer Address")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeproAdhocServerAddress);
systemSettings->Add(new Choice(s->T("Change Mac Address")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress);
#endif
//#ifndef ANDROID
systemSettings->Add(new ItemHeader(s->T("Cheats", "Cheats (experimental, see forums)")));

2
lang

@ -1 +1 @@
Subproject commit faef520e6080f6438d350c28b8587eb2823b810c
Subproject commit 674bb87b81b98ff89479ca6234fc333da45232e0

2
native

@ -1 +1 @@
Subproject commit 76cb31cdd5e0ef7b65819943c9f667810600fe6f
Subproject commit 8cd755942b0b8ab5f69dbc54c97a0aa7eef81d5d