Removed useless global variables.

Also added more asserts()

src/Mesh.cpp

@@ -5,6 +5,9 @@
  * \author Mongoose
  */
 
+#include <stdlib.h>
+#include <assert.h>
+
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #else
@@ -571,10 +574,7 @@ void Mesh::bufferVertexArray(unsigned int vertexCount, vec_t *vertices)
 void Mesh::setColor(unsigned int index,
         float r, float g, float b, float a)
 {
-    if (index > mNumColors)
-    {
-        return;
-    }
+    assert(index < mNumColors);
 
     mColors[index][0] = r;
     mColors[index][1] = g;
@@ -585,10 +585,7 @@ void Mesh::setColor(unsigned int index,
 
 void Mesh::setColor(unsigned int index, float rgba[4])
 {
-    if (index > mNumColors)
-    {
-        return;
-    }
+    assert(index < mNumColors);
 
     mColors[index][0] = rgba[0];
     mColors[index][1] = rgba[1];
@@ -599,10 +596,7 @@ void Mesh::setColor(unsigned int index, float rgba[4])
 
 void Mesh::setNormal(unsigned int index, float i, float j, float k)
 {
-    if (index > mNumNormals)
-    {
-        return;
-    }
+    assert(index < mNumNormals);
 
     mNormals[index][0] = i;
     mNormals[index][1] = j;
@@ -612,10 +606,7 @@ void Mesh::setNormal(unsigned int index, float i, float j, float k)
 
 void Mesh::setVertex(unsigned int index, float x, float y, float z)
 {
-    if (index > mNumVertices)
-    {
-        return;
-    }
+    assert(index < mNumVertices);
 
     mVertices[index][0] = x;
     mVertices[index][1] = y;

src/Particle.cpp

@@ -7,6 +7,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <assert.h>
 
 #include "Particle.h"
 
@@ -98,6 +99,10 @@ void Particle::Reset()
 
 void Particle::Pos(float *x, float *y, float *z)
 {
+    assert(x != NULL);
+    assert(y != NULL);
+    assert(z != NULL);
+
     *x = _pos[0];
     *y = _pos[1];
     *z = _pos[2];
@@ -106,6 +111,10 @@ void Particle::Pos(float *x, float *y, float *z)
 
 void Particle::Color(float *r, float *g, float *b)
 {
+    assert(r != NULL);
+    assert(g != NULL);
+    assert(b != NULL);
+
     *r = _color[0];
     *g = _color[1];
     *b = _color[2];

src/SDLSystem.cpp

@@ -9,31 +9,21 @@
 #include <stdio.h>
 #include <string.h>
 #include <cmath>
+#include <assert.h>
 
 #include "SDL_opengl.h"
 
 #include "utils/math.h"
 #include "SDLSystem.h"
 
-unsigned int *gWidth = 0x0;
-unsigned int *gHeight = 0x0;
-
 SDLSystem::SDLSystem() : System() {
     mWindow = 0x0;
-    gWidth = &m_width;
-    gHeight = &m_height;
     mFullscreen = false;
 }
 
 SDLSystem::~SDLSystem() {
 }
 
-/*
-unsigned int SDLSystem::getTicks() {
-    return SDL_GetTicks();
-}
-*/
-
 #ifdef FIXME
 void SDLSystem::bindKeyCommand(const char *cmd, int key, int event) {
     if (key > 255) {
@@ -56,6 +46,9 @@ void SDLSystem::setGrabMouse(bool on) {
 void SDLSystem::initVideo(unsigned int width, unsigned int height, bool fullscreen) {
     int flags = 0; //, x, y;
 
+    assert(width > 0);
+    assert(height > 0);
+
     // Create GL context
     SDL_Init(SDL_INIT_VIDEO);
     printf("Created OpenGL Context\n");
@@ -105,6 +98,9 @@ void SDLSystem::initVideo(unsigned int width, unsigned int height, bool fullscre
 }
 
 void SDLSystem::resize(unsigned int width, unsigned int height) {
+    assert(width > 0);
+    assert(height > 0);
+
     m_width = width;
     m_height = height;
 

src/System.cpp

@@ -183,17 +183,16 @@ int System::loadResourceFile(const char *filename) {
 }
 
 void System::setDriverGL(const char *driver) {
-    unsigned int len;
+    assert(driver != NULL);
+    assert(driver[0] != '\0');
 
     if (m_driver)
         delete [] m_driver;
 
-    if (driver && driver[0]) {
-        len = strlen(driver);
-        m_driver = new char[len+1];
-        strncpy(m_driver, driver, len);
-        m_driver[len] = 0;
-    }
+    unsigned int len = strlen(driver);
+    m_driver = new char[len + 1];
+    strncpy(m_driver, driver, len);
+    m_driver[len] = 0;
 }
 
 void System::resizeGL(unsigned int w, unsigned int h) {

src/Texture.cpp

@@ -23,7 +23,6 @@
 #include "utils/tga.h"
 #include "Texture.h"
 
-//Texture *gTextureManager = 0x0;
 gl_font_t *gFontTest = 0x0;
 
 
@@ -41,8 +40,6 @@ Texture::Texture()
     mTextureCount = 0;
     mTextureLimit = 0;
 
-    //gTextureManager = this;
-
     initSDL_TTF();
 
     textureDebug = -1;