Started making Tux a single sprite again. Still missing: FireTux, IceTux

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

diff --git a/src/control/controller.cpp b/src/control/controller.cpp
index 7cbed0e..ee7a3e2 100644 (file)
--- a/src/control/controller.cpp
+++ b/src/control/controller.cpp
@@ -21,8 +21,6 @@
 
 #include "controller.hpp"
 
-extern Controller* main_controller;
-
 const char* Controller::controlNames[] = {
   "left",
   "right",
@@ -33,6 +31,8 @@ const char* Controller::controlNames[] = {
   "pause-menu",
   "menu-select",
   "console",
+  "peek-left",
+  "peek-right",
   0
 };
 
@@ -62,13 +62,13 @@ Controller::hold(Control control)
 bool
 Controller::pressed(Control control)
 {
-  return oldControls[control] == false && controls[control] == true;
+  return !oldControls[control] && controls[control];
 }
 
 bool
 Controller::released(Control control)
 {
-  return oldControls[control] == true && controls[control] == false;
+  return oldControls[control] && !controls[control];
 }
 
 void