Downgrade surface format message from warning to debug

[supertux.git] / src / control / controller.hpp

diff --git a/src/control/controller.hpp b/src/control/controller.hpp
index deeb8e6..210159d 100644 (file)
--- a/src/control/controller.hpp
+++ b/src/control/controller.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,42 +12,51 @@
 //  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
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __CONTROLLER_H__
-#define __CONTROLLER_H__
+#ifndef HEADER_SUPERTUX_CONTROL_CONTROLLER_HPP
+#define HEADER_SUPERTUX_CONTROL_CONTROLLER_HPP
 
 class Controller
 {
 public:
   static const char* controlNames[];
-  
+
   enum Control {
     LEFT = 0,
     RIGHT,
     UP,
     DOWN,
+
     JUMP,
     ACTION,
-    PAUSE_MENU,
+
+    START,
+    ESCAPE,
     MENU_SELECT,
+    MENU_BACK,
+
+    CHEAT_MENU,
     CONSOLE,
+
     PEEK_LEFT,
     PEEK_RIGHT,
-    
+    PEEK_UP,
+    PEEK_DOWN,
+
     CONTROLCOUNT
   };
 
   Controller();
   virtual ~Controller();
 
+  void set_control(Control control, bool value);
   /** returns true if the control is pressed down */
-  bool hold(Control control);
+  bool hold(Control control) const;
   /** 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 this frame */ 
-  bool released(Control control);
+  bool pressed(Control control) const;
+  /** returns true if the control has just been released this frame */
+  bool released(Control control) const;
 
   virtual void reset();
   virtual void update();
@@ -62,3 +69,5 @@ protected:
 };
 
 #endif
+
+/* EOF */