// $Id$
-//
+//
// SuperTux
-// Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+// 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
// 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
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <config.h>
-#include "controller.h"
-
-extern Controller* main_controller;
+#include "controller.hpp"
const char* Controller::controlNames[] = {
"left",
"action",
"pause-menu",
"menu-select",
+ "console",
+ "peek-left",
+ "peek-right",
0
};
Controller::Controller()
{
- for(int i = 0; i < CONTROLCOUNT; ++i) {
- controls[i] = false;
- oldControls[i] = false;
- }
+ reset();
}
Controller::~Controller()
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] && !controls[control];
}
void