From a84133850af6d348c0c4e252b26618148702153b Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Thu, 20 Sep 2007 13:24:20 +0000 Subject: Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style to native for some files that were still missing this property. This is a feeble attempt to reduce the amount of conflicts for future merges. --- src/joystick.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/joystick.h') diff --git a/src/joystick.h b/src/joystick.h index f0759add..321e3e7d 100644 --- a/src/joystick.h +++ b/src/joystick.h @@ -32,15 +32,12 @@ class Joystick /** * Number of buttons we can handle. */ - static const unsigned char MAX_BUTTONS = 6; + enum { MAX_BUTTONS = 6 }; /** * Directions, to be used as bitmask values. */ - static const char UP = 1; - static const char DOWN = 2; - static const char LEFT = 4; - static const char RIGHT = 8; + enum { UP = 1, DOWN = 2, LEFT = 4, RIGHT = 8 }; /** * Initializes the joystick subsystem. -- cgit v1.2.3-70-g09d2