Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed InputManager's handling of controllers with duplicate names.

Browse source 
Added emergency keyboard config if no players can be loaded.
Switched some console output to log output.
This commit is contained in:
Aloshi 2013-04-13 13:19:06 -05:00
parent 1007821ca3
commit c6a7f8abf9
5 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/InputManager.cpp
View file

@ -1,7 +1,6 @@
#include "InputManager.h"
#include "InputConfig.h"
#include "Window.h"
#include <iostream>
#include "Log.h"
#include "pugiXML/pugixml.hpp"
#include <boost/filesystem.hpp>
@ -103,7 +102,7 @@ InputConfig* InputManager::getInputConfigByPlayer(int player)
return mInputConfigs[i];
}
std::cout << "Could not find input config for player number " << player << "!\n";
LOG(LogError) << "Could not find input config for player number " << player << "!";
return NULL;
}
@ -165,7 +164,7 @@ void InputManager::loadConfig()
{
if(!mJoysticks)
{
std::cout << "ERROR - cannot load config without being initialized!\n";
LOG(LogError) << "ERROR - cannot load InputManager config without being initialized!";
}
std::string path = getConfigPath();
@ -183,6 +182,13 @@ void InputManager::loadConfig()
mNumPlayers = 0;
bool configuredDevice[mNumJoysticks];
for(int i = 0; i < mNumJoysticks; i++)
{
mInputConfigs[i]->setPlayerNum(-1);
configuredDevice[i] = false;
}
pugi::xml_node root = doc.child("inputList");
for(pugi::xml_node node = root.child("inputConfig"); node; node = node.next_sibling("inputConfig"))
@ -199,31 +205,57 @@ void InputManager::loadConfig()
std::string devName = node.attribute("deviceName").as_string();
for(int i = 0; i < mNumJoysticks; i++)
{
if(SDL_JoystickName(i) == devName)
if(!configuredDevice[i] && SDL_JoystickName(i) == devName)
{
mInputConfigs[i]->loadFromXML(node, mNumPlayers);
mNumPlayers++;
found = true;
configuredDevice[i] = true;
break;
}
}
if(!found)
{
LOG(LogWarning) << "Could not find joystick named \"" << devName << "\"! Skipping it.\n";
LOG(LogWarning) << "Could not find unconfigured joystick named \"" << devName << "\"! Skipping it.\n";
continue;
}
}else{
LOG(LogWarning) << "Device type \"" << type << "\" unknown!\n";
}
}
if(mNumPlayers == 0)
{
LOG(LogInfo) << "No input configs loaded. Loading default keyboard config.";
loadDefaultConfig();
}
}
//used in an "emergency" where no configs could be loaded from the inputmanager config file
//allows the user to select to reconfigure in menus if this happens without having to delete es_input.cfg manually
void InputManager::loadDefaultConfig()
{
InputConfig* cfg = getInputConfigByDevice(DEVICE_KEYBOARD);
mNumPlayers++;
cfg->setPlayerNum(0);
cfg->mapInput("up", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_UP, 1, true));
cfg->mapInput("down", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_DOWN, 1, true));
cfg->mapInput("left", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_LEFT, 1, true));
cfg->mapInput("right", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_RIGHT, 1, true));
cfg->mapInput("a", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_RETURN, 1, true));
cfg->mapInput("b", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_ESCAPE, 1, true));
cfg->mapInput("menu", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F1, 1, true));
cfg->mapInput("select", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F2, 1, true));
}
void InputManager::writeConfig()
{
if(!mJoysticks)
{
std::cout << "ERROR - cannot write config without being initialized!\n";
LOG(LogError) << "ERROR - cannot write config without being initialized!";
return;
}

2
src/InputManager.h
View file

@ -40,6 +40,8 @@ private:
//non-InputManager classes shouldn't use this, as you can easily miss the keyboard
InputConfig* getInputConfigByDevice(int device);
void loadDefaultConfig();
int mNumJoysticks;
int mNumPlayers;
SDL_Joystick** mJoysticks;

2
src/Renderer_draw_gl.cpp
View file

@ -86,7 +86,7 @@ namespace Renderer {
//make sure our font exists
if(!boost::filesystem::exists(fontPath))
{
LOG(LogError) << "System font \"" << fontPath << "\" wasn't found! Well, you're kind of screwed. Sorry. Report this to Aloshi, please.";
LOG(LogError) << "System font wasn't found! Try installing the DejaVu truetype font (pacman -S ttf-dejavu on Arch, sudo apt-get install ttf-dejavu on Debian)";
return;
}

2
src/components/GuiGameList.cpp
View file

@ -292,7 +292,7 @@ void GuiGameList::init()
if(mDetailed)
{
mScreenshot->deinit();
mScreenshot->init();
}
}

5
src/components/GuiInputConfig.cpp
View file

@ -1,9 +1,9 @@
#include "GuiInputConfig.h"
#include "../Window.h"
#include "../Renderer.h"
#include <iostream>
#include "../Font.h"
#include "GuiGameList.h"
#include "../Log.h"
static int inputCount = 8;
static std::string inputName[8] = { "Up", "Down", "Left", "Right", "A", "B", "Menu", "Select"};
@ -11,6 +11,7 @@ static std::string inputName[8] = { "Up", "Down", "Left", "Right", "A", "B", "Me
GuiInputConfig::GuiInputConfig(Window* window, InputConfig* target) : Gui(window), mTargetConfig(target)
{
mCurInputId = 0;
LOG(LogInfo) << "Configuring device " << target->getDeviceId();
}
void GuiInputConfig::update(int deltaTime)
@ -45,7 +46,7 @@ void GuiInputConfig::input(InputConfig* config, Input input)
}
input.configured = true;
std::cout << "[" << input.string() << "] -> " << inputName[mCurInputId] << "\n";
LOG(LogInfo) << " [" << input.string() << "] -> " << inputName[mCurInputId];
config->mapInput(inputName[mCurInputId], input);
mCurInputId++;