Reenabled some warnings

ChangeLog

@@ -12,6 +12,7 @@
 	* The menu map list can now be stepped per folder with the
 	  right and left arrows.
 	* Methods wrapping printf-style functions now get compiler warnings
+	* Reenabled some warnings and fixed them
 
 	[ 20140216 ]
 	* Removed the FastCard option. Not necessary on todays hardware?!

Makefile

@@ -79,11 +79,10 @@ INSTALL_INCLUDE=$(DESTDIR)/usr/include
 ###############################################################
 CC=gcc
 WARNINGS=-Weverything -Wno-padded -Wno-packed
-WARNINGS+=-Wno-documentation-unknown-command
-WARNINGS+=-Wno-covered-switch-default -Wno-global-constructors
-WARNINGS+=-Wno-exit-time-destructors -Wno-c++98-compat-pedantic
-WARNINGS+=-Wno-disabled-macro-expansion -Wno-missing-variable-declarations
-WARNINGS+=-Wno-missing-prototypes -Wno-pedantic
+WARNINGS+=-Wno-global-constructors -Wno-exit-time-destructors
+WARNINGS+=-Wno-documentation-unknown-command -Wno-c++98-compat-pedantic
+WARNINGS+=-Wno-missing-prototypes -Wno-missing-variable-declarations
+WARNINGS+=-Wno-disabled-macro-expansion
 
 WARNINGS+=-Wno-shorten-64-to-32 -Wno-sign-conversion
 

include/TombRaider1.h

@@ -155,7 +155,7 @@ public:
         RaptorState_JumpBite  = 4,
         RaptorState_Bellowing = 6,
         RaptorState_RunBellow = 7,
