krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Added more safety asserts to input dispatcher

Browse source
This commit is contained in:
Nicolay Korslund 2010-07-16 14:54:41 +02:00
parent 0e30756ba1
commit 69a56e8677
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
input/dispatcher.hpp
View file

@ -4,6 +4,7 @@
#include "dispatch_map.hpp" #include "dispatch_map.hpp"
#include "func_binder.hpp" #include "func_binder.hpp"
#include <mangle/input/event.hpp> #include <mangle/input/event.hpp>
#include <assert.h>
namespace OEngine { namespace OEngine {
namespace Input { namespace Input {
@ -19,8 +20,16 @@ struct Dispatcher : Mangle::Input::Event
*/ */
Dispatcher(int actions) : funcs(actions) {} Dispatcher(int actions) : funcs(actions) {}
void bind(int action, int key) { map.bind(key, action); } void bind(unsigned int action, int key)
void unbind(int action, int key) { map.unbind(key, action); } {
assert(action < funcs.getSize());
map.bind(key, action);
}
void unbind(unsigned int action, int key)
{
assert(action < funcs.getSize());
map.unbind(key, action);
}
bool isBound(int key) const { return map.isBound(key); } bool isBound(int key) const { return map.isBound(key); }
/** /**

2
input/func_binder.hpp
View file

@ -50,6 +50,8 @@ public:
*/ */
FuncBinder(int number) : bindings(number) {} FuncBinder(int number) : bindings(number) {}
unsigned int getSize() { return bindings.size(); }
/** /**
Bind an action to an index. Bind an action to an index.
*/ */