Added main.h, removed rc_ methods.

include/Sound.h

@@ -2,8 +2,8 @@
  * \file include/Sound.h
  * \brief This is the audio manager Header
  *
- * \author xythobuz
  * \author Mongoose
+ * \author xythobuz
  */
 
 #ifndef _SOUND_H_
@@ -109,3 +109,4 @@ private:
 };
 
 #endif
+

include/main.h

@@ -0,0 +1,24 @@
+/*!
+ * \file include/main.h
+ * \brief Where main() is
+ *
+ * \author xythobuz
+ */
+#ifndef _MAIN_H_
+#define _MAIN_H_
+
+/*!
+ * \brief atexit() handler
+ */
+void cleanupHandler(void);
+
+/*!
+ * \brief Program entry point
+ * \param argc number of arguments
+ * \param argv array with argc strings
+ * \returns 0 on success
+ */
+int main(int argc, char *argv[]);
+
+#endif
+

include/math/Matrix.h

@@ -199,3 +199,4 @@ private:
 };
 
 #endif
+

include/math/Quaternion.h

@@ -199,3 +199,4 @@ private:
 };
 
 #endif
+

include/math/Vector3d.h

@@ -158,3 +158,4 @@ public:
 };
 
 #endif
+

include/math/math.h

@@ -69,3 +69,4 @@ void helMidpoint3v(vec3_t a, vec3_t b, vec3_t mid);
 vec_t helRandomNum(vec_t from, vec_t to);
 
 #endif
+

include/utils/strings.h

@@ -41,21 +41,5 @@ char *bufferString(const char *string, ...) __attribute__((format(printf, 1, 2))
  */
 char *fullPath(const char *path, char end);
 
-/*!
- * \brief Checks if Command matches Symbol.
- * Returns the rest of the argument list back in command buffer, if any
- * \param symbol command string
- * \param command with arguments
- * \returns true if command matches symbol
- */
-bool rc_command(const char *symbol, char *command);
-
-/*!
- * \brief Interpret a string as a bool
- * \param buffer "true" or "false"
- * \param val is set to boolean interpretation of buffer
- * \returns -1 for null string, -2 if string is not "true" or "false"
- */
-int rc_get_bool(const char *buffer, bool *val);
-
 #endif
+

include/utils/tga.h

@@ -87,3 +87,4 @@ int tgaSaveFilename(unsigned char *image,
     __attribute__((format(printf, 5, 6)));
 
 #endif
+

include/utils/time.h

@@ -30,3 +30,4 @@ unsigned int systemTimerGet();
 void systemTimerReset();
 
 #endif
+

src/Sound.cpp

@@ -2,8 +2,8 @@
  * \file src/Sound.cpp
  * \brief This is the audio manager Implementation
  *
- * \author xythobuz
  * \author Mongoose
+ * \author xythobuz
  */
 
 #ifdef __APPLE__
@@ -122,8 +122,7 @@ void Sound::sourceAt(int source, float pos[3]) {
 }
 
 //! \fixme Seperate sourcing and buffering, Mongoose 2002.01.04
-int Sound::addFile(const char *filename, int *source, unsigned int flags)
-{
+int Sound::addFile(const char *filename, int *source, unsigned int flags) {
     ALsizei size;
     ALfloat freq;
     ALenum format;

src/main.cpp

@@ -9,6 +9,7 @@
 #include <stdio.h>
 
 #include "config.h"
+#include "main.h"
 
 void cleanupHandler() {
 
@@ -28,3 +29,4 @@ int main(int argc, char *argv[]) {
 
     return 0;
 }
+

src/utils/strings.cpp

@@ -74,16 +74,20 @@ char *fullPath(const char *path, char end) {
 
     if (path[0] == '~') {
 #if defined(unix) || defined(__APPLE__)
+
 #ifdef __APPLE__
         // Workaround for Mac OS X. See:
         // http://stackoverflow.com/questions/20534788/why-does-wordexp-fail-with-wrde-syntax-on-os-x
         signal(SIGCHLD, SIG_DFL);
 #endif
+
         // Expand string into segments
         int res = wordexp(path, &word, 0);
+
 #ifdef __APPLE__
         signal(SIGCHLD, SIG_IGN);
 #endif
+
         if (res != 0) {
             printf("fullPath> wordexp() failed: %d\n", res);
             return NULL;
@@ -108,7 +112,7 @@ char *fullPath(const char *path, char end) {
 
         wordfree(&word);
 #else
-        printf("WARNING: Tilde expansion not supported on this platform!\n");
+        printf("WARNING: Tilde expansion not supported on this platform:\n\t%s\n", path);
         lenPath = strlen(path);
         dir = new char[lenPath + 2]; // space for end char
         strncpy(dir, path, lenPath);
@@ -130,42 +134,3 @@ char *fullPath(const char *path, char end) {
     return dir;
 }
 
-bool rc_command(const char *symbol, char *command) {
-    assert(symbol != NULL);
-    assert(symbol[0] != '\0');
-    assert(command != NULL);
-    assert(command[0] != '\0');
-
-    int lens = strlen(symbol);
-
-    if (strncmp(command, symbol, lens) == 0) {
-        int lenc = strlen(command);
-
-        //! \fixme Should ignore whitespace, but only if it is really there...?
-        // lens+1 skips '=' or ' '
-        for (int i = 0, j = lens+1; j < lenc; ++i, ++j) {
-            command[i] = command[j];
-            command[i+1] = 0;
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-int rc_get_bool(const char *buffer, bool *val) {
-    assert(buffer != NULL);
-    assert(buffer[0] != '\0');
-    assert(val != NULL);
-
-    if ((buffer[0] == '1') || (strncmp(buffer, "true", 4) == 0))
-        *val = true;
-    else if ((buffer[0] == '0') || (strncmp(buffer, "false", 5) == 0))
-        *val = false;
-    else
-        return -2;
-
-    return 0;
-}
-