- fixed silly bug when editing username in custom game menu interferes with chat.
This commit is contained in:
parent
c0c031569b
commit
cdba95f6ac
|
@ -1242,7 +1242,7 @@ void MenuStateCustomGame::update() {
|
||||||
if(switchSetupRequests[i]->getNetworkPlayerName() != "") {
|
if(switchSetupRequests[i]->getNetworkPlayerName() != "") {
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d] i = %d, labelPlayerNames[newFactionIdx].getText() [%s] switchSetupRequests[i]->getNetworkPlayerName() [%s]\n",__FILE__,__FUNCTION__,__LINE__,i,labelPlayerNames[newFactionIdx].getText().c_str(),switchSetupRequests[i]->getNetworkPlayerName().c_str());
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d] i = %d, labelPlayerNames[newFactionIdx].getText() [%s] switchSetupRequests[i]->getNetworkPlayerName() [%s]\n",__FILE__,__FUNCTION__,__LINE__,i,labelPlayerNames[newFactionIdx].getText().c_str(),switchSetupRequests[i]->getNetworkPlayerName().c_str());
|
||||||
labelPlayerNames[newFactionIdx].setText(switchSetupRequests[i]->getNetworkPlayerName());
|
labelPlayerNames[newFactionIdx].setText(switchSetupRequests[i]->getNetworkPlayerName());
|
||||||
SetActivePlayerNameEditor();
|
//SetActivePlayerNameEditor();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch(const runtime_error &e) {
|
catch(const runtime_error &e) {
|
||||||
|
@ -1268,7 +1268,7 @@ void MenuStateCustomGame::update() {
|
||||||
else {
|
else {
|
||||||
labelPlayerNames[i].setText("");
|
labelPlayerNames[i].setText("");
|
||||||
}
|
}
|
||||||
SetActivePlayerNameEditor();
|
//SetActivePlayerNameEditor();
|
||||||
//switchSetupRequests[i]->clearSwitchFlag(ssrft_NetworkPlayerName);
|
//switchSetupRequests[i]->clearSwitchFlag(ssrft_NetworkPlayerName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2025,7 +2025,7 @@ GameSettings MenuStateCustomGame::loadGameSettingsFromFile(std::string fileName)
|
||||||
labelPlayerNames[i].setText(gameSettings.getNetworkPlayerName(i));
|
labelPlayerNames[i].setText(gameSettings.getNetworkPlayerName(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
SetActivePlayerNameEditor();
|
//SetActivePlayerNameEditor();
|
||||||
|
|
||||||
updateControlers();
|
updateControlers();
|
||||||
updateNetworkSlots();
|
updateNetworkSlots();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user