more warnings

include/TombRaider.h

@@ -136,7 +136,6 @@ typedef enum
 
 #define TR_SOUND_FOOTSTEP0    1
 #define TR_SOUND_F_PISTOL    12
-#define TR_SOUND_F_PISTOL    12
 
 enum TR4_Objects
 {

src/Network.cpp

@@ -547,7 +547,7 @@ void Network::runClient()
     }
 
     // Setup connection
-    bzero((char*) &dest, sizeof(dest));
+    memset(&dest, 0, sizeof(dest));
     dest.sin_family = AF_INET;
     int port = getPort();
     dest.sin_port = htons(port);
@@ -603,7 +603,8 @@ void Network::runClient()
 
             if (!f.data.send)
             {
-                usleep(20);
+                const struct timespec tmp = {.tv_sec = 0, .tv_nsec = 20000};
+                nanosleep(&tmp, NULL);
                 continue;
             }
         }

src/OpenRaider.cpp

@@ -1014,7 +1014,7 @@ void OpenRaider::processPakSounds()
 
         mSound.addWave(riff, riffSz, &id, mSound.SoundFlagsNone);
 
-        if (id == TR_SOUND_F_PISTOL && id > 0)
+        if (((i + 1) == TR_SOUND_F_PISTOL) && (id > 0))
         {
             m_testSFX = id;
         }

src/Texture.cpp

@@ -396,7 +396,7 @@ ttf_texture_t *Texture::generateFontTexture(const char *filename, int pointSize,
     sdlColor.g = color[1];
     sdlColor.b = color[2];
 
-    if (!mFlags & fUseSDL_TTF)
+    if (!(mFlags & fUseSDL_TTF))
     {
         printf("SDL_TTF couldn't be used... exiting\n");
         return NULL;