Fix OSX builds (closes #6289, fixes #6270) (#6306)

[dragonfireclient.git] / src / keycode.h

diff --git a/src/keycode.h b/src/keycode.h
index 7fe5f42d17834bad3354b26c98ca1d89a4b05973..7036705d16a486dcf8d0673b386b11c27001c3d8 100644 (file)
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+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 Lesser General Public License as published by
@@ -17,10 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef KEYCODE_HEADER
-#define KEYCODE_HEADER
+#pragma once
 
 #include "irrlichttypes.h"
+#include "Keycodes.h"
 #include <IEventReceiver.h>
 #include <string>
 
@@ -30,34 +30,33 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class KeyPress
 {
 public:
-       KeyPress();
+       KeyPress() = default;
+
        KeyPress(const char *name);
 
-       KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character=false);
+       KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character = false);
 
        bool operator==(const KeyPress &o) const
        {
-               return (Char > 0 && Char == o.Char) ||
-                       (valid_kcode(Key) && Key == o.Key);
+               return (Char > 0 && Char == o.Char) || (valid_kcode(Key) && Key == o.Key);
        }
 
        const char *sym() const;
        const char *name() const;
 
-       std::string debug() const;
 protected:
        static bool valid_kcode(irr::EKEY_CODE k)
        {
                return k > 0 && k < irr::KEY_KEY_CODES_COUNT;
        }
 
-       irr::EKEY_CODE Key;
-       wchar_t Char;
-       std::string m_name;
+       irr::EKEY_CODE Key = irr::KEY_KEY_CODES_COUNT;
+       wchar_t Char = L'\0';
+       std::string m_name = "";
 };
 
 extern const KeyPress EscapeKey;
-extern const KeyPress NumberKey[10];
+extern const KeyPress CancelKey;
 
 // Key configuration getter
 KeyPress getKeySetting(const char *settingname);
@@ -65,5 +64,4 @@ KeyPress getKeySetting(const char *settingname);
 // Clear fast lookup cache
 void clearKeyCache();
 
-#endif
-
+irr::EKEY_CODE keyname_to_keycode(const char *name);