projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Comment out resizable flag because it blue-screens on Windows
[supertux.git]
/
src
/
control
/
controller.hpp
diff --git
a/src/control/controller.hpp
b/src/control/controller.hpp
index
3e37cf7
..
ac0030b
100644
(file)
--- a/
src/control/controller.hpp
+++ b/
src/control/controller.hpp
@@
-1,7
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,11
+12,10
@@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef __CONTROLLER_H__
#define __CONTROLLER_H__
#ifndef __CONTROLLER_H__
#define __CONTROLLER_H__
@@
-25,18
+24,26
@@
class Controller
{
public:
static const char* controlNames[];
{
public:
static const char* controlNames[];
-
+
enum Control {
LEFT = 0,
RIGHT,
UP,
DOWN,
enum Control {
LEFT = 0,
RIGHT,
UP,
DOWN,
+
JUMP,
ACTION,
JUMP,
ACTION,
+
PAUSE_MENU,
MENU_SELECT,
PAUSE_MENU,
MENU_SELECT,
+
CONSOLE,
CONSOLE,
-
+
+ PEEK_LEFT,
+ PEEK_RIGHT,
+ PEEK_UP,
+ PEEK_DOWN,
+
CONTROLCOUNT
};
CONTROLCOUNT
};
@@
-47,7
+54,7
@@
public:
bool hold(Control control);
/** returns true if the control has just been pressed down this frame */
bool pressed(Control control);
bool hold(Control control);
/** returns true if the control has just been pressed down this frame */
bool pressed(Control control);
- /** returns true if the control has just been released
down this frame */
+ /** returns true if the control has just been released
this frame */
bool released(Control control);
virtual void reset();
bool released(Control control);
virtual void reset();