Added (pretty empty) OpenRaider main Singleton

include/OpenRaider.h

@@ -0,0 +1,36 @@
+/*!
+ * \file include/OpenRaider.h
+ * \brief Main Game Object
+ *
+ * \author xythobuz
+ */
+
+#ifndef _OPENRAIDER_H_
+#define _OPENRAIDER_H_
+
+/*!
+ * \brief Main Game Singleton
+ */
+class OpenRaider {
+public:
+
+    /*!
+     * \brief Constructs an object of OpenRaider
+     */
+    OpenRaider();
+
+    /*!
+     * \brief Deconstructs an object of OpenRaider
+     */
+    ~OpenRaider();
+
+    /*!
+     * \brief Load the configuration file
+     * \returns 0 on success
+     */
+    int loadConfig(const char *config);
+
+private:
+};
+
+#endif

include/main.h

@@ -7,6 +7,8 @@
 #ifndef _MAIN_H_
 #define _MAIN_H_
 
+extern OpenRaider *gOpenRaider; //!< Main Game Singleton
+
 /*!
  * \brief atexit() handler
  */

include/utils/strings.h

@@ -9,6 +9,8 @@
 #ifndef _UTILS_STRINGS_H_
 #define _UTILS_STRINGS_H_
 
+#include <cstdarg>
+
 /*!
  * \brief Check if a string ends with another string.
  * \param str string to check

src/CMakeLists.txt

@@ -1,5 +1,6 @@
 # Set Source files
 set (SRCS ${SRCS} "main.cpp")
+set (SRCS ${SRCS} "OpenRaider.cpp")
 set (SRCS ${SRCS} "Sound.cpp")
 
 #################################################################

src/OpenRaider.cpp

@@ -0,0 +1,26 @@
+/*!
+ * \file src/OpenRaider.cpp
+ * \brief Main Game Object
+ *
+ * \author xythobuz
+ */
+
+#include <cstdio>
+
+#include "utils/strings.h"
+#include "OpenRaider.h"
+
+OpenRaider::OpenRaider() {
+}
+
+OpenRaider::~OpenRaider() {
+}
+
+int OpenRaider::loadConfig(const char *config) {
+    char *configFile = fullPath(config, 0);
+
+    printf("Trying to load \"%s\"...\n", configFile);
+
+    return -1;
+}
+

src/main.cpp

@@ -5,27 +5,73 @@
  * \author xythobuz
  */
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #include "config.h"
+#include "OpenRaider.h"
 #include "main.h"
 
-void cleanupHandler() {
+#define DEFAULT_CONFIG_PATH "~/.OpenRaider/"
+#define DEFAULT_CONFIG_FILE "OpenRaider.init"
+
+OpenRaider *gOpenRaider = NULL;
 
+void cleanupHandler() {
+    if (gOpenRaider)
+        delete gOpenRaider;
 }
 
 int main(int argc, char *argv[]) {
+    const char *config = NULL;
+
+    // Handle arguments
     if (argc == 1) {
         // Use default rc file path
+        config = DEFAULT_CONFIG_PATH DEFAULT_CONFIG_FILE;
     } else if (argc == 2) {
-        // Use provided rc file
+        // Check for command line switches
+        if ((strcmp("-h", argv[1]) == 0)
+                || (strcmp("--help", argv[1]) == 0)) {
+            // Display help text
+            printf("%s [OPTIONS | /path/to/config]\n"
+                    "Options:\n"
+                    "\t--help\n\t-h\tDisplay this help text\n"
+                    "\t--version\n\t-v\tDisplay version information\n"
+                    "If no options are given, the default config will be loaded from:\n"
+                    "\t" DEFAULT_CONFIG_PATH DEFAULT_CONFIG_FILE "\n", argv[0]);
+            return 0;
+        } else if ((strcmp("-v", argv[1]) == 0)
+                || (strcmp("--version", argv[1]) == 0)) {
+            // Display version
+            printf(VERSION "\n");
+            return 0;
+        } else {
+            // Interpret as rc file name
+            config = argv[1];
+        }
     } else {
-        printf("Usage:\n%s [/path/to/config.file]\n", argv[0]);
+        printf("Usage:\n%s -h\n", argv[0]);
         return 1;
     }
 
+    // Create globals
     atexit(cleanupHandler);
+    printf("Initializing " VERSION "\n");
+    gOpenRaider = new OpenRaider();
+
+    // Try to load a configuration
+    if (gOpenRaider->loadConfig(config) != 0) {
+        if (gOpenRaider->loadConfig(DEFAULT_CONFIG_PATH DEFAULT_CONFIG_FILE) != 0) {
+            if (gOpenRaider->loadConfig(DEFAULT_CONFIG_FILE) != 0) {
+                printf("Could not find a config file. Aborting...\n");
+                return 2;
+            }
+        }
+    }
+
+    // Initialize the "subsystems"
 
     return 0;
 }

src/utils/strings.cpp

@@ -6,7 +6,6 @@
  * \author Mongoose
  */
 
-#include <cstdarg>
 #include <cstdlib>
 #include <stdio.h>
 #include <string.h>