Silenced some cppcheck warnings

Makefile

@@ -203,6 +203,10 @@ $(BUILDDIR)/$(NAME) : $(OBJS)
 
 #################################################################
 
+CHECK_BIN=cppcheck
+CHECK_DIR=.
+CHECK_STD=--std=c++11 --std=posix
+CHECK_FLAGS=--quiet --force
 CHECK_INC=-Iinclude
 #CHECK_INC+=$(GL_DEFS) $(AUDIO_DEFS)
 #ifeq ($(UNAME),Darwin)
@@ -214,14 +218,20 @@ CHECK_INC=-Iinclude
 #CHECK_INC+=-I$(SDK_ROOT)/usr/include/c++/4.2.1/tr1
 #CHECK_INC+=-I$(SDK_ROOT)/usr/include/c++/4.2.1/backward
 #endif
+CHECK_NORMAL=--enable=information,warning,performance,portability
+CHECK_FULL=--enable=all
+CHECK_CONFIG=--check-config
 
 check:
-	cppcheck --quiet $(CHECK_INC) --force \
-		--enable=information,warning,performance,portability .
+	$(CHECK_BIN) $(CHECK_FLAGS) $(CHECK_INC) $(CHECK_STD) \
+		$(CHECK_NORMAL) $(CHECK_DIR)
 
 checkFull:
-	cppcheck --quiet $(CHECK_INC) --enable=all --force \
-		--std=c++11 --std=posix .
+	$(CHECK_BIN) $(CHECK_FLAGS) $(CHECK_INC) $(CHECK_STD) \
+		$(CHECK_FULL) $(CHECK_DIR)
+
+checkConfig:
+	$(CHECK_BIN) $(CHECK_FLAGS) $(CHECK_INC) $(CHECK_CONFIG) $(CHECK_DIR)
 
 #################################################################
 

include/SDLSystem.h

@@ -117,8 +117,6 @@ public:
     void toggleFullscreen();
 
 protected:
-    int m_old_width;
-    int m_old_height;
     bool mFirstMouseEvent; //!< Filter first mouse event (SDL bug)
     bool mFullscreen;      //!< Current Fullscreen/Windowed mode
 

src/GLString.cpp

