Working on support for various controllers

This commit is contained in:
2021-08-31 13:56:03 +02:00
parent 8e6d546b97
commit ad5fb0fc22
6 changed files with 41 additions and 31 deletions

View File

@@ -138,8 +138,8 @@ void Title::init(bool demo, Uint8 subsection)
if (!mInput->gameControllerFound())
{
mOptions->input[0] = INPUT_USE_KEYBOARD;
mOptions->input[1] = INPUT_USE_GAMECONTROLLER;
mOptions->input[0].deviceType = INPUT_USE_KEYBOARD;
mOptions->input[1].deviceType = INPUT_USE_GAMECONTROLLER;
}
// Inicializa el bitmap de Coffee
@@ -349,7 +349,7 @@ void Title::updateMenuLabels()
i++;
// PLAYER 1 CONTROLS - OPTIONS
switch (mOptions->input[0])
switch (mOptions->input[0].deviceType)
{
case INPUT_USE_KEYBOARD:
mMenu.options->setItemCaption(i, mLang->getText(69)); // KEYBOARD
@@ -378,7 +378,7 @@ void Title::updateMenuLabels()
i++;
// PLAYER 2 CONTROLS - OPTIONS
switch (mOptions->input[1])
switch (mOptions->input[1].deviceType)
{
case INPUT_USE_KEYBOARD:
mMenu.options->setItemCaption(i, mLang->getText(69)); // KEYBOARD
@@ -911,14 +911,14 @@ void Title::runDemoGame()
void Title::switchInputs(int value)
{
Uint8 temp;
temp = mOptions->input[0];
mOptions->input[0] = mOptions->input[1];
mOptions->input[1] = temp;
temp = mOptions->input[0].deviceType;
mOptions->input[0].deviceType = mOptions->input[1].deviceType;
mOptions->input[1].deviceType = temp;
if (!mInput->gameControllerFound())
{
mOptions->input[0] = INPUT_USE_KEYBOARD;
mOptions->input[1] = INPUT_USE_GAMECONTROLLER;
mOptions->input[0].deviceType = INPUT_USE_KEYBOARD;
mOptions->input[1].deviceType = INPUT_USE_GAMECONTROLLER;
}
}