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.cpp
diff --git
a/src/control/controller.cpp
b/src/control/controller.cpp
index
43f7665
..
11cfd65
100644
(file)
--- a/
src/control/controller.cpp
+++ b/
src/control/controller.cpp
@@
-21,8
+21,6
@@
#include "controller.hpp"
#include "controller.hpp"
-extern Controller* main_controller;
-
const char* Controller::controlNames[] = {
"left",
"right",
const char* Controller::controlNames[] = {
"left",
"right",
@@
-35,6
+33,8
@@
const char* Controller::controlNames[] = {
"console",
"peek-left",
"peek-right",
"console",
"peek-left",
"peek-right",
+ "peek-up",
+ "peek-down",
0
};
0
};
@@
-64,13
+64,13
@@
Controller::hold(Control control)
bool
Controller::pressed(Control control)
{
bool
Controller::pressed(Control control)
{
- return
oldControls[control] == false && controls[control] == true
;
+ return
!oldControls[control] && controls[control]
;
}
bool
Controller::released(Control control)
{
}
bool
Controller::released(Control control)
{
- return oldControls[control]
== true && controls[control] == false
;
+ return oldControls[control]
&& !controls[control]
;
}
void
}
void