ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add network split screen kart selection

Browse Source
This commit is contained in:
Benau
2018-03-21 15:41:44 +08:00
parent e63124ea3e
commit 6fca802c8e
12 changed files with 178 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/input/input_manager.cpp
View File

@@ -712,7 +712,8 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
// when a device presses fire or rescue
if (m_device_manager->getAssignMode() == DETECT_NEW)
{
if (NetworkConfig::get()->isAddingNetworkPlayers())
if (NetworkConfig::get()->isNetworking() &&
NetworkConfig::get()->isAddingNetworkPlayers())
{
// Ignore release event
if (value == 0)
@@ -775,7 +776,7 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
if (device != NULL)
{
KartSelectionScreen::getRunningInstance()->joinPlayer(device);
KartSelectionScreen::getRunningInstance()->joinPlayer(device, NULL/*player profile*/);
}
}
return; // we're done here, ignore devices that aren't