Simplified bind() methods

ChangeLog.md

@@ -2,6 +2,12 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140605 ]
+    * Created methods to convert strings of names to ActionEvents
+      and KeyboardButtons.
+    * Simplified bind commands
+    * Only show debug info if menu is not visible
+
     [ 20140601 ]
     * Started removing C-style I/O, now using Strings and Streams
     * set size now takes two ints instead of a string

README.md

@@ -10,6 +10,8 @@ It seems as if OpenRaider will currently only work on Little-Endian platforms. T
 
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=xythobuz&url=https://github.com/xythobuz/OpenRaider&title=OpenRaider&language=&tags=github&category=software)
 
+<script data-gittip-username="xythobuz" data-gittip-widget="button" src="//gttp.co/v1.js"></script>
+
 ## Configuration
 
 OpenRaider needs some configuration files, and level data and assets from custom levels or the Tomb Raider games.

TODO.md

@@ -14,6 +14,8 @@ There are these DebugModel, DebugMap flags...?
     * Use streams for (file) I/O
         * Does not need strtok() anymore
     * Use std::strings
+* SDL_TTF 2.0.12+ can do line breaks, use it: http://stackoverflow.com/questions/17847818/how-to-do-line-breaks-and-line-wrapping-with-sdl-ttf/18418688#18418688
+* Rewrite Console using std::strings and use operator << to write to the console
 
 ## Changes
 

include/OpenRaider.h

@@ -67,7 +67,6 @@ private:
     int help(std::string &cmd);
     int set(std::stringstream &command);
     int bind(const char *action, const char *key);
-    int bind(ActionEvents action, const char *key);
 
     bool mRunning;
     bool mFPS;

include/global.h

@@ -92,5 +92,9 @@ typedef enum {
     unknownKey // Should always be at the end
 } KeyboardButton;
 
+ActionEvents stringToActionEvent(const char *action);
+
+KeyboardButton stringToKeyboardButton(const char *key);
+
 #endif
 

src/Command.cpp

