summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-29 01:08:33 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-29 12:56:42 +0300
commit5f048b85f826a85278545ac363d7058793fb3ece (patch)
tree08065744c9dbe0bcc428955c5187df17b88a70e2 /src/input
parent7c74dc533ce120a27ac4b68acb1c5b2f6c5cc680 (diff)
downloadmanaplus-5f048b85f826a85278545ac363d7058793fb3ece.tar.gz
manaplus-5f048b85f826a85278545ac363d7058793fb3ece.tar.bz2
manaplus-5f048b85f826a85278545ac363d7058793fb3ece.tar.xz
manaplus-5f048b85f826a85278545ac363d7058793fb3ece.zip
Move variables definition into each file with class definition.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/joystick.cpp1
-rw-r--r--src/input/keyboardconfig.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp
index f3dd2e90c..c9f2a85e7 100644
--- a/src/input/joystick.cpp
+++ b/src/input/joystick.cpp
@@ -34,6 +34,7 @@
#include "debug.h"
+Joystick *joystick = nullptr;
int Joystick::joystickCount = 0;
bool Joystick::mEnabled = false;
diff --git a/src/input/keyboardconfig.cpp b/src/input/keyboardconfig.cpp
index 8fa71d6a6..49bcb831f 100644
--- a/src/input/keyboardconfig.cpp
+++ b/src/input/keyboardconfig.cpp
@@ -35,6 +35,8 @@
extern volatile int tick_time;
+KeyboardConfig keyboard;
+
KeyboardConfig::KeyboardConfig() :
mEnabled(true),
mActiveKeys(nullptr),