Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2015-01-06 18:51:37 +0000
committerStijn Buys <ingar@osirion.org>2015-01-06 18:51:37 +0000
commit72ee43e9470c6fdbc6ed7ff92b85dfa5062c5762 (patch)
tree6474fa59066d5212dcd40e3d76652dce35565280 /src/client/key.h
parent57d958d40af061e83aa99ca12e375e5345836ecd (diff)
Added separate event handlers for mouse button clicks and mouse wheel movement.
Diffstat (limited to 'src/client/key.h')
-rw-r--r--src/client/key.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/client/key.h b/src/client/key.h
index 3d97dd1..2c25609 100644
--- a/src/client/key.h
+++ b/src/client/key.h
@@ -7,7 +7,7 @@
#ifndef __INCLUDED_CLIENT_KEY_H__
#define __INCLUDED_CLIENT_KEY_H__
-#include "SDL/SDL.h"
+#include "SDL2/SDL.h"
#include <string>
@@ -28,7 +28,7 @@ class Key
{
public:
/// define a new key
- Key(const char *name, int keysym, char ascii = 0);
+ Key(const unsigned int scancode, const char *name, const char ascii = 0);
~Key();
/// key modifiers
@@ -74,8 +74,8 @@ public:
return key_ascii;
}
- inline int sym() const {
- return key_sym;
+ inline unsigned int scancode() const {
+ return key_scancode;
}
float key_pressed;
@@ -84,7 +84,7 @@ public:
private:
std::string key_name;
- int key_sym;
+ unsigned int key_scancode;
char key_ascii;
Action *key_action;