@@ -713,173 +713,19 @@ int OpenRaider::bind(const char *action, const char *key) {
     assert(key != NULL);
     assert(key[0] != '\0');
 
-    const char *tmp = action;
-    if (action[0] == '+')
-        tmp++;
-
-    if (strcmp(tmp, "menu") == 0) {
-        return bind(menuAction, key);
-    } else if (strcmp(tmp, "console") == 0) {
-        return bind(consoleAction, key);
-    } else if (strcmp(tmp, "forward") == 0) {
-        return bind(forwardAction, key);
-    } else if (strcmp(tmp, "backward") == 0) {
-        return bind(backwardAction, key);
-    } else if (strcmp(tmp, "left") == 0) {
-        return bind(leftAction, key);
-    } else if (strcmp(tmp, "right") == 0) {
-        return bind(rightAction, key);
-    } else if (strcmp(tmp, "jump") == 0) {
-        return bind(jumpAction, key);
-    } else if (strcmp(tmp, "crouch") == 0) {
-        return bind(crouchAction, key);
-    } else if (strcmp(tmp, "use") == 0) {
-        return bind(useAction, key);
-    } else if (strcmp(tmp, "holster") == 0) {
-        return bind(holsterAction, key);
-    } else if (strcmp(tmp, "walk") == 0) {
-        return bind(walkAction, key);
-    } else {
+    ActionEvents e = stringToActionEvent(action);
+    if (e == ActionEventCount) {
         getConsole().print("bind-Error: Unknown action (%s --> %s)", key, action);
         return -1;
     }
-}
-
-int OpenRaider::bind(ActionEvents action, const char *key) {
-    assert(action < ActionEventCount);
-    assert(key != NULL);
-    assert(key[0] != '\0');
 
-    size_t length = strlen(key);
-    if ((key[0] == '\'') && (key[length - 1] == '\'') && (length == 3)) {
-        // Literal character like w, a, s, d, 0, 1...
-        char c = key[1];
-        if (((c >= '0') && (c <= '9'))
-            || ((c >= 'a') && (c <= 'z'))) {
-            keyBindings[action] = (KeyboardButton)c;
-        } else {
-            getConsole().print("bind-\'\'-Error: Unknown key (%s)", key);
-            return -1;
-        }
-    } else if ((key[0] == '\"') && (key[length - 1] == '\"')) {
-        // Special characters like tilde, esc, quote...
-        char *tmp = stringRemoveQuotes(key);
-        if (strcmp(tmp, "quote") == 0) {
-            keyBindings[action] = quoteKey;
-        } else if (strcmp(tmp, "backslash") == 0) {
-            keyBindings[action] = backslashKey;
-        } else if (strcmp(tmp, "backspace") == 0) {
-            keyBindings[action] = backspaceKey;
-        } else if (strcmp(tmp, "capslock") == 0) {
-            keyBindings[action] = capslockKey;
-        } else if (strcmp(tmp, "comma") == 0) {
-            keyBindings[action] = commaKey;
-        } else if (strcmp(tmp, "del") == 0) {
-            keyBindings[action] = delKey;
-        } else if (strcmp(tmp, "up") == 0) {
-            keyBindings[action] = upKey;
-        } else if (strcmp(tmp, "down") == 0) {
-            keyBindings[action] = downKey;
-        } else if (strcmp(tmp, "left") == 0) {
-            keyBindings[action] = leftKey;
-        } else if (strcmp(tmp, "right") == 0) {
-            keyBindings[action] = rightKey;
-        } else if (strcmp(tmp, "end") == 0) {
-            keyBindings[action] = endKey;
-        } else if (strcmp(tmp, "equals") == 0) {
-            keyBindings[action] = equalsKey;
-        } else if (strcmp(tmp, "escape") == 0) {
-            keyBindings[action] = escapeKey;
-        } else if (strcmp(tmp, "f1") == 0) {
-            keyBindings[action] = f1Key;
-        } else if (strcmp(tmp, "f2") == 0) {
-            keyBindings[action] = f2Key;
-        } else if (strcmp(tmp, "f3") == 0) {
-            keyBindings[action] = f3Key;
-        } else if (strcmp(tmp, "f4") == 0) {
-            keyBindings[action] = f4Key;
-        } else if (strcmp(tmp, "f5") == 0) {
-            keyBindings[action] = f5Key;
-        } else if (strcmp(tmp, "f6") == 0) {
-            keyBindings[action] = f6Key;
-        } else if (strcmp(tmp, "f7") == 0) {
-            keyBindings[action] = f7Key;
-        } else if (strcmp(tmp, "f8") == 0) {
-            keyBindings[action] = f8Key;
-        } else if (strcmp(tmp, "f9") == 0) {
-            keyBindings[action] = f9Key;
-        } else if (strcmp(tmp, "f10") == 0) {
-            keyBindings[action] = f10Key;
-        } else if (strcmp(tmp, "f11") == 0) {
-            keyBindings[action] = f11Key;
-        } else if (strcmp(tmp, "f12") == 0) {
-            keyBindings[action] = f12Key;
-        } else if (strcmp(tmp, "backquote") == 0) {
-            keyBindings[action] = backquoteKey;
-        } else if (strcmp(tmp, "home") == 0) {
-            keyBindings[action] = homeKey;
-        } else if (strcmp(tmp, "insert") == 0) {
-            keyBindings[action] = insertKey;
-        } else if (strcmp(tmp, "leftalt") == 0) {
-            keyBindings[action] = leftaltKey;
-        } else if (strcmp(tmp, "leftctrl") == 0) {
-            keyBindings[action] = leftctrlKey;
-        } else if (strcmp(tmp, "leftbracket") == 0) {
-            keyBindings[action] = leftbracketKey;
-        } else if (strcmp(tmp, "leftgui") == 0) {
-            keyBindings[action] = leftguiKey;
-        } else if (strcmp(tmp, "leftshift") == 0) {
-            keyBindings[action] = leftshiftKey;
-        } else if (strcmp(tmp, "minus") == 0) {
-            keyBindings[action] = minusKey;
-        } else if (strcmp(tmp, "numlock") == 0) {
-            keyBindings[action] = numlockKey;
-        } else if (strcmp(tmp, "pagedown") == 0) {
-            keyBindings[action] = pagedownKey;
-        } else if (strcmp(tmp, "pageup") == 0) {
-            keyBindings[action] = pageupKey;
-        } else if (strcmp(tmp, "pause") == 0) {
-            keyBindings[action] = pauseKey;
-        } else if (strcmp(tmp, "dot") == 0) {
-            keyBindings[action] = dotKey;
-        } else if (strcmp(tmp, "rightalt") == 0) {
-            keyBindings[action] = rightaltKey;
-        } else if (strcmp(tmp, "rightctrl") == 0) {
-            keyBindings[action] = rightctrlKey;
-        } else if (strcmp(tmp, "enter") == 0) {
-            keyBindings[action] = enterKey;
-        } else if (strcmp(tmp, "rightgui") == 0) {
-            keyBindings[action] = rightguiKey;
-        } else if (strcmp(tmp, "rightbracket") == 0) {
-            keyBindings[action] = rightbracketKey;
-        } else if (strcmp(tmp, "rightshift") == 0) {
-            keyBindings[action] = rightshiftKey;
-        } else if (strcmp(tmp, "scrolllock") == 0) {
-            keyBindings[action] = scrolllockKey;
-        } else if (strcmp(tmp, "semicolon") == 0) {
-            keyBindings[action] = semicolonKey;
-        } else if (strcmp(tmp, "slash") == 0) {
-            keyBindings[action] = slashKey;
-        } else if (strcmp(tmp, "space") == 0) {
-            keyBindings[action] = spaceKey;
-        } else if (strcmp(tmp, "tab") == 0) {
-            keyBindings[action] = tabKey;
-        } else if (strcmp(tmp, "leftmouse") == 0) {
-            keyBindings[action] = leftmouseKey;
-        } else if (strcmp(tmp, "middlemouse") == 0) {
-            keyBindings[action] = middlemouseKey;
-        } else if (strcmp(tmp, "rightmouse") == 0) {
-            keyBindings[action] = rightmouseKey;
-        } else {
-            getConsole().print("bind-\"\"-Error: Unknown key (%s)", key);
-            delete [] tmp;
-            return -2;
-        }
-        delete [] tmp;
-    } else {
+    KeyboardButton c = stringToKeyboardButton(key);
+    if (c == unknownKey) {
         getConsole().print("bind-Error: Unknown key (%s)", key);
-        return -3;
+        return -2;
     }
+
+    keyBindings[e] = c;
     return 0;
 }
 

src/OpenRaider.cpp

@@ -121,7 +121,7 @@ void OpenRaider::frame() {
 
 #ifdef DEBUG
     // Draw debug infos
-    if (getGame().isLoaded()) {
+    if (getGame().isLoaded() && (!getMenu().isVisible())) {
         for (int i = 0; i < 3; i++) {
             getWindow().drawText(10, getWindow().mHeight - ((4 - i) * 20), 0.5f, OR_BLUE, "%.2f (%.2f)",
                 getGame().getLara().getPos(i) / 256.0f, getGame().getLara().getAngle(i));
@@ -166,6 +166,8 @@ void OpenRaider::handleKeyboard(KeyboardButton key, bool pressed) {
         getMenu().handleKeyboard(key, pressed);
     }
 
+    //! \fixme Menu/Console visibility could also change in other ways,
+    // that should still result in the correct mousegrab state
     getWindow().setMousegrab(!(getMenu().isVisible() || getConsole().isVisible()));
 }
 

src/main.cpp

@@ -17,6 +17,7 @@
 #include "OpenRaider.h"
 #include "Render.h"
 #include "World.h"
+#include "utils/strings.h"
 #include "utils/time.h"
 
 #ifdef USING_AL
@@ -181,3 +182,208 @@ void assertImplementation(const char *exp, const char *file, int line) {
 
 #endif
 
+ActionEvents stringToActionEvent(const char *action) {
+    if (strcmp(action, "menu") == 0) {
+        return menuAction;
+    } else if (strcmp(action, "console") == 0) {
+        return consoleAction;
+    } else if (strcmp(action, "forward") == 0) {
+        return forwardAction;
+    } else if (strcmp(action, "backward") == 0) {
+        return backwardAction;
+    } else if (strcmp(action, "left") == 0) {
+        return leftAction;
+    } else if (strcmp(action, "right") == 0) {
+        return rightAction;
+    } else if (strcmp(action, "jump") == 0) {
+        return jumpAction;
+    } else if (strcmp(action, "crouch") == 0) {
+        return crouchAction;
+    } else if (strcmp(action, "use") == 0) {
+        return useAction;
+    } else if (strcmp(action, "holster") == 0) {
+        return holsterAction;
+    } else if (strcmp(action, "walk") == 0) {
+        return walkAction;
+    } else {
+        return ActionEventCount;
+    }
+}
+
+KeyboardButton stringToKeyboardButton(const char *key) {
+    size_t length = strlen(key);
+    if ((key[0] == '\'') && (key[length - 1] == '\'') && (length == 3)) {
+        // Literal character like w, a, s, d, 0, 1...
+        char c = key[1];
+        if (((c >= '0') && (c <= '9'))
+            || ((c >= 'a') && (c <= 'z')))
+            return (KeyboardButton)c;
+    } else if ((key[0] == '\"') && (key[length - 1] == '\"')) {
+        // Special characters like tilde, esc, quote...
+        char *tmp = stringRemoveQuotes(key);
+        if (strcmp(tmp, "quote") == 0) {
+            delete [] tmp;
+            return quoteKey;
+        } else if (strcmp(tmp, "backslash") == 0) {
+            delete [] tmp;
+            return backslashKey;
+        } else if (strcmp(tmp, "backspace") == 0) {
+            delete [] tmp;
+            return backspaceKey;
+        } else if (strcmp(tmp, "capslock") == 0) {
+            delete [] tmp;
+            return capslockKey;
+        } else if (strcmp(tmp, "comma") == 0) {
+            delete [] tmp;
+            return commaKey;
+        } else if (strcmp(tmp, "del") == 0) {
+            delete [] tmp;
+            return delKey;
+        } else if (strcmp(tmp, "up") == 0) {
+            delete [] tmp;
+            return upKey;
+        } else if (strcmp(tmp, "down") == 0) {
+            delete [] tmp;
+            return downKey;
+        } else if (strcmp(tmp, "left") == 0) {
+            delete [] tmp;
+            return leftKey;
+        } else if (strcmp(tmp, "right") == 0) {
+            delete [] tmp;
+            return rightKey;
+        } else if (strcmp(tmp, "end") == 0) {
+            delete [] tmp;
+            return endKey;
+        } else if (strcmp(tmp, "equals") == 0) {
+            delete [] tmp;
+            return equalsKey;
+        } else if (strcmp(tmp, "escape") == 0) {
+            delete [] tmp;
+            return escapeKey;
+        } else if (strcmp(tmp, "f1") == 0) {
+            delete [] tmp;
+            return f1Key;
+        } else if (strcmp(tmp, "f2") == 0) {
+            delete [] tmp;
+            return f2Key;
+        } else if (strcmp(tmp, "f3") == 0) {
+            delete [] tmp;
+            return f3Key;
+        } else if (strcmp(tmp, "f4") == 0) {
+            delete [] tmp;
+            return f4Key;
+        } else if (strcmp(tmp, "f5") == 0) {
+            delete [] tmp;
+            return f5Key;
+        } else if (strcmp(tmp, "f6") == 0) {
+            delete [] tmp;
+            return f6Key;
+        } else if (strcmp(tmp, "f7") == 0) {
+            delete [] tmp;
+            return f7Key;
+        } else if (strcmp(tmp, "f8") == 0) {
+            delete [] tmp;
+            return f8Key;
+        } else if (strcmp(tmp, "f9") == 0) {
+            delete [] tmp;
+            return f9Key;
+        } else if (strcmp(tmp, "f10") == 0) {
+            delete [] tmp;
+            return f10Key;
+        } else if (strcmp(tmp, "f11") == 0) {
+            delete [] tmp;
+            return f11Key;
+        } else if (strcmp(tmp, "f12") == 0) {
+            delete [] tmp;
+            return f12Key;
+        } else if (strcmp(tmp, "backquote") == 0) {
+            delete [] tmp;
+            return backquoteKey;
+        } else if (strcmp(tmp, "home") == 0) {
+            delete [] tmp;
+            return homeKey;
+        } else if (strcmp(tmp, "insert") == 0) {
+            delete [] tmp;
+            return insertKey;
+        } else if (strcmp(tmp, "leftalt") == 0) {
+            delete [] tmp;
+            return leftaltKey;
+        } else if (strcmp(tmp, "leftctrl") == 0) {
+            delete [] tmp;
+            return leftctrlKey;
+        } else if (strcmp(tmp, "leftbracket") == 0) {
+            delete [] tmp;
+            return leftbracketKey;
+        } else if (strcmp(tmp, "leftgui") == 0) {
+            delete [] tmp;
+            return leftguiKey;
+        } else if (strcmp(tmp, "leftshift") == 0) {
+            delete [] tmp;
+            return leftshiftKey;
+        } else if (strcmp(tmp, "minus") == 0) {
+            delete [] tmp;
+            return minusKey;
+        } else if (strcmp(tmp, "numlock") == 0) {
+            delete [] tmp;
+            return numlockKey;
+        } else if (strcmp(tmp, "pagedown") == 0) {
+            delete [] tmp;
+            return pagedownKey;
+        } else if (strcmp(tmp, "pageup") == 0) {
+            delete [] tmp;
+            return pageupKey;
+        } else if (strcmp(tmp, "pause") == 0) {
+            delete [] tmp;
+            return pauseKey;
+        } else if (strcmp(tmp, "dot") == 0) {
+            delete [] tmp;
+            return dotKey;
+        } else if (strcmp(tmp, "rightalt") == 0) {
+            delete [] tmp;
+            return rightaltKey;
+        } else if (strcmp(tmp, "rightctrl") == 0) {
+            delete [] tmp;
+            return rightctrlKey;
+        } else if (strcmp(tmp, "enter") == 0) {
+            delete [] tmp;
+            return enterKey;
+        } else if (strcmp(tmp, "rightgui") == 0) {
+            delete [] tmp;
+            return rightguiKey;
+        } else if (strcmp(tmp, "rightbracket") == 0) {
+            delete [] tmp;
+            return rightbracketKey;
+        } else if (strcmp(tmp, "rightshift") == 0) {
+            delete [] tmp;
+            return rightshiftKey;
+        } else if (strcmp(tmp, "scrolllock") == 0) {
+            delete [] tmp;
+            return scrolllockKey;
+        } else if (strcmp(tmp, "semicolon") == 0) {
+            delete [] tmp;
+            return semicolonKey;
+        } else if (strcmp(tmp, "slash") == 0) {
+            delete [] tmp;
+            return slashKey;
+        } else if (strcmp(tmp, "space") == 0) {
+            delete [] tmp;
+            return spaceKey;
+        } else if (strcmp(tmp, "tab") == 0) {
+            delete [] tmp;
+            return tabKey;
+        } else if (strcmp(tmp, "leftmouse") == 0) {
+            delete [] tmp;
+            return leftmouseKey;
+        } else if (strcmp(tmp, "middlemouse") == 0) {
+            delete [] tmp;
+            return middlemouseKey;
+        } else if (strcmp(tmp, "rightmouse") == 0) {
+            delete [] tmp;
+            return rightmouseKey;
+        }
+        delete [] tmp;
+    }
+
+    return unknownKey;
+}
+