Fix inverted conditions in shader.cpp

[dragonfireclient.git] / src / keycode.h

diff --git a/src/keycode.h b/src/keycode.h
index 28fb3f1fb86ccaf7ba7e3e85c0dd077b82407a65..459a85a467dfbf230b3594c2ba610b1ca33c70eb 100644 (file)
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 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.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,7 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef KEYCODE_HEADER
 #define KEYCODE_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
+#include "Keycodes.h"
+#include <IEventReceiver.h>
 #include <string>
 
 /* A key press, consisting of either an Irrlicht keycode
@@ -32,11 +34,12 @@ class KeyPress
        KeyPress();
        KeyPress(const char *name);
 
-       KeyPress(const irr::SEvent::SKeyInput &in);
+       KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character=false);
 
        bool operator==(const KeyPress &o) const
        {
-               return valid_kcode(Key) ? Key == o.Key : Char == o.Char;
+               return (Char > 0 && Char == o.Char) ||
+                       (valid_kcode(Key) && Key == o.Key);
        }
 
        const char *sym() const;
@@ -55,6 +58,7 @@ class KeyPress
 };
 
 extern const KeyPress EscapeKey;
+extern const KeyPress CancelKey;
 extern const KeyPress NumberKey[10];
 
 // Key configuration getter
@@ -63,5 +67,7 @@ KeyPress getKeySetting(const char *settingname);
 // Clear fast lookup cache
 void clearKeyCache();
 
+irr::EKEY_CODE keyname_to_keycode(const char *name);
+
 #endif