@@ -85,15 +85,11 @@ void GLString::setActive(unsigned int string, bool active) {
 void GLString::SetString(unsigned int string, const char *s, ...) {
     va_list args;
     gl_string_t *str;
-    unsigned int len;
 
     str = GetString(string);
 
     if (s && s[0] && str) {
         str->active = true;
-        len = strlen(s);
-        if (len > str->len)
-            len = str->len - 1;
 
         va_start(args, s);
         vsnprintf(str->text, str->len-2, s, args);

src/OpenRaider.cpp

@@ -916,20 +916,17 @@ void OpenRaider::start()
 
 void OpenRaider::initSound()
 {
-    //char filename[128];
-    //unsigned int len;
-    //int id;
-
-
     if (!(m_flags & OpenRaider_EnableSound) || mSound.init() < 0)
     {
         print(true, "Disabling sound...\n");
-        m_flags |= OpenRaider_EnableSound;
-        m_flags ^= OpenRaider_EnableSound;
+        m_flags &= ~OpenRaider_EnableSound;
         return;
     }
 
 #ifdef OBSOLETE
+    char filename[128];
+    int id;
+
     printf("Processing external sound files: ");
 
     // Mongoose 2001.12.31, Use music list from init script
@@ -1828,7 +1825,7 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
                     a, animation[a].frame_rate);
             printf("animation[%i].next_animation = %i\n",
                     a, animation[a].next_animation);
-            printf("animation[%i].frame_offset = %i\n",
+            printf("animation[%i].frame_offset = %u\n",
                     a, animation[a].frame_offset);
             printf("animation[%i].anim_command = %i\n",
                     a, animation[a].anim_command);
@@ -1836,7 +1833,7 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
                     a, animation[a].num_anim_commands);
             printf("animation[%i].state_change_offset = %i\n",
                     a, animation[a].state_change_offset);
-            printf("              frame_offset = %i\n",
+            printf("              frame_offset = %u\n",
                     frame_offset);
         }
 #endif
@@ -1884,7 +1881,7 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
 #ifdef DEBUG
             if (m_flags & OpenRaider_DebugModel)
             {
-                printf("animation[%i].boneframe[%i] = offset %i, step %i\n",
+                printf("animation[%i].boneframe[%u] = offset %u, step %i\n",
                         a, f, frame_offset, frame_step);
             }
 #endif
@@ -2017,7 +2014,7 @@ void setupTextureColor(texture_tri_t *r_tri, Render *render, float *colorf)
                 r_tri->texture);
 
 #ifdef DEBUG_COLOR_TEXTURE_GEN
-        printf("Color 0x%02x%02x%02x%02x | 0x%08xto texture[%i]?\n",
+        printf("Color 0x%02x%02x%02x%02x | 0x%08xto texture[%u]?\n",
                 color[0], color[1], color[2], color[3], colorI,
                 gColorTextureHACK.size());
 #endif
@@ -2037,7 +2034,7 @@ void setupTextureColor(texture_tri_t *r_tri, Render *render, float *colorf)
 
 void OpenRaider::processModel(int index)
 {
-    int i, j, count, texture, white;
+    int i, j, count, texture;
     int vertexIndices[6];
     float st[12];
     float color[4];
@@ -2055,8 +2052,10 @@ void OpenRaider::processModel(int index)
         return;
     }
 
+#ifndef EXPERIMENTAL
     // WHITE texture id
-    white = 0;
+    int white = 0;
+#endif
 
     model_mesh_t *mesh = new model_mesh_t;
 

src/Quaternion.cpp

@@ -171,7 +171,7 @@ Quaternion Quaternion::slerp(Quaternion a, Quaternion b, vec_t time) {
      *
      *******************************************************************/
 
-    vec_t result, scaleA, scaleB, theta, sinTheta;
+    vec_t result, scaleA, scaleB;
     Quaternion i;
 
 
@@ -207,8 +207,8 @@ Quaternion Quaternion::slerp(Quaternion a, Quaternion b, vec_t time) {
     if (1 - result > 0.1f) {
         // Get the angle between the 2 quaternions, and then
         // store the sin() of that angle
-        theta = (float)acos(result);
-        sinTheta = (float)sin(theta);
+        vec_t theta = (float)acos(result);
+        vec_t sinTheta = (float)sin(theta);
 
         // Calculate the scale for qA and qB, according to
         // the angle and it's sine value

src/SDLSystem.cpp

@@ -16,6 +16,7 @@
 
 #include <SDL/SDL_opengl.h>
 
+#include <MatMath.h>
 #include <SDLSystem.h>
 
 unsigned int *gWidth = 0x0;
@@ -131,7 +132,7 @@ void SDLSystem::resize(unsigned int width, unsigned int height) {
     // gluPerspective is deprecated!
     // gluPerspective(m_fovY, aspect, m_clipNear, m_clipFar);
     // fix: http://stackoverflow.com/a/2417756
-    GLfloat fH = tanf(m_fovY / 360.0f * 3.14159f) * m_clipNear;
+    GLfloat fH = tanf(m_fovY * HEL_PI / 360.0f) * m_clipNear;
     GLfloat fW = fH * aspect;
     glFrustum(-fW, fW, -fH, fH, m_clipNear, m_clipFar);
 
@@ -393,9 +394,10 @@ void SDLSystem::shutdown(int i) {
 }
 
 void SDLSystem::toggleFullscreen() {
+    int width = m_width;
+    int height = m_height;
     if (mWindow) {
         mFullscreen = !mFullscreen;
-        SDL_ShowCursor(SDL_DISABLE);
 
         // SDL_WM_ToggleFullScreen does not work on all platforms
         // eg. Mac OS X
@@ -409,26 +411,19 @@ void SDLSystem::toggleFullscreen() {
         // Now you can see something when switching to Fullscreen,
         // but it's full of graphical glitches...? I don't know...
         // -- xythobuz 2013-12-31
-        int width = m_width,
-            height = m_height;
+
         if (mFullscreen) {
-            m_old_width = m_width;
-            m_old_height = m_height;
             SDL_Rect **dimensions = SDL_ListModes(NULL, SDL_OPENGL | SDL_FULLSCREEN);
             if (dimensions == NULL) {
                 printf("Can't enter fullscreen!\n");
-                mFullscreen = !mFullscreen;
-            }
-            if (dimensions != (SDL_Rect **)-1) {
+                mFullscreen = false;
+            } else if (dimensions != (SDL_Rect **)-1) {
                 //! \fixme Don't just use first available resolution...
                 width = dimensions[0]->w;
                 height = dimensions[0]->h;
             }
         }
-        if (!mFullscreen) {
-            width = m_old_width;
-            height = m_old_height;
-        }
+
         resize(width, height);
     }
 }