Rewrote command system

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140827 ]
+    * Rewrote command system. Each command is now a unique class.
+
     [ 20140817 ]
     * Completed the file reading part of the new TR2 level loader
 

TODO.md

@@ -9,6 +9,10 @@
 * Don’t use float everywhere just because (eg. float colors)
 * Add verbose command line flag for debug output also in release builds
 
+## Bugs
+
+* Screenshots are sometimes not written, sometimes distorted?
+
 ## Cmake
 
 * Support SSE with other compilers than Clang (src/CMakeLists.txt)

include/OpenRaider.h

@@ -8,8 +8,11 @@
 #ifndef _OPENRAIDER_H_
 #define _OPENRAIDER_H_
 
-#include <istream>
+#include <memory>
 #include <string>
+#include <vector>
+
+#include "commands/Command.h"
 
 /*!
  * \brief Main Game Singleton
@@ -51,19 +54,12 @@ public:
     char *mPakDir;
     char *mAudioDir;
     char *mDataDir;
-
-private:
-
-    char *expandDirectoryNames(const char *s);
-    int set(std::istream &command);
-    int bind(const char *action, const char *key);
-
-    static int help(std::string &cmd);
-
+    KeyboardButton keyBindings[ActionEventCount];
     bool mRunning;
     bool mFPS;
 
-    KeyboardButton keyBindings[ActionEventCount];
+private:
+    std::vector<std::shared_ptr<Command>> commands;
 };
 
 OpenRaider &getOpenRaider();

include/commands/Command.h

@@ -0,0 +1,43 @@
+/*!
+ * \file include/commands/Command.h
+ * \brief Command interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _COMMAND_H_
+#define _COMMAND_H_
+
+#include <istream>
+#include <memory>
+#include <string>
+#include <vector>
+
+class Command {
+public:
+    virtual ~Command();
+    virtual std::string name() = 0;
+    virtual std::string brief() = 0;
+    virtual void printHelp();
+    virtual int execute(std::istream& args) = 0;
+};
+
+#define DECLARE_SIMPLE_CMD(x) \
+    class x : public Command { \
+    public: \
+        virtual std::string name(); \
+        virtual std::string brief(); \
+        virtual void printHelp(); \
+        virtual int execute(std::istream& args); \
+    }
+
+#define DECLARE_SIMPLE_CMD_NO_HELP(x) \
+    class x : public Command { \
+    public: \
+        virtual std::string name(); \
+        virtual std::string brief(); \
+        virtual int execute(std::istream& args); \
+    }
+
+#endif
+

include/commands/CommandAnimate.h

@@ -0,0 +1,16 @@
+/*!
+ * \file include/commands/CommandAnimate.h
+ * \brief Animate Command interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _COMMAND_ANIMATE_H_
+#define _COMMAND_ANIMATE_H_
+
+#include "commands/Command.h"
+
+DECLARE_SIMPLE_CMD(CommandAnimate);
+
+#endif
+

include/commands/CommandBind.h

@@ -0,0 +1,16 @@
+/*!
+ * \file include/commands/CommandBind.h
+ * \brief Bind Command interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _COMMAND_BIND_H_
+#define _COMMAND_BIND_H_
+
+#include "commands/Command.h"
+
+DECLARE_SIMPLE_CMD(CommandBind);
+
+#endif
+

include/commands/CommandEngine.h

@@ -0,0 +1,20 @@
+/*!
+ * \file include/commands/CommandEngine.h
+ * \brief Engine Command interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _COMMAND_ENGINE_H_
+#define _COMMAND_ENGINE_H_
+
+#include "commands/Command.h"
+
+DECLARE_SIMPLE_CMD(CommandLoad);
+
+DECLARE_SIMPLE_CMD(CommandScreenshot);
+
+DECLARE_SIMPLE_CMD_NO_HELP(CommandQuit);
+
+#endif
+

include/commands/CommandGame.h

@@ -0,0 +1,18 @@
+/*!
+ * \file include/commands/CommandGame.h
+ * \brief Game Command interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _COMMAND_GAME_H_
+#define _COMMAND_GAME_H_
+
+#include "commands/Command.h"
+
+DECLARE_SIMPLE_CMD_NO_HELP(CommandPos);
+
+DECLARE_SIMPLE_CMD_NO_HELP(CommandViewmodel);
+
+#endif
+

include/commands/CommandMove.h

@@ -0,0 +1,16 @@
+/*!
+ * \file include/commands/CommandMove.h
+ * \brief Move Command interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _COMMAND_MOVE_H_
+#define _COMMAND_MOVE_H_
+
+#include "commands/Command.h"
+
+DECLARE_SIMPLE_CMD(CommandMove);
+
+#endif
+

include/commands/CommandRender.h

@@ -0,0 +1,20 @@
+/*!
+ * \file include/commands/CommandRender.h
+ * \brief Render Command interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _COMMAND_RENDER_H_
+#define _COMMAND_RENDER_H_
+
+#include "commands/Command.h"
+
+DECLARE_SIMPLE_CMD(CommandMode);
+
+DECLARE_SIMPLE_CMD_NO_HELP(CommandFog);
+
+DECLARE_SIMPLE_CMD_NO_HELP(CommandLight);
+
+#endif
+

include/commands/CommandSet.h

@@ -0,0 +1,16 @@
+/*!
+ * \file include/commands/CommandSet.h
+ * \brief Set Command interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _COMMAND_SET_H_
+#define _COMMAND_SET_H_
+
+#include "commands/Command.h"
+
+DECLARE_SIMPLE_CMD(CommandSet);
+
+#endif
+

include/commands/CommandSound.h

@@ -0,0 +1,16 @@
+/*!
+ * \file include/commands/CommandSound.h
+ * \brief Sound Command interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _COMMAND_SOUND_H_
+#define _COMMAND_SOUND_H_
+
+#include "commands/Command.h"
+
+DECLARE_SIMPLE_CMD(CommandSound);
+
+#endif
+

src/CMakeLists.txt

@@ -48,7 +48,6 @@ endif (PNG_FOUND)
 
 # Set Source files
 set (SRCS ${SRCS} "Camera.cpp")
-set (SRCS ${SRCS} "Command.cpp")
 set (SRCS ${SRCS} "Console.cpp")
 set (SRCS ${SRCS} "Entity.cpp")
 set (SRCS ${SRCS} "Exception.cpp")
@@ -213,6 +212,7 @@ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${OpenRaider_CXX_FLAGS} ${O
 set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${OpenRaider_CXX_FLAGS} ${OpenRaider_CXX_FLAGS_RELEASE}")
 
 # Add subdirectories
+add_subdirectory ("commands")
 add_subdirectory ("deps")
 add_subdirectory ("loader")
 add_subdirectory ("math")
@@ -221,9 +221,9 @@ add_subdirectory ("utils")
 # Add Executable
 add_library (OpenRaider_all OBJECT ${SRCS})
 add_executable (OpenRaider MACOSX_BUNDLE ${RESRCS}
-    $<TARGET_OBJECTS:OpenRaider_all> $<TARGET_OBJECTS:OpenRaider_deps>
-    $<TARGET_OBJECTS:OpenRaider_math> $<TARGET_OBJECTS:OpenRaider_utils>
-    $<TARGET_OBJECTS:OpenRaider_loader>
+    $<TARGET_OBJECTS:OpenRaider_all> $<TARGET_OBJECTS:OpenRaider_commands>
+    $<TARGET_OBJECTS:OpenRaider_deps> $<TARGET_OBJECTS:OpenRaider_math>
+    $<TARGET_OBJECTS:OpenRaider_utils> $<TARGET_OBJECTS:OpenRaider_loader>
 )
 
 #################################################################

src/Command.cpp

@@ -1,631 +0,0 @@
-/*!
- * \file src/Command.cpp
- * \brief OpenRaider command implementation
- *
- * \author xythobuz
- */
-
-#include <fstream>
-#include <sstream>
-
-#include "global.h"
-#include "Camera.h"
-#include "Console.h"
-#include "Entity.h"
-#include "Font.h"
-#include "Game.h"
-#include "math/math.h"
-#include "Menu.h"
-#include "Render.h"
-#include "Sound.h"
-#include "TombRaider.h"
-#include "Window.h"
-#include "World.h"
-#include "utils/strings.h"
-#include "utils/time.h"
-#include "OpenRaider.h"
-
-int OpenRaider::loadConfig(const char *config) {
-    assert(config != NULL);
-    assert(config[0] != '\0');
-
-    char *configFile = fullPath(config, 0);
-    getConsole() << "Loading config from \"" << configFile << "\"..." << Console::endl;
-
-    std::ifstream file(configFile);
-    if (!file) {
-        getConsole() << "Could not open file!" << Console::endl;
-        return -1;
-    }
-
-    for (std::string line; std::getline(file, line);) {
-        if (line.length() == 0)
-            continue;
-
-        int error = command(line);
-        if (error != 0)
-            getConsole() << "Error Code: " << error << Console::endl;
-    }
-
-    file.close();
-
-    return 0;
-}
-
-int OpenRaider::command(std::string c) {
-    // Remove comment, if any
-    size_t comment = c.find_first_of('#');
-    if (comment != std::string::npos)
-        c.erase(comment);
-
-    // Execute command
-    std::stringstream command(c);
-    std::string cmd;
-    command >> cmd;
-    command >> std::boolalpha >> std::ws;
-
-    if (cmd.length() == 0)
-        return 0;
-
-    if (cmd.compare("set") == 0) {
-        return set(command);
-    } else if (cmd.compare("bind") == 0) {
-        std::string a, b;
-        if (!(command >> a >> b)) {
-            getConsole() << "Invalid use of bind-command" << Console::endl;
-            return -1;
-        } else {
-            return bind(a.c_str(), b.c_str());
-        }
-    } else if (cmd.compare("quit") == 0) {
-        exit(0);
-    } else if (cmd.compare("load") == 0) {
-        if (!mRunning) {
-            getConsole() << "Use load command interactively!" << Console::endl;
-            return -999;
-        }
-        std::string temp;
-        command >> temp;
-        int error = getGame().loadLevel(temp.c_str());
-        return error;
-    } else if (cmd.compare("help") == 0) {
-        std::string tmp;
-        if (!(command >> tmp)) {
-            getConsole() << "Available commands:" << Console::endl;
-            getConsole() << "  load      - load a level" << Console::endl;
-            getConsole() << "  set       - set a parameter" << Console::endl;
-            getConsole() << "  bind      - bind a keyboard/mouse action" << Console::endl;
-            getConsole() << "  animate   - [BOOL|n|p] - Animate models" << Console::endl;
-            getConsole() << "  move      - [walk|fly|noclip]" << Console::endl;
-            getConsole() << "  sshot     - make a screenshot" << Console::endl;
-/*
-            getConsole() << "  sound     - INT - Test play sound" << Console::endl;
-            getConsole() << "  mode      - MODE - Render mode" << Console::endl;
-            getConsole() << "  light     - BOOL - GL Lights" << Console::endl;
-            getConsole() << "  fog       - BOOL - GL Fog" << Console::endl;
-            getConsole() << "  viewmodel - INT - Change Laras model" << Console::endl;
-            getConsole() << "  pos       - Print position info" << Console::endl;
-            getConsole() << "  ralpha    - BOOL - Room Alpha" << Console::endl;
-            getConsole() << "  upf       - BOOL - Update Room List Per Frame" << Console::endl;
-            getConsole() << "  entmodel  - BOOL" << Console::endl;
-            getConsole() << "  ponytail  - BOOL" << Console::endl;
-            getConsole() << "  pigtail   - BOOL" << Console::endl;
-            getConsole() << "  ponypos   - FLOAT FLOAT FLOAT FLOAT - x y z angle" << Console::endl;
-*/
-            getConsole() << "  help      - print command help" << Console::endl;
-            getConsole() << "  quit      - exit OpenRaider" << Console::endl;
-            getConsole() << "Use help COMMAND to get additional info" << Console::endl;
-            getConsole() << "Pass BOOLs as true or false" << Console::endl;
-        } else {
-            return help(tmp);
-        }
-    } else if (cmd.compare("animate") == 0) {
-        if ((!mRunning) || (!getGame().isLoaded())) {
-            getConsole() << "Use animate command interactively!" << Console::endl;
-            return -999;
-        }
-        if (command.peek() == 'n') {
-            // Step all skeletal models to their next animation
-            if (getRender().getFlags() & Render::fAnimateAllModels) {
-                for (unsigned int i = 0; i < getWorld().sizeEntity(); i++) {
-                    Entity &e = getWorld().getEntity(i);
-                    SkeletalModel &m = e.getModel();
-                    if (e.getAnimation() < (m.size() - 1))
-                        e.setAnimation(e.getAnimation() + 1);
-                    else
-                        e.setAnimation(0);
-                }
-            } else {
-                getConsole() << "Animations need to be enabled!" << Console::endl;
-            }
-        } else if (command.peek() == 'p') {
-            // Step all skeletal models to their previous animation
-            if (getRender().getFlags() & Render::fAnimateAllModels) {
-                for (unsigned int i = 0; i < getWorld().sizeEntity(); i++) {
-                    Entity &e = getWorld().getEntity(i);
-                    SkeletalModel &m = e.getModel();
-                    if (e.getAnimation() > 0)
-                        e.setAnimation(e.getAnimation() - 1);
-                    else
-                        if (m.size() > 0)
-                            e.setAnimation(m.size() - 1);
-                }
-            } else {
-                getConsole() << "Animations need to be enabled!" << Console::endl;
-            }
-        } else {
-            // Enable or disable animating all skeletal models
-            bool b = false;
-            if (!(command >> b)) {
-                getConsole() << "Pass BOOL to animate command!" << Console::endl;
-                return -2;
-            }
-            if (b)
-                getRender().setFlags(Render::fAnimateAllModels);
-            else
-                getRender().clearFlags(Render::fAnimateAllModels);
-            getConsole() << (b ? "Animating all models" : "No longer animating all models") << Console::endl;
-        }
-    } else if (cmd.compare("move") == 0) {
-        if ((!mRunning) || (!getGame().isLoaded())) {
-            getConsole() << "Use move command interactively!" << Console::endl;
-            return -999;
-        }
-        std::string temp;
-        command >> temp;
-        if (temp.compare("walk") == 0) {
-            getGame().getLara().setMoveType(Entity::MoveTypeWalk);
-        } else if (temp.compare("fly") == 0) {
-            getGame().getLara().setMoveType(Entity::MoveTypeFly);
-        } else if (temp.compare("noclip") == 0) {
-            getGame().getLara().setMoveType(Entity::MoveTypeNoClipping);
-        } else {
-            getConsole() << "Invalid use of move command (" << temp.c_str() << ")!" << Console::endl;
-            return -9;
-        }
-        getConsole() << temp.c_str()  << "ing" << Console::endl;
-    } else if (cmd.compare("sshot") == 0) {
-        if (!mRunning) {
-            getConsole() << "Use sshot command interactively!" << Console::endl;
-            return -999;
-        }
-        std::string filename(mBaseDir);
-        filename += "/sshots/";
-        filename += VERSION_SHORT;
-        bool console = false, menu = false;
-        std::string temp;
-        command >> temp;
-        if (temp.compare("console") == 0)
-            console = true;
-        if (temp.compare("menu") == 0)
-            menu = true;
-        if (!console) {
-            getConsole().setVisible(false);
-            if (menu)
-                getMenu().setVisible(true);
-            frame();
-            frame(); // Double buffered
-        }
-        getRender().screenShot(filename.c_str());
-        if (!console) {
-            getConsole().setVisible(true);
-            if (menu)
-                getMenu().setVisible(false);
-        }
-        getConsole() << "Screenshot stored..." << Console::endl;
-/*
-    } else if (cmd.compare("mode") == 0) {
-        std::string mode;
-        command >> mode;
-        if (!getGame().isLoaded()) {
-            getConsole().print("Load a level to set the mode!");
-            return -1;
-        }
-        if (mode.compare("wireframe") == 0) {
-            getRender().setMode(Render::modeWireframe);
-            getConsole().print("Wireframe mode");
-        } else if (mode.compare("solid") == 0) {
-            getRender().setMode(Render::modeSolid);
-            getConsole().print("Solid mode");
-        } else if (mode.compare("texture") == 0) {
-            getRender().setMode(Render::modeTexture);
-            getConsole().print("Texture mode");
-        } else if (mode.compare("vertexlight") == 0) {
-            getRender().setMode(Render::modeVertexLight);
-            getConsole().print("Vertexlight mode");
-        } else if (mode.compare("titlescreen") == 0) {
-            getRender().setMode(Render::modeLoadScreen);
-            getConsole().print("Titlescreen mode");
-        } else {
-            getConsole().print("Invalid use of mode command (%s)!", mode.c_str());
-            return -1;
-        }
-    } else if (cmd.compare("light") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to light command!");
-                return -15;
-            }
-            if (b)
-                getRender().setFlags(Render::fGL_Lights);
-            else
-                getRender().clearFlags(Render::fGL_Lights);
-            getConsole().print("GL-Lights are now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of light-command!");
-            return -16;
-        }
-    } else if (cmd.compare("fog") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to fog command!");
-                return -17;
-            }
-            if (b)
-                getRender().setFlags(Render::fFog);
-            else
-                getRender().clearFlags(Render::fFog);
-            getConsole().print("Fog is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of fog-command!");
-            return -18;
-        }
-    } else if (cmd.compare("ralpha") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to ralpha command!");
-                return -24;
-            }
-            if (b)
-                getRender().setFlags(Render::fRoomAlpha);
-            else
-                getRender().clearFlags(Render::fRoomAlpha);
-            getConsole().print("Room Alpha is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of ralpha-command!");
-            return -25;
-        }
-    } else if (cmd.compare("upf") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to upf command!");
-                return -30;
-            }
-            if (b)
-                getRender().setFlags(Render::fUpdateRoomListPerFrame);
-            else
-                getRender().clearFlags(Render::fUpdateRoomListPerFrame);
-            getConsole().print("URLPF is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of upf-command!");
-            return -31;
-        }
-    } else if (cmd.compare("entmodel") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to entmodel command!");
-                return -38;
-            }
-            if (b)
-                getRender().setFlags(Render::fEntityModels);
-            else
-                getRender().clearFlags(Render::fEntityModels);
-            getConsole().print("Entmodels are now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of entmodel-command!");
-            return -39;
-        }
-    } else if (cmd.compare("ponytail") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to ponytail command!");
-                return -44;
-            }
-            if (b)
-                getRender().setFlags(Render::fRenderPonytail);
-            else
-                getRender().clearFlags(Render::fRenderPonytail);
-            getConsole().print("Ponytail is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of ponytail-command!");
-            return -45;
-        }
-    } else if (cmd.compare("sound") == 0) {
-        if ((!mRunning) || (!getGame().isLoaded())) {
-            getConsole().print("Use sound command interactively!");
-            return -999;
-        }
-        if (args->size() > 0) {
-            getSound().play(atoi(args->at(0)));
-        } else {
-            getConsole().print("Invalid use of sound command!");
-            return -12;
-        }
-    } else if (cmd.compare("viewmodel") == 0) {
-        if ((!mRunning) || (!getGame().isLoaded())) {
-            getConsole().print("Use viewmodel command interactively!");
-            return -999;
-        }
-        unsigned int n = atoi(args->at(0));
-        if (n < getWorld().sizeSkeletalModel())
-            getGame().getLara().setSkeletalModel(n);
-        else {
-            getConsole().print("Invalid SkeletalModel index!");
-            return -66;
-        }
-    } else if (cmd.compare("pos") == 0) {
-        if ((!mRunning) || (!getGame().isLoaded())) {
-            getConsole().print("Use pos command interactively!");
-            return -21;
-        }
-        getGame().getLara().print();
-    } else if (cmd.compare("pigtail") == 0) {
-        if ((!mRunning) || (!getGame().isLoaded())) {
-            getConsole().print("Use pigtail command interactively!");
-            return -999;
-        }
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to pigtail command!");
-                return -46;
-            }
-            SkeletalModel &tmp = getGame().getLara().getModel();
-            tmp.setPigTail(b);
-            getConsole().print("Pigtail is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of pigtail-command!");
-            return -47;
-        }
-    } else if (cmd.compare("ponypos") == 0) {
-        if ((!mRunning) || (!getGame().isLoaded())) {
-            getConsole().print("Use ponypos command interactively!");
-            return -999;
-        }
-        if (args->size() > 3) {
-            SkeletalModel &tmp = getGame().getLara().getModel();
-            tmp.setPonyPos((float)atof(args->at(0)), (float)atof(args->at(1)),
-                    (float)atof(args->at(2)), (float)atof(args->at(3)));
-        } else {
-            getConsole().print("Invalid use of ponypos-command!");
-            return -48;
-        }
-*/
-    } else {
-        getConsole() << "Unknown command: " << cmd.c_str() << Console::endl;
-        return -50;
-    }
-
-    return 0;
-}
-
-int OpenRaider::help(std::string &cmd) {
-    if (cmd.compare("set") == 0) {
-        getConsole() << "set-Command Usage:" << Console::endl;
-        getConsole() << "  set VAR VAL" << Console::endl;
-        getConsole() << "Available Variables:" << Console::endl;
-        getConsole() << "  basedir    STRING" << Console::endl;
-        getConsole() << "  pakdir     STRING" << Console::endl;
-        getConsole() << "  audiodir   STRING" << Console::endl;
-        getConsole() << "  datadir    STRING" << Console::endl;
-        getConsole() << "  font       STRING" << Console::endl;
-        getConsole() << "  size       INT INT" << Console::endl;
-        getConsole() << "  fullscreen BOOL" << Console::endl;
-        getConsole() << "  audio      BOOL" << Console::endl;
-        getConsole() << "  volume     BOOL" << Console::endl;
-        getConsole() << "  mouse_x    FLOAT" << Console::endl;
-        getConsole() << "  mouse_y    FLOAT" << Console::endl;
-        getConsole() << "  fps        BOOL" << Console::endl;
-        getConsole() << "Enclose STRINGs with \"\"!" << Console::endl;
-    } else if (cmd.compare("bind") == 0) {
-        getConsole() << "bind-Command Usage:" << Console::endl;
-        getConsole() << "  bind ACTION KEY" << Console::endl;
-        getConsole() << "Available Actions:" << Console::endl;
-        getConsole() << "  menu" << Console::endl;
-        getConsole() << "  console" << Console::endl;
-        getConsole() << "  forward" << Console::endl;
-        getConsole() << "  backward" << Console::endl;
-        getConsole() << "  left" << Console::endl;
-        getConsole() << "  right" << Console::endl;
-        getConsole() << "  jump" << Console::endl;
-        getConsole() << "  crouch" << Console::endl;
-        getConsole() << "  use" << Console::endl;
-        getConsole() << "  holster" << Console::endl;
-        getConsole() << "  walk" << Console::endl;
-        getConsole() << "Key-Format:" << Console::endl;
-        getConsole() << "  'a' or '1'    for character/number keys" << Console::endl;
-        getConsole() << "  \"leftctrl\"  for symbols and special keys" << Console::endl;
-    } else if (cmd.compare("load") == 0) {
-        getConsole() << "load-Command Usage:" << Console::endl;
-        getConsole() << "  load /path/to/level" << Console::endl;
-    } else if (cmd.compare("sshot") == 0) {
-        getConsole() << "sshot-Command Usage:" << Console::endl;
-        getConsole() << "  sshot [console|menu]" << Console::endl;
-        getConsole() << "Add console/menu to capture them too" << Console::endl;
-/*
-    } else if (cmd.compare("sound") == 0) {
-        getConsole().print("sound-Command Usage:");
-        getConsole().print("  sound INT");
-        getConsole().print("Where INT is a valid sound ID integer");
-    } else if (cmd.compare("move") == 0) {
-        getConsole().print("move-Command Usage:");
-        getConsole().print("  move COMMAND");
-        getConsole().print("Where COMMAND is one of the following:");
-        getConsole().print("  walk");
-        getConsole().print("  fly");
-        getConsole().print("  noclip");
-    } else if (cmd.compare("mode") == 0) {
-        getConsole().print("mode-Command Usage:");
-        getConsole().print("  mode MODE");
-        getConsole().print("Where MODE is one of the following:");
-        getConsole().print("  wireframe");
-        getConsole().print("  solid");
-        getConsole().print("  texture");
-        getConsole().print("  vertexlight");
-        getConsole().print("  titlescreen");
-*/
-    } else if (cmd.compare("animate") == 0) {
-        getConsole() << "animate-Command Usage:" << Console::endl;
-        getConsole() << "  animate [n|p|BOOL]" << Console::endl;
-        getConsole() << "Where the commands have the following meaning:" << Console::endl;
-        getConsole() << "  BOOL to (de)activate animating all models" << Console::endl;
-        getConsole() << "  n to step all models to their next animation" << Console::endl;
-        getConsole() << "  p to step all models to their previous animation" << Console::endl;
-    } else {
-        getConsole() << "No help available for " << cmd.c_str() << Console::endl;
-        return -1;
-    }
-
-    return 0;
-}
-
-char *OpenRaider::expandDirectoryNames(const char *s) {
-    assert(s != NULL);
-    assert(s[0] != '\0');
-
-    char *result = bufferString("%s", s);
-
-    if (mPakDir != NULL) {
-        char *tmp = stringReplace(s, "$(pakdir)", mPakDir);
-        delete [] result;
-        result = tmp;
-    }
-
-    if (mAudioDir != NULL) {
-        char *tmp = stringReplace(s, "$(audiodir)", mAudioDir);
-        delete [] result;
-        result = tmp;
-    }
-
-    if (mDataDir != NULL) {
-        char *tmp = stringReplace(s, "$(datadir)", mDataDir);
-        delete [] result;
-        result = tmp;
-    }
-
-    if (mBaseDir != NULL) {
-        char *tmp = stringReplace(result, "$(basedir)", mBaseDir);
-        delete [] result;
-        result = tmp;
-    }
-
-    return result;
-}
-
-#define CHANGE_DIR_WITH_EXPANSION(a) do {     \
-    std::string temp;                         \
-    command >> temp;                          \
-    const char *value = temp.c_str();         \
-    char *quotes = stringRemoveQuotes(value); \
-    char *tmp = expandDirectoryNames(quotes); \
-    a = fullPath(tmp, 0);                     \
-    delete [] tmp;                            \
-    delete [] quotes;                         \
-} while(false)
-
-int OpenRaider::set(std::istream &command) {
-    std::string var;
-    command >> var;
-
-    if (var.compare("size") == 0) {
-        unsigned int w = DEFAULT_WIDTH, h = DEFAULT_HEIGHT;
-        if (!(command >> w >> h)) {
-            getConsole() << "set-size-Error: Invalid value(s)" << Console::endl;
-            return -2;
-        }
-        getWindow().setSize(w, h);
-    } else if (var.compare("fullscreen") == 0) {
-        bool fullscreen = false;
-        if (!(command >> fullscreen)) {
-            getConsole() << "set-fullscreen-Error: Invalid value" << Console::endl;
-            return -3;
-        }
-        getWindow().setFullscreen(fullscreen);
-    } else if (var.compare("audio") == 0) {
-        bool audio = false;
-        if (!(command >> audio)) {
-            getConsole() << "set-audio-Error: Invalid value" << Console::endl;
-            return -4;
-        }
-        getSound().setEnabled(audio);
-    } else if (var.compare("volume") == 0) {
-        float vol = 1.0f;
-        if (!(command >> vol)) {
-            getConsole() << "set-volume-Error: Invalid value" << Console::endl;
-            return -5;
-        }
-        getSound().setVolume(vol);
-    } else if (var.compare("mouse_x") == 0) {
-        float sense = 1.0f;
-        if (!(command >> sense)) {
-            getConsole() << "set-mouse_x-Error: Invalid value" << Console::endl;
-            return -6;
-        }
-        getCamera().setSensitivityX(OR_DEG_TO_RAD(sense));
-    } else if (var.compare("mouse_y") == 0) {
-        float sense = 1.0f;
-        if (!(command >> sense)) {
-            getConsole() << "set-mouse_y-Error: Invalid value" << Console::endl;
-            return -7;
-        }
-        getCamera().setSensitivityY(OR_DEG_TO_RAD(sense));
-    } else if (var.compare("fps") == 0) {
-        bool fps = false;
-        if (!(command >> fps)) {
-            getConsole() << "set-fps-Error: Invalid value" << Console::endl;
-            return -8;
-        }
-        mFPS = fps;
-    } else if (var.compare("basedir") == 0) {
-        CHANGE_DIR_WITH_EXPANSION(mBaseDir);
-    } else if (var.compare("pakdir") == 0) {
-        CHANGE_DIR_WITH_EXPANSION(mPakDir);
-    } else if (var.compare("audiodir") == 0) {
-        CHANGE_DIR_WITH_EXPANSION(mAudioDir);
-    } else if (var.compare("datadir") == 0) {
-        CHANGE_DIR_WITH_EXPANSION(mDataDir);
-    } else if (var.compare("font") == 0) {
-        std::string temp;
-        command >> temp;
-        const char *value = temp.c_str();
-        char *quotes = stringReplace(value, "\"", "");
-        char *tmp = expandDirectoryNames(quotes);
-        getFont().setFont(tmp);
-        delete [] tmp;
-        delete [] quotes;
-    } else {
-        getConsole() << "set-Error: Unknown variable (" << var.c_str() << ")" << Console::endl;
-        return -1;
-    }
-
-    return 0;
-}
-
-int OpenRaider::bind(const char *action, const char *key) {
-    assert(action != NULL);
-    assert(action[0] != '\0');
-    assert(key != NULL);
-    assert(key[0] != '\0');
-
-    ActionEvents e = stringToActionEvent(action);
-    if (e == ActionEventCount) {
-        getConsole() << "bind-Error: Unknown action (" << key << " --> " << action << ")" << Console::endl;
-        return -1;
-    }
-
-    KeyboardButton c = stringToKeyboardButton(key);
-    if (c == unknownKey) {
-        getConsole() << "bind-Error: Unknown key (" << key << ")" << Console::endl;
-        return -2;
-    }
-
-    keyBindings[e] = c;
-    return 0;
-}
-

