More cppcheck warnings

ChangeLog

@@ -5,6 +5,9 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140202 ]
+	* Fixed more cppcheck warnings
+
 	[ 20140201 ]
 	* Rewrote Memory Unit Test using greatest
 	* Used C++ static analysis tool cppcheck and tried to fix

Makefile

@@ -222,7 +222,8 @@ check:
 		--enable=information,warning,performance,portability .
 
 checkFull:
-	cppcheck --quiet $(CHECK_INC) --enable=all --std=posix --force .
+	cppcheck --quiet $(CHECK_INC) --enable=all --force \
+		--std=c++11 --std=posix .
 
 #################################################################
 

include/Camera.h

@@ -208,17 +208,16 @@ private:
     unsigned int mId;             //!< Unique id
     Quaternion mQ;                //!< Quaternion for rotation
     unsigned int mFlags;          //!< For testing with flags
-    vec_t mPos[4];               //!< Location in 3 space (aka eye)
-    vec_t mTarget[4];            //!< Postition we're looking at
-    vec_t mUp[4];                //!< Up vector
-    vec_t mSide[4];              //!< Side vector
-    vec_t mViewDistance;         //!< Distance from target
-    vec_t mTranslateDelta;       //!< Step size to move
-    vec_t mRotateDelta;          //!< Radians to rotate Y
-    vec_t mTheta;                //!< View angle Y
-    vec_t mRotateDelta2;         //!< Radians to rotate Z
-    vec_t mTheta2;               //!< View angle Z
-    bool mUpdate;                 //!< Check to see if view needs updating
+    vec_t mPos[4];                //!< Location in 3 space (aka eye)
+    vec_t mTarget[4];             //!< Postition we're looking at
+    vec_t mUp[4];                 //!< Up vector
+    vec_t mSide[4];               //!< Side vector
+    vec_t mViewDistance;          //!< Distance from target
+    vec_t mTranslateDelta;        //!< Step size to move
+    vec_t mRotateDelta;           //!< Radians to rotate Y
+    vec_t mTheta;                 //!< View angle Y
+    vec_t mRotateDelta2;          //!< Radians to rotate Z
+    vec_t mTheta2;                //!< View angle Z
     static unsigned int mCounter; //!< Id system use
 };
 

include/List.h

@@ -298,7 +298,7 @@ public:
         ListNode<T> *current = _head;
         printf(" [%u] {\n", _num_items);
         while (current) {
-            printf("#%i, ", current->Id());
+            printf("#%u, ", current->Id());
             if (print_func)
                 (*print_func)(current->Data());
             current = current->Next();
@@ -315,7 +315,7 @@ public:
         printf("List %u {\n", _num_items);
         while (current) {
             //current->Print();
-            printf("%i", current->Id());
+            printf("%u", current->Id());
             current = current->Next();
             if (current)
                 printf(", ");

include/OpenRaider.h

@@ -466,8 +466,6 @@ class OpenRaider : public SDLSystem
     char *m_homeDir;             /* Current home directory */
 
     Vector<entity_t *> mClients; /* Player entity/clients */
-
-    unsigned int mMaxClients;    /* Max number of clients */
 };
 
 #endif

include/Render.h

@@ -46,6 +46,8 @@ public:
     RenderRoom()
     {
         room = 0x0;
+        dist = 0.0f;
+        center[0] = center[1] = center[2] = 0.0f;
     }
 
     ~RenderRoom()

src/Network.cpp

@@ -418,7 +418,7 @@ int Network::runServer()
                     cip << 16 >> 24, cip << 24 >> 24,
                     ntohs(from.sin_port));
 
-            printf("Server: Datalink layer recieved: packet seq %i\n",
+            printf("Server: Datalink layer recieved: packet seq %u\n",
                     f.seq);
         }
 
@@ -455,7 +455,7 @@ int Network::runServer()
 #ifdef UNIT_TEST_NETWORK
         if ((rand() % 10 == 0))
         {
-            printf("Server: Simulating a lost ack %i\n", f.seq);
+            printf("Server: Simulating a lost ack %u\n", f.seq);
             continue;
         }
 #endif
