Started implementing command system.

Config file now ends with ini instead of init.

README.md

@@ -13,7 +13,7 @@ It seems as if OpenRaider will currently only work on Little-Endian platforms. T
 OpenRaider needs some configuration files, and level data and assets from custom levels or the Tomb Raider games.
 These are stored in `~/.OpenRaider`. Running `make setup` will create/copy the necessary files and directories.
 
-You still need to add level files in `~/.OpenRaider/paks/` and add them to `~/.OpenRaider/OpenRaider.init`.
+You still need to add level files in `~/.OpenRaider/paks/` and add them to `~/.OpenRaider/OpenRaider.ini`.
 Dust off your old Tomb Raider CDs or grab some [custom levels](http://www.aspidetr.com/levels/yvel-woods-v1-5/) from the interwebs.
 
 ## Documentation
@@ -71,7 +71,7 @@ A Doxygen API documentation can be created with `make doc`.
 
 ### Configuration file
 
-OpenRaider will try to load `~/.OpenRaider/OpenRaider.init` or, if it doesn't exist, `OpenRaider.init` from the current directory.
+OpenRaider will try to load `~/.OpenRaider/OpenRaider.ini` or, if it doesn't exist, `OpenRaider.ini` from the current directory.
 Running `make setup` will create a minimal configuration in your home directory.
 
 The configuration file format is very simple:

cmake/setup.sh

@@ -2,7 +2,7 @@
 
 echo "Setting up OpenRaider for user $USER..."
 mkdir -p ~/.OpenRaider
-cp data/OpenRaider.init ~/.OpenRaider/
+cp data/OpenRaider.ini ~/.OpenRaider/
 mkdir -p ~/.OpenRaider/paks
 mkdir -p ~/.OpenRaider/music
 mkdir -p ~/.OpenRaider/data

cmake/setup_mac.sh

@@ -3,7 +3,7 @@ cd `dirname $0`
 if [ ! -d "${HOME}/.OpenRaider" ]; then
     echo "Setting up OpenRaider for user $USER..."
     mkdir -p ~/.OpenRaider
-    cp ../Resources/defaults/OpenRaider.init ~/.OpenRaider/
+    cp ../Resources/defaults/OpenRaider.ini ~/.OpenRaider/
     mkdir -p ~/.OpenRaider/paks
     mkdir -p ~/.OpenRaider/music
     mkdir -p ~/.OpenRaider/data
@@ -11,7 +11,7 @@ if [ ! -d "${HOME}/.OpenRaider" ]; then
     cp ../Resources/defaults/*.tga ~/.OpenRaider/data
     cp ../Resources/defaults/*.ttf ~/.OpenRaider/data
     echo "DONE"
-    osascript -e 'tell app "System Events" to display alert "Initial Configuration stored in ~/.OpenRaider\n\nView and edit OpenRaider.init to your needs..."'
+    osascript -e 'tell app "System Events" to display alert "Initial Configuration stored in ~/.OpenRaider\n\nView and edit OpenRaider.ini to your needs..."'
 fi
 if [[ ! -n `find "${HOME}/.OpenRaider/paks" -type f -exec echo Found {} \;` ]]; then
     echo "Missing level files!"

include/Config.h.in

@@ -2,7 +2,7 @@
 #define BUILD_HOST "@OpenRaider_BUILD_HOST@ @OpenRaider_HOSTNAME@"
 
 #define DEFAULT_CONFIG_PATH "~/.OpenRaider/"
-#define DEFAULT_CONFIG_FILE "OpenRaider.init"
+#define DEFAULT_CONFIG_FILE "OpenRaider.ini"
 #define DEFAULT_WIDTH 640
 #define DEFAULT_HEIGHT 480
 

include/OpenRaider.h

@@ -8,6 +8,8 @@
 #ifndef _OPENRAIDER_H_
 #define _OPENRAIDER_H_
 
+#include <vector>
+
 #include "Window.h"
 
 /*!
@@ -32,6 +34,14 @@ public:
      */
     int loadConfig(const char *config);
 
+    int command(const char *command);
+
+    int command(const char *command, std::vector<char *> *args);
+
+    int set(const char *var, const char *value);
+
+    int bind(const char *action, const char *key);
+
     int initialize();
 
     void run();

include/utils/strings.h

@@ -10,6 +10,9 @@
 #define _UTILS_STRINGS_H_
 
 #include <cstdarg>
+#include <vector>
+
+void printStringVector(std::vector<char *> *args);
 
 /*!
  * \brief Check if a string ends with another string.

src/CMakeLists.txt

@@ -72,7 +72,7 @@ if (APPLE)
     set (SRCS ${SRCS} ${MAC_ICON})
 
     # Copy Data
-    set (MAC_DATA "../data/OpenRaider.init" "../data/test.ttf")
+    set (MAC_DATA "../data/OpenRaider.ini" "../data/test.ttf")
     set (MAC_DATA ${MAC_DATA} "../data/snow.tga" "../data/snow2.tga" "../data/splash.tga")
     set_source_files_properties (${MAC_DATA} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/defaults)
     set (SRCS ${SRCS} ${MAC_DATA})

src/OpenRaider.cpp

@@ -6,6 +6,7 @@
  */
 
 #include <cstdio>
+#include <cstring>
 #include <assert.h>
 
 #include "WindowSDL.h"
@@ -20,7 +21,8 @@
 OpenRaider::OpenRaider() {
     mInit = false;
     mRunning = false;
-    mWindow = NULL;
+
+    mWindow = new WindowSDL();
 }
 
 OpenRaider::~OpenRaider() {
@@ -30,20 +32,158 @@ OpenRaider::~OpenRaider() {
 
 int OpenRaider::loadConfig(const char *config) {
     assert(config != NULL);
+    assert(config[0] != '\0');
 
     char *configFile = fullPath(config, 0);
-    printf("Trying to load \"%s\"...\n", configFile);
+    printf("Loading config from \"%s\"...\n", configFile);
+
+    FILE *f = fopen(configFile, "r");
+    if (f == NULL) {
+        printf("Could not open file!\n");
+        return -1;
+    }
+
+    char buffer[256];
+    while (fgets(buffer, 256, f) != NULL) {
+        command(buffer);
+    }
+
+    fclose(f);
+
+    return 0;
+}
+
+int OpenRaider::command(const char *command) {
+    assert(command != NULL);
+    assert(command[0] != '\0');
+
+    int returnValue = 0;
+    char *cmd = bufferString("%s", command);
+    size_t length = strlen(cmd);
+
+    // Command ends at '\n' or # when a comment begins
+    for (size_t i = 0; i < length; i++) {
+        if (cmd[i] == '\n' || cmd[i] == '#') {
+            cmd[i] = '\0';
+            break;
+        }
+    }
+
+    char *token = strtok(cmd, " \t");
+    if (token != NULL) {
+        // token is the command to execute
+        // get arguments
+        std::vector<char *> args;
+        char *next;
+        while ((next = strtok(NULL, " \t")) != NULL) {
+            args.push_back(next);
+        }
+
+        // Execute
+        returnValue = this->command(token, &args);
+    }
+
+    free(cmd);
+    return returnValue;
+}
+
+int OpenRaider::command(const char *command, std::vector<char *> *args) {
+    assert(command != NULL);
+    assert(command[0] != '\0');
+    assert(args != NULL);
+
+    if (strcmp(command, "set") == 0) {
+        if (args->size() != 2) {
+            printf("Invalid use of set-command ");
+            printStringVector(args);
+            printf("\n");
+            return -2;
+        } else {
+            return set(args->at(0), args->at(1));
+        }
+    } else if (strcmp(command, "bind") == 0) {
+        if (args->size() != 2) {
+            printf("Invalid use of bind-command ");
+            printStringVector(args);
+            printf("\n");
+            return -3;
+        } else {
+            return bind(args->at(0), args->at(1));
+        }
+    } else {
+        printf("Unknown command: %s ", command);
+        printStringVector(args);
+        printf("\n");
+        return -1;
+    }
+}
+
+int OpenRaider::set(const char *var, const char *value) {
+    if (strcmp(var, "size") == 0) {
+        // value has format like "\"1024x768\""
+        unsigned int w = DEFAULT_WIDTH, h = DEFAULT_HEIGHT;
+        if (sscanf(value, "\"%dx%d\"", &w, &h) != 2) {
+            printf("set-size-Error: Invalid value (%s)\n", value);
+            return -2;
+        }
+        mWindow->setSize(w, h);
+    } else if (strcmp(var, "fullscreen") == 0) {
+
+    } else if (strcmp(var, "gldriver") == 0) {
+
+    } else if (strcmp(var, "audio") == 0) {
+
+    } else if (strcmp(var, "volume") == 0) {
+
+    } else if (strcmp(var, "mouse_x") == 0) {
+
+    } else if (strcmp(var, "mouse_y") == 0) {
+
+    } else if (strcmp(var, "basedir") == 0) {
+
+    } else if (strcmp(var, "pakdir") == 0) {
+
+    } else if (strcmp(var, "audiodir") == 0) {
+
+    } else if (strcmp(var, "datadir") == 0) {
+
+    } else if (strcmp(var, "font") == 0) {
+
+    } else {
+        printf("set-Error: Unknown variable (%s = %s)\n", var, value);
+        return -1;
+    }
 
     return 0;
 }
 
+int OpenRaider::bind(const char *action, const char *key) {
+    if (strcmp(action, "console") == 0) {
+
+    } else if (strcmp(action, "forward") == 0) {
+
+    } else if (strcmp(action, "backward") == 0) {
+
+    } else if (strcmp(action, "jump") == 0) {
+
+    } else if (strcmp(action, "crouch") == 0) {
+
+    } else if (strcmp(action, "left") == 0) {
+
+    } else if (strcmp(action, "right") == 0) {
+
+    } else {
+        printf("bind-Error: Unknown action (%s --> %s)\n", key, action);
+        return -1;
+    }
+    return 0;
+}
+
 int OpenRaider::initialize() {
-    assert(mWindow == NULL);
     assert(mInit == false);
     assert(mRunning == false);
 
     // Initialize Windowing
-    mWindow = new WindowSDL();
     if (mWindow->initialize() != 0)
         return -1;
 

src/utils/strings.cpp

@@ -17,6 +17,16 @@
 
 #include "utils/strings.h"
 
+void printStringVector(std::vector<char *> *args) {
+    printf("(");
+    for (std::vector<char *>::size_type i = 0; i < args->size(); i++) {
+        printf("%s", args->at(i));
+        if (i < (args->size() - 1))
+            printf(" ");
+    }
+    printf(")");
+}
+
 bool stringEndsWith(const char *str, const char *suffix) {
     assert(str != NULL);
     assert(suffix != NULL);