src/OpenRaider.cpp

@@ -7,9 +7,19 @@
 
 #include <cstdio>
 #include <cstring>
+#include <fstream>
+#include <iomanip>
 #include <sstream>
 
 #include "global.h"
+#include "commands/CommandAnimate.h"
+#include "commands/CommandBind.h"
+#include "commands/CommandEngine.h"
+#include "commands/CommandGame.h"
+#include "commands/CommandMove.h"
+#include "commands/CommandRender.h"
+#include "commands/CommandSet.h"
+#include "commands/CommandSound.h"
 #include "Console.h"
 #include "Font.h"
 #include "Game.h"
@@ -33,6 +43,20 @@ OpenRaider::OpenRaider() {
 
     for (int i = 0; i < ActionEventCount; i++)
         keyBindings[i] = unknownKey;
+
+    commands.push_back(std::shared_ptr<Command>(new CommandLoad()));
+    commands.push_back(std::shared_ptr<Command>(new CommandBind()));
+    commands.push_back(std::shared_ptr<Command>(new CommandSet()));
+    commands.push_back(std::shared_ptr<Command>(new CommandScreenshot()));
+    commands.push_back(std::shared_ptr<Command>(new CommandAnimate()));
+    commands.push_back(std::shared_ptr<Command>(new CommandMove()));
+    commands.push_back(std::shared_ptr<Command>(new CommandMode()));
+    commands.push_back(std::shared_ptr<Command>(new CommandFog()));
+    commands.push_back(std::shared_ptr<Command>(new CommandLight()));
+    commands.push_back(std::shared_ptr<Command>(new CommandSound()));
+    commands.push_back(std::shared_ptr<Command>(new CommandPos()));
+    commands.push_back(std::shared_ptr<Command>(new CommandViewmodel()));
+    commands.push_back(std::shared_ptr<Command>(new CommandQuit()));
 }
 
 OpenRaider::~OpenRaider() {
@@ -49,6 +73,94 @@ OpenRaider::~OpenRaider() {
     mDataDir = NULL;
 }
 
+int OpenRaider::loadConfig(const char *config) {
+    assert(config != NULL);
+    assert(config[0] != '\0');
+
+    char *configFile = fullPath(config, 0);
+    getConsole() << "Loading config from \"" << configFile << "\"..." << Console::endl;
+
+    std::ifstream file(configFile);
+    if (!file) {
+        getConsole() << "Could not open file!" << Console::endl;
+        return -1;
+    }
+
+    for (std::string line; std::getline(file, line);) {
+        if (line.length() == 0)
+            continue;
+
+        int error = command(line);
+        if (error != 0)
+            getConsole() << "Error Code: " << error << Console::endl;
+    }
+
+    file.close();
+
+    return 0;
+}
+
+int OpenRaider::command(std::string c) {
+    // Remove comment, if any
+    size_t comment = c.find_first_of('#');
+    if (comment != std::string::npos)
+        c.erase(comment);
+
+    // Execute command
+    std::stringstream command(c);
+    std::string cmd;
+    command >> cmd;
+    command >> std::boolalpha >> std::ws;
+
+    if (cmd.length() == 0)
+        return 0;
+
+    // Print help
+    if (cmd.compare("help") == 0) {
+        std::string arg;
+        command >> arg;
+        if (arg.length() == 0) {
+            // List all available commands
+            getConsole() << "Available commands:" << Console::endl;
+            getConsole() << std::right << std::setw(11);
+            getConsole() << "help" << " - print command help" << Console::endl;
+            for (auto &x : commands) {
+                if (x) {
+                    getConsole() << std::right << std::setw(11);
+                    getConsole() << x->name() << " - " << x->brief() << Console::endl;
+                }
+            }
+            getConsole() << "Use help COMMAND to get additional info" << Console::endl;
+            getConsole() << "Pass BOOLs as true or false" << Console::endl;
+            return 0;
+        } else {
+            // Show help for a specific command
+            for (auto &x : commands) {
+                if (x) {
+                    if (x->name().compare(arg) == 0) {
+                        x->printHelp();
+                        return 0;
+                    }
+                }
+            }
+            getConsole() << "Unknown command: \"" << arg << "\"" << Console::endl;
+            return -1;
+        }
+    }
+
+    // Execute command
+    for (auto &x : commands) {
+        if (x) {
+            if (x->name().compare(cmd) == 0) {
+                return x->execute(command);
+            }
+        }
+    }
+
+    getConsole() << "Unknown command: \"" << cmd << "\"" << Console::endl;
+    return -1;
+}
+
 int OpenRaider::initialize() {
     // Initialize Windowing
     int error = getWindow().initialize();

src/commands/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Source files
+set (CMD_SRCS ${CMD_SRCS} "Command.cpp")
+set (CMD_SRCS ${CMD_SRCS} "CommandAnimate.cpp")
+set (CMD_SRCS ${CMD_SRCS} "CommandBind.cpp")
+set (CMD_SRCS ${CMD_SRCS} "CommandEngine.cpp")
+set (CMD_SRCS ${CMD_SRCS} "CommandGame.cpp")
+set (CMD_SRCS ${CMD_SRCS} "CommandMove.cpp")
+set (CMD_SRCS ${CMD_SRCS} "CommandRender.cpp")
+set (CMD_SRCS ${CMD_SRCS} "CommandSet.cpp")
+set (CMD_SRCS ${CMD_SRCS} "CommandSound.cpp")
+
+# Add library
+add_library (OpenRaider_commands OBJECT ${CMD_SRCS})
+

src/commands/Command.cpp

@@ -0,0 +1,19 @@
+/*!
+ * \file src/commands/Command.cpp
+ * \brief Commands
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Console.h"
+#include "commands/Command.h"
+
+Command::~Command() {
+
+}
+
+void Command::printHelp() {
+    getConsole() << "No help available!" << Console::endl;
+}
+

src/commands/CommandAnimate.cpp

@@ -0,0 +1,84 @@
+/*!
+ * \file src/commands/CommandAnimate.cpp
+ * \brief Animate command
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Console.h"
+#include "Game.h"
+#include "OpenRaider.h"
+#include "Render.h"
+#include "World.h"
+#include "commands/CommandAnimate.h"
+
+std::string CommandAnimate::name() {
+    return "animate";
+}
+
+std::string CommandAnimate::brief() {
+    return "[BOOL|n|p] - Animate models";
+}
+
+void CommandAnimate::printHelp() {
+    getConsole() << "animate-Command Usage:" << Console::endl;
+    getConsole() << "  animate [n|p|BOOL]" << Console::endl;
+    getConsole() << "Where the commands have the following meaning:" << Console::endl;
+    getConsole() << "  BOOL to (de)activate animating all models" << Console::endl;
+    getConsole() << "  n to step all models to their next animation" << Console::endl;
+    getConsole() << "  p to step all models to their previous animation" << Console::endl;
+}
+
+int CommandAnimate::execute(std::istream& args) {
+    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+        getConsole() << "Use animate command interactively!" << Console::endl;
+        return -1;
+    }
+
+    if (args.peek() == 'n') {
+        // Step all skeletal models to their next animation
+        if (getRender().getFlags() & Render::fAnimateAllModels) {
+            for (unsigned int i = 0; i < getWorld().sizeEntity(); i++) {
+                Entity &e = getWorld().getEntity(i);
+                SkeletalModel &m = e.getModel();
+                if (e.getAnimation() < (m.size() - 1))
+                    e.setAnimation(e.getAnimation() + 1);
+                else
+                    e.setAnimation(0);
+            }
+        } else {
+            getConsole() << "Animations need to be enabled!" << Console::endl;
+        }
+    } else if (args.peek() == 'p') {
+        // Step all skeletal models to their previous animation
+        if (getRender().getFlags() & Render::fAnimateAllModels) {
+            for (unsigned int i = 0; i < getWorld().sizeEntity(); i++) {
+                Entity &e = getWorld().getEntity(i);
+                SkeletalModel &m = e.getModel();
+                if (e.getAnimation() > 0)
+                    e.setAnimation(e.getAnimation() - 1);
+                else
+                    if (m.size() > 0)
+                        e.setAnimation(m.size() - 1);
+            }
+        } else {
+            getConsole() << "Animations need to be enabled!" << Console::endl;
+        }
+    } else {
+        // Enable or disable animating all skeletal models
+        bool b = false;
+        if (!(args >> b)) {
+            getConsole() << "Pass BOOL to animate command!" << Console::endl;
+            return -2;
+        }
+        if (b)
+            getRender().setFlags(Render::fAnimateAllModels);
+        else
+            getRender().clearFlags(Render::fAnimateAllModels);
+        getConsole() << (b ? "Animating all models" : "No longer animating all models") << Console::endl;
+    }
+
+    return 0;
+}
+

src/commands/CommandBind.cpp

@@ -0,0 +1,63 @@
+/*!
+ * \file src/commands/CommandBind.cpp
+ * \brief Bind command
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Console.h"
+#include "OpenRaider.h"
+#include "commands/CommandBind.h"
+
+std::string CommandBind::name() {
+    return "bind";
+}
+
+std::string CommandBind::brief() {
+    return "bind a keyboard/mouse action";
+}
+
+void CommandBind::printHelp() {
+    getConsole() << "bind-Command Usage:" << Console::endl;
+    getConsole() << "  bind ACTION KEY" << Console::endl;
+    getConsole() << "Available Actions:" << Console::endl;
+    getConsole() << "  menu" << Console::endl;
+    getConsole() << "  console" << Console::endl;
+    getConsole() << "  forward" << Console::endl;
+    getConsole() << "  backward" << Console::endl;
+    getConsole() << "  left" << Console::endl;
+    getConsole() << "  right" << Console::endl;
+    getConsole() << "  jump" << Console::endl;
+    getConsole() << "  crouch" << Console::endl;
+    getConsole() << "  use" << Console::endl;
+    getConsole() << "  holster" << Console::endl;
+    getConsole() << "  walk" << Console::endl;
+    getConsole() << "Key-Format:" << Console::endl;
+    getConsole() << "  'a' or '1'    for character/number keys" << Console::endl;
+    getConsole() << "  \"leftctrl\"  for symbols and special keys" << Console::endl;
+}
+
+int CommandBind::execute(std::istream& args) {
+    std::string a, b;
+    if (!(args >> a >> b)) {
+        getConsole() << "Invalid use of bind-command" << Console::endl;
+        return -1;
+    } else {
+        ActionEvents e = stringToActionEvent(a.c_str());
+        if (e == ActionEventCount) {
+            getConsole() << "bind-Error: Unknown action (" << a << ")" << Console::endl;
+            return -2;
+        }
+
+        KeyboardButton c = stringToKeyboardButton(b.c_str());
+        if (c == unknownKey) {
+            getConsole() << "bind-Error: Unknown key (" << b << ")" << Console::endl;
+            return -3;
+        }
+
+        getOpenRaider().keyBindings[e] = c;
+        return 0;
+    }
+}
+

src/commands/CommandEngine.cpp

@@ -0,0 +1,109 @@
+/*!
+ * \file src/commands/CommandEngine.cpp
+ * \brief Engine commands
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Console.h"
+#include "Game.h"
+#include "Menu.h"
+#include "OpenRaider.h"
+#include "Render.h"
+#include "commands/CommandEngine.h"
+
+std::string CommandLoad::name() {
+    return "load";
+}
+
+std::string CommandLoad::brief() {
+    return "load a level file";
+}
+
+void CommandLoad::printHelp() {
+    getConsole() << "load-Command Usage:" << Console::endl;
+    getConsole() << "  load /path/to/level" << Console::endl;
+}
+
+int CommandLoad::execute(std::istream& args) {
+    if (!getOpenRaider().mRunning) {
+        getConsole() << "Use load command interactively!" << Console::endl;
+        return -1;
+    }
+
+    std::string map;
+    args >> map;
+    int error = getGame().loadLevel(map.c_str());
+    return error;
+}
+
+// --------------------------------------
+
+std::string CommandScreenshot::name() {
+    return "sshot";
+}
+
+std::string CommandScreenshot::brief() {
+    return "make a screenshot";
+}
+
+void CommandScreenshot::printHelp() {
+    getConsole() << "sshot-Command Usage:" << Console::endl;
+    getConsole() << "  sshot [console|menu]" << Console::endl;
+    getConsole() << "Add console/menu to capture them too" << Console::endl;
+}
+
+int CommandScreenshot::execute(std::istream& args) {
+    if (!getOpenRaider().mRunning) {
+        getConsole() << "Use sshot command interactively!" << Console::endl;
+        return -1;
+    }
+
+    std::string filename(getOpenRaider().mBaseDir);
+    filename += "/sshots/";
+    filename += VERSION_SHORT;
+
+    bool console = false, menu = false;
+    std::string temp;
+    args >> temp;
+    if (temp.compare("console") == 0)
+        console = true;
+    if (temp.compare("menu") == 0)
+        menu = true;
+
+    if (!console) {
+        getConsole().setVisible(false);
+        if (menu)
+            getMenu().setVisible(true);
+        getOpenRaider().frame();
+        getOpenRaider().frame(); // Double buffered
+    }
+
+    getRender().screenShot(filename.c_str());
+
+    if (!console) {
+        getConsole().setVisible(true);
+        if (menu)
+            getMenu().setVisible(false);
+    }
+
+    getConsole() << "Screenshot stored..." << Console::endl;
+    return 0;
+}
+
+// --------------------------------------
+
+std::string CommandQuit::name() {
+    return "quit";
+}
+
+std::string CommandQuit::brief() {
+    return "exit OpenRaider";
+}
+
+int CommandQuit::execute(std::istream& args) {
+    exit(0);
+    return 0;
+}
+

src/commands/CommandGame.cpp

@@ -0,0 +1,63 @@
+/*!
+ * \file src/commands/CommandGame.cpp
+ * \brief Game meta-commands
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Console.h"
+#include "Game.h"
+#include "OpenRaider.h"
+#include "World.h"
+#include "commands/CommandGame.h"
+
+std::string CommandPos::name() {
+    return "pos";
+}
+
+std::string CommandPos::brief() {
+    return "Print position info";
+}
+
+int CommandPos::execute(std::istream& args) {
+    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+        getConsole() << "Use pos command interactively!" << Console::endl;
+        return -1;
+    }
+
+    getGame().getLara().print();
+    return 0;
+}
+
+// --------------------------------------
+
+std::string CommandViewmodel::name() {
+    return "viewmodel";
+}
+
+std::string CommandViewmodel::brief() {
+    return "INT - Change Laras model";
+}
+
+int CommandViewmodel::execute(std::istream& args) {
+    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+        getConsole() << "Use viewmodel command interactively!" << Console::endl;
+        return -1;
+    }
+
+    //! \fixme Validate input
+
+    std::string s;
+    args >> s;
+    unsigned int n = atoi(s.c_str());
+
+    if (n < getWorld().sizeSkeletalModel()) {
+        getGame().getLara().setSkeletalModel(n);
+        return 0;
+    } else {
+        getConsole() << "Invalid SkeletalModel index!" << Console::endl;
+        return -2;
+    }
+}
+

src/commands/CommandMove.cpp

@@ -0,0 +1,53 @@
+/*!
+ * \file src/commands/CommandMove.cpp
+ * \brief Move command
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Console.h"
+#include "Game.h"
+#include "OpenRaider.h"
+#include "commands/CommandMove.h"
+
+std::string CommandMove::name() {
+    return "move";
+}
+
+std::string CommandMove::brief() {
+    return "[walk|fly|noclip]";
+}
+
+void CommandMove::printHelp() {
+    getConsole() << "move-Command Usage:" << Console::endl;
+    getConsole() << "  move COMMAND" << Console::endl;
+    getConsole() << "Where COMMAND is one of the following:" << Console::endl;
+    getConsole() << "  walk" << Console::endl;
+    getConsole() << "  fly" << Console::endl;
+    getConsole() << "  noclip" << Console::endl;
+}
+
+int CommandMove::execute(std::istream& args) {
+    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+        getConsole() << "Use move command interactively!" << Console::endl;
+        return -1;
+    }
+
+    std::string s;
+    args >> s;
+    if (s.compare("walk") == 0) {
+        getGame().getLara().setMoveType(Entity::MoveTypeWalk);
+    } else if (s.compare("fly") == 0) {
+        getGame().getLara().setMoveType(Entity::MoveTypeFly);
+    } else if (s.compare("noclip") == 0) {
+        getGame().getLara().setMoveType(Entity::MoveTypeNoClipping);
+    } else {
+        getConsole() << "Invalid use of move command (" << s << ")!" << Console::endl;
+        return -2;
+    }
+
+    getConsole() << s  << "ing" << Console::endl;
+    return 0;
+}
+

src/commands/CommandRender.cpp

@@ -0,0 +1,119 @@
+/*!
+ * \file src/commands/CommandRender.cpp
+ * \brief Renderer commands
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Console.h"
+#include "Game.h"
+#include "Render.h"
+#include "commands/CommandRender.h"
+
+std::string CommandMode::name() {
+    return "mode";
+}
+
+std::string CommandMode::brief() {
+    return "MODE - Render mode";
+}
+
+void CommandMode::printHelp() {
+    getConsole() << "mode-Command Usage:" << Console::endl;
+    getConsole() << "  mode MODE" << Console::endl;
+    getConsole() << "Where MODE is one of the following:" << Console::endl;
+    getConsole() << "  wireframe" << Console::endl;
+    getConsole() << "  solid" << Console::endl;
+    getConsole() << "  texture" << Console::endl;
+    getConsole() << "  vertexlight" << Console::endl;
+    getConsole() << "  titlescreen" << Console::endl;
+
+}
+
+int CommandMode::execute(std::istream& args) {
+    if (!getGame().isLoaded()) {
+        getConsole() << "Load a level to set the mode!" << Console::endl;
+        return -1;
+    }
+
+    std::string s;
+    args >> s;
+
+    if (s.compare("wireframe") == 0) {
+        getRender().setMode(Render::modeWireframe);
+        getConsole() << "Wireframe mode" << Console::endl;
+    } else if (s.compare("solid") == 0) {
+        getRender().setMode(Render::modeSolid);
+        getConsole() << "Solid mode" << Console::endl;
+    } else if (s.compare("texture") == 0) {
+        getRender().setMode(Render::modeTexture);
+        getConsole() << "Texture mode" << Console::endl;
+    } else if (s.compare("vertexlight") == 0) {
+        getRender().setMode(Render::modeVertexLight);
+        getConsole() << "Vertexlight mode" << Console::endl;
+    } else if (s.compare("titlescreen") == 0) {
+        getRender().setMode(Render::modeLoadScreen);
+        getConsole() << "Titlescreen mode" << Console::endl;
+    } else {
+        getConsole() << "Invalid use of mode command (" << s << ")!" << Console::endl;
+        return -2;
+    }
+
+    return 0;
+}
+
+// --------------------------------------
+
+std::string CommandFog::name() {
+    return "fog";
+}
+
+std::string CommandFog::brief() {
+    return "BOOL - GL Fog";
+}
+
+int CommandFog::execute(std::istream& args) {
+    bool b;
+    args >> b;
+    if (!args) {
+        getConsole() << "Pass BOOL to fog command!" << Console::endl;
+        return -1;
+    }
+
+    if (b)
+        getRender().setFlags(Render::fFog);
+    else
+        getRender().clearFlags(Render::fFog);
+
+    getConsole() << "Fog is now " << (b ? "on" : "off") << Console::endl;
+    return 0;
+}
+
+// --------------------------------------
+
+std::string CommandLight::name() {
+    return "light";
+}
+
+std::string CommandLight::brief() {
+    return "BOOL - GL Lights";
+}
+
+int CommandLight::execute(std::istream& args) {
+    bool b;
+    args >> b;
+    if (!args) {
+        getConsole() << "Pass BOOL to light command!" << Console::endl;
+        return -1;
+    }
+
+    if (b)
+        getRender().setFlags(Render::fGL_Lights);
+    else
+        getRender().clearFlags(Render::fGL_Lights);
+
+    getConsole() << "GL-Lights are now " << (b ? "on" : "off") << Console::endl;
+    return 0;
+}
+

src/commands/CommandSet.cpp

@@ -0,0 +1,168 @@
+/*!
+ * \file src/commands/CommandSet.cpp
+ * \brief Set command
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Camera.h"
+#include "Console.h"
+#include "Font.h"
+#include "OpenRaider.h"
+#include "Sound.h"
+#include "Window.h"
+#include "utils/strings.h"
+#include "commands/CommandSet.h"
+
+std::string CommandSet::name() {
+    return "set";
+}
+
+std::string CommandSet::brief() {
+    return "set a parameter";
+}
+
+void CommandSet::printHelp() {
+    getConsole() << "set-Command Usage:" << Console::endl;
+    getConsole() << "  set VAR VAL" << Console::endl;
+    getConsole() << "Available Variables:" << Console::endl;
+    getConsole() << "  basedir    STRING" << Console::endl;
+    getConsole() << "  pakdir     STRING" << Console::endl;
+    getConsole() << "  audiodir   STRING" << Console::endl;
+    getConsole() << "  datadir    STRING" << Console::endl;
+    getConsole() << "  font       STRING" << Console::endl;
+    getConsole() << "  size       INT INT" << Console::endl;
+    getConsole() << "  fullscreen BOOL" << Console::endl;
+    getConsole() << "  audio      BOOL" << Console::endl;
+    getConsole() << "  volume     BOOL" << Console::endl;
+    getConsole() << "  mouse_x    FLOAT" << Console::endl;
+    getConsole() << "  mouse_y    FLOAT" << Console::endl;
+    getConsole() << "  fps        BOOL" << Console::endl;
+    getConsole() << "Enclose STRINGs with \"\"!" << Console::endl;
+}
+
+namespace {
+    char *expandDirectoryNames(const char *s) {
+        assert(s != NULL);
+        assert(s[0] != '\0');
+
+        char *result = bufferString("%s", s);
+
+        if (getOpenRaider().mPakDir != NULL) {
+            char *tmp = stringReplace(s, "$(pakdir)", getOpenRaider().mPakDir);
+            delete [] result;
+            result = tmp;
+        }
+
+        if (getOpenRaider().mAudioDir != NULL) {
+            char *tmp = stringReplace(s, "$(audiodir)", getOpenRaider().mAudioDir);
+            delete [] result;
+            result = tmp;
+        }
+
+        if (getOpenRaider().mDataDir != NULL) {
+            char *tmp = stringReplace(s, "$(datadir)", getOpenRaider().mDataDir);
+            delete [] result;
+            result = tmp;
+        }
+
+        if (getOpenRaider().mBaseDir != NULL) {
+            char *tmp = stringReplace(result, "$(basedir)", getOpenRaider().mBaseDir);
+            delete [] result;
+            result = tmp;
+        }
+
+        return result;
+    }
+}
+
+#define CHANGE_DIR_WITH_EXPANSION(a) do {     \
+    std::string temp;                         \
+    args >> temp;                             \
+    const char *value = temp.c_str();         \
+    char *quotes = stringRemoveQuotes(value); \
+    char *tmp = expandDirectoryNames(quotes); \
+    a = fullPath(tmp, 0);                     \
+    delete [] tmp;                            \
+    delete [] quotes;                         \
+} while(false)
+
+int CommandSet::execute(std::istream& args) {
+    std::string var;
+    args >> var;
+
+    if (var.compare("size") == 0) {
+        unsigned int w = DEFAULT_WIDTH, h = DEFAULT_HEIGHT;
+        if (!(args >> w >> h)) {
+            getConsole() << "set-size-Error: Invalid value(s)" << Console::endl;
+            return -2;
+        }
+        getWindow().setSize(w, h);
+    } else if (var.compare("fullscreen") == 0) {
+        bool fullscreen = false;
+        if (!(args >> fullscreen)) {
+            getConsole() << "set-fullscreen-Error: Invalid value" << Console::endl;
+            return -3;
+        }
+        getWindow().setFullscreen(fullscreen);
+    } else if (var.compare("audio") == 0) {
+        bool audio = false;
+        if (!(args >> audio)) {
+            getConsole() << "set-audio-Error: Invalid value" << Console::endl;
+            return -4;
+        }
+        getSound().setEnabled(audio);
+    } else if (var.compare("volume") == 0) {
+        float vol = 1.0f;
+        if (!(args >> vol)) {
+            getConsole() << "set-volume-Error: Invalid value" << Console::endl;
+            return -5;
+        }
+        getSound().setVolume(vol);
+    } else if (var.compare("mouse_x") == 0) {
+        float sense = 1.0f;
+        if (!(args >> sense)) {
+            getConsole() << "set-mouse_x-Error: Invalid value" << Console::endl;
+            return -6;
+        }
+        getCamera().setSensitivityX(OR_DEG_TO_RAD(sense));
+    } else if (var.compare("mouse_y") == 0) {
+        float sense = 1.0f;
+        if (!(args >> sense)) {
+            getConsole() << "set-mouse_y-Error: Invalid value" << Console::endl;
+            return -7;
+        }
+        getCamera().setSensitivityY(OR_DEG_TO_RAD(sense));
+    } else if (var.compare("fps") == 0) {
+        bool fps = false;
+        if (!(args >> fps)) {
+            getConsole() << "set-fps-Error: Invalid value" << Console::endl;
+            return -8;
+        }
+        getOpenRaider().mFPS = fps;
+    } else if (var.compare("basedir") == 0) {
+        CHANGE_DIR_WITH_EXPANSION(getOpenRaider().mBaseDir);
+    } else if (var.compare("pakdir") == 0) {
+        CHANGE_DIR_WITH_EXPANSION(getOpenRaider().mPakDir);
+    } else if (var.compare("audiodir") == 0) {
+        CHANGE_DIR_WITH_EXPANSION(getOpenRaider().mAudioDir);
+    } else if (var.compare("datadir") == 0) {
+        CHANGE_DIR_WITH_EXPANSION(getOpenRaider().mDataDir);
+    } else if (var.compare("font") == 0) {
+        std::string temp;
+        args >> temp;
+        const char *value = temp.c_str();
+        char *quotes = stringReplace(value, "\"", "");
+        char *tmp = expandDirectoryNames(quotes);
+        getFont().setFont(tmp);
+        delete [] tmp;
+        delete [] quotes;
+    } else {
+        getConsole() << "set-Error: Unknown variable (" << var.c_str() << ")" << Console::endl;
+        return -1;
+    }
+
+    return 0;
+}
+

src/commands/CommandSound.cpp

@@ -0,0 +1,42 @@
+/*!
+ * \file src/commands/CommandSound.cpp
+ * \brief Sound command
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Console.h"
+#include "Game.h"
+#include "OpenRaider.h"
+#include "Sound.h"
+#include "commands/CommandSound.h"
+
+std::string CommandSound::name() {
+    return "sound";
+}
+
+std::string CommandSound::brief() {
+    return "INT - Test play sound";
+}
+
+void CommandSound::printHelp() {
+    getConsole() << "sound-Command Usage:" << Console::endl;
+    getConsole() << "sound-Command Usage:" << Console::endl;
+    getConsole() << "  sound INT" << Console::endl;
+    getConsole() << "Where INT is a valid sound ID integer" << Console::endl;
+}
+
+int CommandSound::execute(std::istream& args) {
+    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+        getConsole() << "Use sound command interactively!" << Console::endl;
+        return -1;
+    }
+
+    std::string s;
+    args >> s;
+
+    getSound().play(atoi(s.c_str()));
+    return 0;
+}
+

src/commands/OldCommands.cpp

@@ -0,0 +1,161 @@
+/*!
+ * \file src/Command.cpp
+ * \brief OpenRaider command implementation
+ *
+ * \author xythobuz
+ */
+
+#include <fstream>
+#include <sstream>
+
+#include "global.h"
+#include "Camera.h"
+#include "Console.h"
+#include "Entity.h"
+#include "Font.h"
+#include "Game.h"
+#include "math/math.h"
+#include "Menu.h"
+#include "Render.h"
+#include "Sound.h"
+#include "TombRaider.h"
+#include "Window.h"
+#include "World.h"
+#include "utils/strings.h"
+#include "utils/time.h"
+#include "OpenRaider.h"
+
+int OpenRaider::command(std::string c) {
+    // Remove comment, if any
+    size_t comment = c.find_first_of('#');
+    if (comment != std::string::npos)
+        c.erase(comment);
+
+    // Execute command
+    std::stringstream command(c);
+    std::string cmd;
+    command >> cmd;
+    command >> std::boolalpha >> std::ws;
+
+    if (cmd.length() == 0)
+        return 0;
+
+    if (cmd.compare("help") == 0) {
+        std::string tmp;
+        if (!(command >> tmp)) {
+/*
+            getConsole() << "  ralpha    - BOOL - Room Alpha" << Console::endl;
+            getConsole() << "  upf       - BOOL - Update Room List Per Frame" << Console::endl;
+            getConsole() << "  entmodel  - BOOL" << Console::endl;
+            getConsole() << "  ponytail  - BOOL" << Console::endl;
+            getConsole() << "  pigtail   - BOOL" << Console::endl;
+            getConsole() << "  ponypos   - FLOAT FLOAT FLOAT FLOAT - x y z angle" << Console::endl;
+*/
+        } else {
+            return help(tmp);
+        }
+/*
+    } else if (cmd.compare("ralpha") == 0) {
+        if (args->size() > 0) {
+            bool b;
+            if (readBool(args->at(0), &b) < 0) {
+                getConsole().print("Pass BOOL to ralpha command!");
+                return -24;
+            }
+            if (b)
+                getRender().setFlags(Render::fRoomAlpha);
+            else
+                getRender().clearFlags(Render::fRoomAlpha);
+            getConsole().print("Room Alpha is now %s", b ? "on" : "off");
+        } else {
+            getConsole().print("Invalid use of ralpha-command!");
+            return -25;
+        }
+    } else if (cmd.compare("upf") == 0) {
+        if (args->size() > 0) {
+            bool b;
+            if (readBool(args->at(0), &b) < 0) {
+                getConsole().print("Pass BOOL to upf command!");
+                return -30;
+            }
+            if (b)
+                getRender().setFlags(Render::fUpdateRoomListPerFrame);
+            else
+                getRender().clearFlags(Render::fUpdateRoomListPerFrame);
+            getConsole().print("URLPF is now %s", b ? "on" : "off");
+        } else {
+            getConsole().print("Invalid use of upf-command!");
+            return -31;
+        }
+    } else if (cmd.compare("entmodel") == 0) {
+        if (args->size() > 0) {
+            bool b;
+            if (readBool(args->at(0), &b) < 0) {
+                getConsole().print("Pass BOOL to entmodel command!");
+                return -38;
+            }
+            if (b)
+                getRender().setFlags(Render::fEntityModels);
+            else
+                getRender().clearFlags(Render::fEntityModels);
+            getConsole().print("Entmodels are now %s", b ? "on" : "off");
+        } else {
+            getConsole().print("Invalid use of entmodel-command!");
+            return -39;
+        }
+    } else if (cmd.compare("ponytail") == 0) {
+        if (args->size() > 0) {
+            bool b;
+            if (readBool(args->at(0), &b) < 0) {
+                getConsole().print("Pass BOOL to ponytail command!");
+                return -44;
+            }
+            if (b)
+                getRender().setFlags(Render::fRenderPonytail);
+            else
+                getRender().clearFlags(Render::fRenderPonytail);
+            getConsole().print("Ponytail is now %s", b ? "on" : "off");
+        } else {
+            getConsole().print("Invalid use of ponytail-command!");
+            return -45;
+        }
+    } else if (cmd.compare("pigtail") == 0) {
+        if ((!mRunning) || (!getGame().isLoaded())) {
+            getConsole().print("Use pigtail command interactively!");
+            return -999;
+        }
+        if (args->size() > 0) {
+            bool b;
+            if (readBool(args->at(0), &b) < 0) {
+                getConsole().print("Pass BOOL to pigtail command!");
+                return -46;
+            }
+            SkeletalModel &tmp = getGame().getLara().getModel();
+            tmp.setPigTail(b);
+            getConsole().print("Pigtail is now %s", b ? "on" : "off");
+        } else {
+            getConsole().print("Invalid use of pigtail-command!");
+            return -47;
+        }
+    } else if (cmd.compare("ponypos") == 0) {
+        if ((!mRunning) || (!getGame().isLoaded())) {
+            getConsole().print("Use ponypos command interactively!");
+            return -999;
+        }
+        if (args->size() > 3) {
+            SkeletalModel &tmp = getGame().getLara().getModel();
+            tmp.setPonyPos((float)atof(args->at(0)), (float)atof(args->at(1)),
+                    (float)atof(args->at(2)), (float)atof(args->at(3)));
+        } else {
+            getConsole().print("Invalid use of ponypos-command!");
+            return -48;
+        }
+*/
+    } else {
+        getConsole() << "Unknown command: " << cmd.c_str() << Console::endl;
+        return -50;
+    }
+
+    return 0;
+}
+