-        RaptorState_Biting    = 8,
+        RaptorState_Biting    = 8
     };
 
     /*!
@@ -281,7 +281,7 @@ public:
         WingedNatlaState_Dying1    = 5, //!< "Dying" the first time
         WingedNatlaState_Spinning  = 7, //!< Spinning around in air
         WingedNatlaState_Standing2 = 8,
-        WingedNatlaState_Dying2    = 9, //!< Dying for real
+        WingedNatlaState_Dying2    = 9  //!< Dying for real
     };
 
     /*!
@@ -452,7 +452,7 @@ public:
     enum MotorboatStates {
         MotorboatState_StationaryInitial = 1,
         MotorboatState_Moving            = 2,
-        MotorboatState_StationaryFinal   = 3,
+        MotorboatState_StationaryFinal   = 3
     };
 
     /*!

src/Camera.cpp

@@ -280,8 +280,6 @@ void Camera::command(enum camera_command cmd)
             if (--mTranslateDelta < 0.0f)
                 mTranslateDelta = 1.0f;
             break;
-        default:
-            ;
     }
 }
 

src/Mesh.cpp

@@ -169,11 +169,11 @@ void Mesh::drawAlpha()
                 // Bind WHITE texture for solid colors
                 glBindTexture(GL_TEXTURE_2D, 0);
                 break;
-            default:
             case MeshModeTexture:
             case MeshModeMultiTexture:
                 // Bind texture id for textures
                 glBindTexture(GL_TEXTURE_2D, mQuads[i].texture+1);
+                break;
         }
 
         glBegin(GL_QUADS);
@@ -206,11 +206,11 @@ void Mesh::drawAlpha()
                 // Bind WHITE texture for solid colors
                 glBindTexture(GL_TEXTURE_2D, 0);
                 break;
-            default:
             case MeshModeTexture:
             case MeshModeMultiTexture:
                 // Bind texture id for textures
                 glBindTexture(GL_TEXTURE_2D, mTris[i].texture+1);
+                break;
         }
 
         glBegin(GL_TRIANGLES);
@@ -298,11 +298,11 @@ void Mesh::drawSolid()
 #else
             case MeshModeMultiTexture:
 #endif
-            default:
             case MeshModeTexture:
                 // Bind texture id for textures
                 glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
                 glBindTexture(GL_TEXTURE_2D, mQuads[i].texture+1);
+                break;
         }
 
         glBegin(GL_QUADS);
@@ -359,11 +359,11 @@ void Mesh::drawSolid()
 #else
             case MeshModeMultiTexture:
 #endif
-            default:
             case MeshModeTexture:
                 // Bind texture id for textures
                 glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
                 glBindTexture(GL_TEXTURE_2D, mTris[i].texture+1);
+                break;
         }
 
         glBegin(GL_TRIANGLES);

src/Network.cpp

@@ -591,7 +591,9 @@ void Network::runClient()
 
             if (!f.data.send)
             {
-                const struct timespec tmp = {.tv_sec = 0, .tv_nsec = 20000};
+                struct timespec tmp;
+                tmp.tv_sec = 0;
+                tmp.tv_nsec = 20000;
                 nanosleep(&tmp, NULL);
                 continue;
             }

src/OpenRaider.cpp

@@ -345,10 +345,10 @@ void OpenRaider::handleMouseMotionEvent(float x, float y)
                 case worldMoveType_noClipping:
                     eventAnimTest(TR_ANIAMTION_SWIM_R);
                     break;
-                default:
                 case worldMoveType_walk:
                 case worldMoveType_walkNoSwim:
                     eventAnimTest(TR_ANIAMTION_TURN_L); // TURN left always for now
+                    break;
             }
 
             LARA->moving = true;
@@ -368,10 +368,10 @@ void OpenRaider::handleMouseMotionEvent(float x, float y)
                 case worldMoveType_noClipping:
                     eventAnimTest(TR_ANIAMTION_SWIM_L);
                     break;
-                default:
                 case worldMoveType_walk:
                 case worldMoveType_walkNoSwim:
                     eventAnimTest(TR_ANIAMTION_TURN_L);
+                    break;
             }
 
             LARA->moving = true;
@@ -430,10 +430,10 @@ void OpenRaider::handleBoundKeyPressEvent(unsigned int key)
                     case worldMoveType_noClipping:
                         eventAnimTest(TR_ANIAMTION_SWIM);
                         break;
-                    default:
                     case worldMoveType_walk:
                     case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_RUN);
+                        break;
                 }
             }
             else if (LARA)
@@ -445,10 +445,10 @@ void OpenRaider::handleBoundKeyPressEvent(unsigned int key)
                     case worldMoveType_noClipping:
                         eventAnimTest(TR_ANIAMTION_SWIM_IDLE);
                         break;
-                    default:
                     case worldMoveType_walk:
                     case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_HIT_WALL_FRONT);
+                        break;
                 }
             }
             else
@@ -468,10 +468,10 @@ void OpenRaider::handleBoundKeyPressEvent(unsigned int key)
                     case worldMoveType_noClipping:
                         eventAnimTest(TR_ANIAMTION_SWIM);
                         break;
-                    default:
                     case worldMoveType_walk:
                     case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_RUN);
+                        break;
                 }
             }
             break;
@@ -487,10 +487,10 @@ void OpenRaider::handleBoundKeyPressEvent(unsigned int key)
                     case worldMoveType_noClipping:
                         eventAnimTest(TR_ANIAMTION_SWIM);
                         break;
-                    default:
                     case worldMoveType_walk:
                     case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_RUN);
+                        break;
                 }
             }
             else if (!LARA)
@@ -510,10 +510,10 @@ void OpenRaider::handleBoundKeyPressEvent(unsigned int key)
                     case worldMoveType_noClipping:
                         eventAnimTest(TR_ANIAMTION_SWIM);
                         break;
-                    default:
                     case worldMoveType_walk:
                     case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_RUN);
+                        break;
                 }
             }
             else if (!LARA)
@@ -1114,12 +1114,11 @@ void OpenRaider::loadLevel(char *mapname)
 
                 m_tombraider.loadSFX(altSfx);
                 break;
-            default:
             case TR_VERSION_1:
             case TR_VERSION_4:
             case TR_VERSION_5:
             case TR_VERSION_UNKNOWN:
-                ;
+                break;
         }
     }
 
@@ -1263,10 +1262,10 @@ void OpenRaider::gameFrame()
                     case worldMoveType_noClipping:
                         eventAnimTest(TR_ANIAMTION_SWIM_IDLE);
                         break;
-                    default:
                     case worldMoveType_walk:
                     case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_STAND);
+                        break;
                 }
 
                 LARA->moving = false;
@@ -1572,12 +1571,11 @@ void OpenRaider::processMoveables()
                                 break;
                         }
                         break;
-                    default:
                     case TR_VERSION_2:
                     case TR_VERSION_3:
                     case TR_VERSION_5:
                     case TR_VERSION_UNKNOWN:
-                        ;
+                        break;
                 }
         }
     }
@@ -1691,7 +1689,6 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
                 // Only TR4 lara has 2 layer bone tags/meshes per bone frame
                 r_model->tr4Overlay = true;
                 break;
-            default:
             case TR_VERSION_1:
             case TR_VERSION_2:
             case TR_VERSION_5:
@@ -1700,6 +1697,7 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
                 sModel->setAnimation(TR_ANIAMTION_RUN);
                 sModel->setIdleAnimation(TR_ANIAMTION_STAND);
                 r_model->tr4Overlay = false;
+                break;
         }
 
         r_model->ponytailId = 0;
@@ -1782,7 +1780,6 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
                     print(true, "Found known ponytail\n");
                 }
                 break; // ?
-            default:
             case TR_VERSION_1:
             case TR_VERSION_2:
             case TR_VERSION_3:
@@ -1804,6 +1801,7 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
                     m_render.setFlags(Render::fRenderPonytail);
                     print(true, "Found ponytail?\n");
                 }
+                break;
         }
     }
     else

src/Render.cpp

@@ -743,10 +743,10 @@ void Render::Display()
             case worldMoveType_swim:
                 camOffsetH = 64.0f;
                 break;
-            default:
             case worldMoveType_walk:
             case worldMoveType_walkNoSwim:
                 camOffsetH = 512.0f;
+                break;
         }
 
         curPos[0] = LARA->pos[0];

src/TombRaider.cpp

@@ -1951,7 +1951,6 @@ int TombRaider::Load(char *filename, void (*percent)(int))
         case TR_VERSION_3:
         case TR_VERSION_5:
         case TR_VERSION_UNKNOWN:
-        default:
             //! \fixme (Endian) Read bit32 / int32_t
             Fread(&mNumSampleIndices, 4, 1, f);
             printDebug("Load", "mNumSampleIndices = %i", mNumSampleIndices);
@@ -2126,11 +2125,11 @@ void TombRaider::getColor(int index, float color[4])
         case TR_VERSION_4:
         case TR_VERSION_5:
         case TR_VERSION_UNKNOWN:
-        default:
             color[0] = (float)(_palette16[index] & 0xff) / 256.0f;
             color[1] = (float)((_palette16[index] >> 8) & 0xff) / 256.0f;
             color[2] = (float)((_palette16[index] >> 16) & 0xff) / 256.0f;
             color[3] = 1.0;
+            break;
     }
 }
 
@@ -2206,8 +2205,8 @@ void TombRaider::getMeshColoredRectangle(unsigned int meshIndex,
         case TR_VERSION_4:
         case TR_VERSION_5:
         case TR_VERSION_UNKNOWN:
-        default:
             getColor((mMeshes[meshIndex].coloured_rectangles[faceIndex].texture>>8) & 0xff, color);
+            break;
     }
 }
 
@@ -2237,9 +2236,9 @@ void TombRaider::getMeshColoredTriangle(unsigned int meshIndex,
         case TR_VERSION_4:
         case TR_VERSION_5:
         case TR_VERSION_UNKNOWN:
-        default:
             getColor((mMeshes[meshIndex].coloured_triangles[faceIndex].texture>>8) & 0xff,
                     color);
+            break;
     }
 }
 
@@ -2486,7 +2485,6 @@ void TombRaider::getMeshVertexArrays(unsigned int meshIndex,
                 case TR_VERSION_2:
                 case TR_VERSION_5:
                 case TR_VERSION_UNKNOWN:
-                default:
                     colorValue = (1.0f - (colorValue / 8192.0f));
                     break;
             }
@@ -2515,7 +2513,6 @@ int TombRaider::getRoomBox(unsigned int roomIndex, unsigned int index,
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
 
         case TR_VERSION_1:
@@ -2552,7 +2549,6 @@ unsigned int TombRaider::getRoomBoxCount(unsigned int roomIndex)
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_1:
         case TR_VERSION_2:
@@ -2845,7 +2841,6 @@ unsigned int TombRaider::getRoomLightCount(unsigned int roomIndex)
         case TR_VERSION_2:
         case TR_VERSION_3:
         case TR_VERSION_4:
-        default:
             return _rooms[roomIndex].num_lights;
     }
 
@@ -2865,7 +2860,6 @@ int TombRaider::getRoomModel(unsigned int roomIndex, unsigned int index,
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             return -1;
         case TR_VERSION_5:
             count = NumStaticMeshes();
@@ -2921,7 +2915,6 @@ unsigned int TombRaider::getRoomModelCount(unsigned int roomIndex)
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             return mRoomsTR5[roomIndex].numStaticMeshes;
@@ -2946,7 +2939,6 @@ int TombRaider::getRoomPortal(unsigned int roomIndex, unsigned int index,
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             *adjoiningRoom = mRoomsTR5[roomIndex].doors[index].adjoining_room;
@@ -3004,7 +2996,6 @@ unsigned int TombRaider::getRoomPortalCount(unsigned int roomIndex)
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             return mRoomsTR5[roomIndex].numDoors;
@@ -3032,7 +3023,6 @@ void TombRaider::getRoomRectangle(unsigned int roomIndex,
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             for (i = 0, count = 0; i < mRoomsTR5[roomIndex].numLayers; ++i)
@@ -3105,7 +3095,6 @@ unsigned int TombRaider::getRoomRectangleCount(unsigned int roomIndex)
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             for (i = 0, count = 0; i < mRoomsTR5[roomIndex].numLayers; ++i)
@@ -3145,7 +3134,6 @@ int TombRaider::getRoomSector(unsigned int roomIndex, unsigned int index,
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             *floorDataIndex = mRoomsTR5[roomIndex].sectors[index].fd_index;
@@ -3213,7 +3201,6 @@ unsigned int TombRaider::getRoomSectorCount(unsigned int roomIndex,
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             // width of sector list
@@ -3389,7 +3376,6 @@ unsigned int TombRaider::getRoomSpriteCount(unsigned int roomIndex)
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             return 0; // No room sprites in TRC
@@ -3417,7 +3403,6 @@ void TombRaider::getRoomTriangle(unsigned int roomIndex,
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             for (i = 0, count = 0; i < mRoomsTR5[roomIndex].numLayers; ++i)
@@ -3495,7 +3480,6 @@ void TombRaider::getRoomTriangles(unsigned int index, int textureOffset,
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             for (i = 0, count = 0; i < mRoomsTR5[index].numLayers; ++i)
@@ -3566,7 +3550,6 @@ unsigned int TombRaider::getRoomTriangleCount(unsigned int roomIndex)
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             for (i = 0, count = 0; i < mRoomsTR5[roomIndex].numLayers; ++i)
@@ -3607,7 +3590,6 @@ void TombRaider::getRoomVertex(unsigned int roomIndex,unsigned int vertexIndex,
         case TR_VERSION_3:
         case TR_VERSION_4:
         case TR_VERSION_UNKNOWN:
-        default:
             vertex = &_rooms[index].room_data.vertices[i].vertex;
 
             xyz[0] = vertex->x;
@@ -3641,7 +3623,6 @@ void TombRaider::getRoomVertex(unsigned int roomIndex,unsigned int vertexIndex,
                 case TR_VERSION_2:
                 case TR_VERSION_5: // Not really...
                 case TR_VERSION_UNKNOWN:
-                default:
                     color_value = _rooms[index].room_data.vertices[i].lighting1;
                     color_value = (1.1f - (color_value / 8192.0f));
 
@@ -3690,7 +3671,6 @@ void TombRaider::getRoomVertexArrays(unsigned int roomIndex,
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             *vertexCount = count;
@@ -3758,7 +3738,6 @@ void TombRaider::getRoomVertexArrays(unsigned int roomIndex,
                     case TR_VERSION_2:
                     case TR_VERSION_5:
                     case TR_VERSION_UNKNOWN:
-                    default:
                         color_value = _rooms[roomIndex].room_data.vertices[i].lighting1;
                         color_value = (1.1f - (color_value / 8192.0f));
                 }
@@ -3783,7 +3762,6 @@ void TombRaider::getRoomVertexArrays(unsigned int roomIndex,
                     case TR_VERSION_2:
                     case TR_VERSION_5:
                     case TR_VERSION_UNKNOWN:
-                    default:
                         rgba[0] = color_value;
                         rgba[1] = color_value;
                         rgba[2] = color_value;
@@ -3819,7 +3797,6 @@ unsigned int TombRaider::getRoomVertexCount(unsigned int roomIndex)
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             for (i = 0, count = 0; i < mRoomsTR5[roomIndex].numLayers; ++i)
@@ -3865,7 +3842,6 @@ int TombRaider::getSkyModelId()
         case TR_VERSION_1:
         case TR_VERSION_5:
         case TR_VERSION_UNKNOWN:
-        default:
             return -1;
     }
 
@@ -4063,8 +4039,7 @@ void TombRaider::getSoundSample(unsigned int index,
             getRiffDataTR4(index, bytes, data);
             break;
         case TR_VERSION_UNKNOWN:
-        default:
-            ;
+            break;
     }
 }
 
@@ -4091,8 +4066,8 @@ unsigned int TombRaider::getSoundSamplesCount()
             count = mNumTR4Samples;
             break;
         case TR_VERSION_UNKNOWN:
-        default:
             count = 0;
+            break;
     }
 
     return count;
@@ -4117,7 +4092,6 @@ bool TombRaider::isRoomValid(int index)
     switch (getEngine())
     {
         case TR_VERSION_UNKNOWN:
-        default:
             break;
         case TR_VERSION_5:
             if (index < _num_rooms &&
@@ -5068,8 +5042,7 @@ unsigned char *TombRaider::getTexTile(int texture)
             case TR_VERSION_2:
             case TR_VERSION_5:
             case TR_VERSION_UNKNOWN:
-            default:
-                ;
+                break;
         }
     }
 

src/World.cpp

@@ -421,7 +421,6 @@ void World::moveEntity(entity_t *e, char movement)
         case worldMoveType_noClipping:
         case worldMoveType_fly:
         case worldMoveType_swim:
-        default:
             pitch = e->angles[2];
             break;
     }

test/GLString.cpp

@@ -101,7 +101,6 @@ void init_gl() {
 
 void init_text() {
     int i;
-    const char *errorText = "TEXT->glPrintf> ERROR code %i\n";
 
     // Mongoose 2002.01.01, Texture setup
     gTexture.reset();
@@ -113,20 +112,20 @@ void init_text() {
     TEXT->Init(4);
     i = TEXT->glPrintf(50, 50, "OpenRaider GLString");
     if (i) {
-        printf(errorText, i);
+        printf("TEXT->glPrintf> ERROR code %i\n", i);
     }
     i = TEXT->glPrintf(50, 100, "Unit Test by Mongoose");
     if (i) {
-        printf(errorText, i);
+        printf("TEXT->glPrintf> ERROR code %i\n", i);
     }
     TEXT->Scale(1.2f);
     i = TEXT->glPrintf(50, 150, "ported to SDL2 & TTF");
     if (i) {
-        printf(errorText, i);
+        printf("TEXT->glPrintf> ERROR code %i\n", i);
     }
     i = TEXT->glPrintf(50, 200, "by xythobuz");
     if (i) {
-        printf(errorText, i);
+        printf("TEXT->glPrintf> ERROR code %i\n", i);
     }
     TEXT->setActive(0, true);
     TEXT->setActive(1, true);

test/TombRaider.cpp

@@ -351,7 +351,6 @@ void dump_mesh(TombRaider *tr, char *mapname, int index)
                 tr->getColor(meshes[index].coloured_triangles[i].texture
                         & 0xff, rgba);
                 break;
-            default:
             case TR_VERSION_UNKNOWN:
             case TR_VERSION_2:
             case TR_VERSION_3:
@@ -359,6 +358,7 @@ void dump_mesh(TombRaider *tr, char *mapname, int index)
             case TR_VERSION_5:
                 tr->getColor((meshes[index].coloured_triangles[i].texture>>8)
                         & 0xff, rgba);
+                break;
         }
 
         s = rgba[0];
@@ -408,7 +408,6 @@ void dump_mesh(TombRaider *tr, char *mapname, int index)
                 tr->getColor(meshes[index].coloured_rectangles[i].texture
                         & 0xff, rgba);
                 break;
-            default:
             case TR_VERSION_UNKNOWN:
             case TR_VERSION_2:
             case TR_VERSION_3:
@@ -416,6 +415,7 @@ void dump_mesh(TombRaider *tr, char *mapname, int index)
             case TR_VERSION_5:
                 tr->getColor((meshes[index].coloured_rectangles[i].texture>>8)
                         & 0xff, rgba);
+                break;
         }
 
         s = rgba[0];