@@ -620,7 +620,7 @@ void Network::runClient()
         {
             if (mDebug)
             {
-                printf("Client: Sending packet %i\n", f.seq);
+                printf("Client: Sending packet %u\n", f.seq);
             }
 
             cc = sendto(socket_fd, &f, sizeof(f), 0,
@@ -664,7 +664,7 @@ void Network::runClient()
         {
             if (mDebug)
             {
-                printf("Client: Timeout detected on packet %i\n", f.seq);
+                printf("Client: Timeout detected on packet %u\n", f.seq);
             }
             timedOut = 1;
             continue;
@@ -685,7 +685,7 @@ void Network::runClient()
         {
             if (mDebug)
             {
-                printf("Client: Datalink layer recieved: packet seq %i\n", f.seq);
+                printf("Client: Datalink layer recieved: packet seq %u\n", f.seq);
                 printf("CLIENT> Msg from %u\n", f.uid);
             }
 
@@ -696,7 +696,7 @@ void Network::runClient()
         {
             if (mDebug)
             {
-                printf("Client: Recieved ack %i\n", f.seq);
+                printf("Client: Recieved ack %u\n", f.seq);
             }
 
             ++seq;

src/OpenRaider.cpp

@@ -123,6 +123,10 @@ OpenRaider::OpenRaider() : SDLSystem()
     m_testSFX = -1;
     mNoClipping = 0;
 
+    mText = NULL;
+    m_flags = 0;
+    m_mapName[0] = '\0';
+
     /*! \todo Replace numbers with enum modes.
      * Only do this when you know the amount of commands + 1 (0 reserved)
      */

src/Render.cpp

@@ -139,6 +139,7 @@ Render::Render()
 #endif
     mCamera = 0x0;
     mSkyMesh = -1;
+    mSkyMeshRotation = false;
     mMode = Render::modeDisabled;
     mLock = 0;
     mFlags = (Render::fRoomAlpha | Render::fViewModel | Render::fSprites |
@@ -148,6 +149,12 @@ Render::Render()
     mModels.setError(0x0);
     mRooms.setError(0x0);
     mRoomRenderList.setError(0x0);
+
+    mNextTextureId = NULL;
+    mNumTexturesLoaded = NULL;
+
+    mWidth = 640;
+    mHeight = 480;
 }
 
 
@@ -1306,13 +1313,13 @@ void Render::drawObjects()
     vec3_t curPos;
 #endif
     sprite_seq_t *sprite;
+    int frame;
 
 
     // Draw lara or other player model ( move to entity rendering method )
     if (mFlags & Render::fViewModel && LARA && LARA->tmpHook)
     {
         SkeletalModel *mdl = static_cast<SkeletalModel *>(LARA->tmpHook);
-        int frame = mdl->getAnimation();
 
         if (mdl)
         {
@@ -1328,6 +1335,10 @@ void Render::drawObjects()
                     mdl->setFrame(0);
                 }
             }
+            else
+            {
+                frame = mdl->getAnimation();
+            }
 
             animation_frame_t *animation = mdl->model->animation[frame];
 
@@ -1401,7 +1412,7 @@ void Render::drawModel(SkeletalModel *model)
     if (!animation)
     {
 #ifdef DEBUG
-        printf("ERROR: No animation for model[%i].aframe[%i] %i\n",
+        printf("ERROR: No animation for model[%i].aframe[%i] %u\n",
                 mdl->id, aframe, mdl->animation.size());
 #endif
         return;

src/SkeletalModel.cpp

@@ -22,6 +22,9 @@ SkeletalModel::SkeletalModel()
     mBoneFrame = 0;
     mAnimationFrame = 0;
     mIdleAnimation = 0;
+    time = 0.0f;
+    lastTime = 0.0f;
+    rate = 0.0f;
 }
 
 

src/System.cpp

@@ -53,6 +53,7 @@ System::System()
     m_fovY     = 45.0f;
 
     mConsoleMode = false;
+    mCommandMode = 0;
 
     printf("[System.Core]\n");
 

src/Texture.cpp

@@ -523,7 +523,7 @@ int Texture::loadColorTexture(unsigned char rgba[4],
         unsigned int width, unsigned int height)
 {
     unsigned char *image;
-    int id = -1;
+    int id;
 
     image = generateColorTexture(rgba, width, height);
     id = loadBuffer(image, width, height, RGBA, 32);

src/TombRaider.cpp

@@ -103,6 +103,7 @@ TombRaider::TombRaider()
     mSoundMap = 0x0;
     mSoundDetails = 0x0;
     mSampleIndices = 0x0;
+    mSampleIndicesTR5 = 0x0;
     mRiffData = 0x0;
     mTR4Samples = 0x0;
     mTR4SamplesSz = 0x0;
@@ -120,6 +121,7 @@ TombRaider::TombRaider()
     mRiffAlternateLoaded = false;
     mRoomVertexLightingFactor = 50.0f;
     mTexelScale = 256.0f;
+    mRiffDataSz = 0;
 
     reset();
 }

src/ViewVolume.cpp

@@ -32,6 +32,12 @@
 
 ViewVolume::ViewVolume()
 {
+    mFrustum[0][0] = mFrustum[0][1] = mFrustum[0][2] = mFrustum[0][3] = 0.0f;
+    mFrustum[1][0] = mFrustum[1][1] = mFrustum[1][2] = mFrustum[1][3] = 0.0f;
+    mFrustum[2][0] = mFrustum[2][1] = mFrustum[2][2] = mFrustum[2][3] = 0.0f;
+    mFrustum[3][0] = mFrustum[3][1] = mFrustum[3][2] = mFrustum[3][3] = 0.0f;
+    mFrustum[4][0] = mFrustum[4][1] = mFrustum[4][2] = mFrustum[4][3] = 0.0f;
+    mFrustum[5][0] = mFrustum[5][1] = mFrustum[5][2] = mFrustum[5][3] = 0.0f;
 }
 
 
@@ -380,25 +386,3 @@ void ViewVolume::updateFrustum()
     mFrustum[5][3] /= t;
 }
 
-
-////////////////////////////////////////////////////////////
-// Unit Test code
-////////////////////////////////////////////////////////////
-
-#ifdef UNIT_TEST_VIEWVOLUME
-int runViewVolumeUnitTest(int argc, char *argv[])
-{
-    return 0;
-}
-
-
-int main(int argc, char *argv[])
-{
-    ViewVolume test;
-
-
-    printf("[ViewVolume class test]\n");
-
-    return runViewVolumeUnitTest(argc, argv);
-}
-#endif

src/memory_test.cpp

@@ -829,14 +829,14 @@ void display_memory_usage()
 
     printf("Memory usage summary:\n");
 
-    printf(" Tracked program memory    : %lu bytes \t(%.2f MB)\n",
+    printf(" Tracked program memory    : %li bytes \t(%.2f MB)\n",
             MEMORY_USED, (double)MEMORY_USED / 1048576.0);
-    printf(" Untracked overhead memory : %lu bytes \t(%.2f MB)\n",
+    printf(" Untracked overhead memory : %li bytes \t(%.2f MB)\n",
             MEMORYA_USED, (double)MEMORYA_USED / 1048576.0);
-    printf(" Untracked m-string memory : %lu bytes\n",
+    printf(" Untracked m-string memory : %li bytes\n",
             MEMORYC_USED);
 
-    printf("\n Total accounted memory    : %lu bytes \t(%.2f MB)\n",
+    printf("\n Total accounted memory    : %li bytes \t(%.2f MB)\n",
             MEMORY_USED + MEMORYA_USED + MEMORYC_USED,
             (double)(MEMORY_USED + MEMORYA_USED + MEMORYC_USED) / 1048576.0);
 
@@ -844,14 +844,14 @@ void display_memory_usage()
 
     printf("Memory max usage summary:\n");
 
-    printf(" Tracked program memory    : %lu bytes \t(%.2f MB)\n",
+    printf(" Tracked program memory    : %li bytes \t(%.2f MB)\n",
             MAX_MEMORY_USED, (double)MAX_MEMORY_USED / 1048576.0);
-    printf(" Untracked overhead memory : %lu bytes \t(%.2f MB)\n",
+    printf(" Untracked overhead memory : %li bytes \t(%.2f MB)\n",
             MAX_MEMORYA_USED, (double)MAX_MEMORYA_USED / 1048576.0);
-    printf(" Untracked m-string memory : %lu bytes\n",
+    printf(" Untracked m-string memory : %li bytes\n",
             MAX_MEMORYC_USED);
 
-    printf("\n Total accounted memory    : %lu bytes \t(%.2f MB)\n",
+    printf("\n Total accounted memory    : %li bytes \t(%.2f MB)\n",
             MAX_MEMORY_USED + MAX_MEMORYA_USED + MAX_MEMORYC_USED,
             (double)(MAX_MEMORY_USED + MAX_MEMORYA_USED + MAX_MEMORYC_USED) / 1048576.0);
 

test/TombRaider.cpp

@@ -495,7 +495,7 @@ void dump_lara_stuff(char *mapname, TombRaider &tr)
 
     fclose(f);
 
-    printf("\nDumping %i audio samples: ", tr.getSoundSamplesCount());
+    printf("\nDumping %u audio samples: ", tr.getSoundSamplesCount());
 
     for (i = 0, j = 0; i < tr.getSoundSamplesCount(); ++i)
     {