Even more warnings

ChangeLog

@@ -8,8 +8,6 @@
 	[ 20140117 ]
 	* Now using C++11 standard.
 	* Turned on many more warnings and silenced some of them.
-	  There are a lot of unused parameters, so this warning is still turned
-	  off.
 	* Removed empty Quaternion Unit Test
 
 	[ 20140111 ]

Makefile

@@ -91,9 +91,16 @@ INSTALL_INCLUDE=$(DESTDIR)/usr/include
 
 ###############################################################
 CC=gcc
-WARNINGS=-std=c++11 -Wall -Wextra -pedantic -Wno-unused-parameter
+WARNINGS=-Wno-padded -Wno-packed -Wno-documentation
+WARNINGS+=-Wno-documentation-unknown-command -Wno-format-nonliteral
+WARNINGS+=-Wno-covered-switch-default -Wno-global-constructors
+WARNINGS+=-Wno-exit-time-destructors
 
-BASE_CFLAGS=$(WARNINGS) $(BASE_DEFS) \
+WARNINGS+=-Wno-conversion -Wno-sign-conversion -Wno-shorten-64-to-32
+
+FLAGS_ALL=-std=c++11 -Weverything $(WARNINGS)
+
+BASE_CFLAGS=$(FLAGS_ALL) $(BASE_DEFS) \
 	-DVERSION=\"\\\"$(NAME)-$(VERSION)-$(BUILD_ID)\\\"\" \
 	-DBUILD_HOST=\"\\\"$(BUILD_HOST)\\\"\"
 
@@ -183,7 +190,6 @@ OBJS = \
 	$(BUILDDIR)/GLString.o \
 	$(BUILDDIR)/MatMath.o \
 	$(BUILDDIR)/Matrix.o \
-	$(BUILDDIR)/tga.o \
 	$(BUILDDIR)/Network.o \
 	$(BUILDDIR)/OpenGLMesh.o \
 	$(BUILDDIR)/OpenRaider.o \
@@ -195,6 +201,7 @@ OBJS = \
 	$(BUILDDIR)/Sound.o \
 	$(BUILDDIR)/System.o \
 	$(BUILDDIR)/Texture.o \
+	$(BUILDDIR)/TGA.o \
 	$(BUILDDIR)/TombRaider.o \
 	$(BUILDDIR)/Vector3d.o \
 	$(BUILDDIR)/ViewVolume.o \
@@ -277,7 +284,7 @@ endif
 #################################################################
 # Unit Test builds
 #################################################################
-TEST_FLAGS=$(WARNINGS) -g -O0 -DDEBUG -lstdc++ -Iinclude
+TEST_FLAGS=$(FLAGS_ALL) -g -O0 -DDEBUG -lstdc++ -Iinclude
 
 TEST_MAP_TR5=~/.OpenRaider/paks/tr5/demo.trc
 TEST_MAP_TR4=~/.OpenRaider/paks/tr4/angkor1.tr4
@@ -322,9 +329,9 @@ TR_FLAGS = -D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES -DDEBUG_MEMORY
 
 TombRaider.test:
 	@-mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(WARNINGS) -Iinclude $(TR_FLAGS) -o $(BUILD_TEST_DIR)/TombRaiderTest.o -c test/TombRaider.cpp
+	$(CC) $(FLAGS_ALL) -Iinclude $(TR_FLAGS) -o $(BUILD_TEST_DIR)/TombRaiderTest.o -c test/TombRaider.cpp
 	$(MAKE) targets NAME=TombRaider.test BUILDDIR=$(BUILD_TEST_DIR) \
-	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/tga.o $(BUILD_TEST_DIR)/memory_test.o" \
+	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/TGA.o $(BUILD_TEST_DIR)/memory_test.o" \
 	CFLAGS="$(BASE_CFLAGS) -g $(TR_FLAGS)" \
 	LD_FLAGS="-lz -lstdc++"
 
@@ -332,7 +339,7 @@ TombRaider.test:
 
 GLString.test:
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(WARNINGS) -Iinclude -DHAVE_SDL_TTF -DHAVE_SDL \
+	$(CC) $(FLAGS_ALL) -Iinclude -DHAVE_SDL_TTF -DHAVE_SDL \
 	$(shell sdl-config --cflags) $(shell sdl-config --libs) \
 	$(GL_LIBS) $(GL_DEFS) -lSDL_ttf -lm -lstdc++ \
 	src/Texture.cpp src/GLString.cpp \
@@ -343,21 +350,21 @@ GLString.test:
 Matrix.test:
 	@-echo "Building Matrix unit test"
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(WARNINGS) -g -lm -lstdc++ -Iinclude \
+	$(CC) $(FLAGS_ALL) -g -lm -lstdc++ -Iinclude \
 	src/Matrix.cpp src/Quaternion.cpp src/Vector3d.cpp \
 	test/Matrix.cpp -o $(BUILD_TEST_DIR)/Matrix.test
 
 Math.test:
 	@-echo "Building Math unit test"
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(WARNINGS) -g -lm -lstdc++ -Iinclude \
+	$(CC) $(FLAGS_ALL) -g -lm -lstdc++ -Iinclude \
 	src/MatMath.cpp src/Vector3d.cpp test/MatMath.cpp -o $(BUILD_TEST_DIR)/Math.test
 
 #################################################################
 
 Memory.test:
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(WARNINGS) -g -lstdc++ -Iinclude \
+	$(CC) $(FLAGS_ALL) -g -lstdc++ -Iinclude \
 	-DDEBUG_MEMORY -DDEBUG_MEMORY_ERROR \
 	src/memory_test.cpp test/memory_test.cpp -o $(BUILD_TEST_DIR)/memory_test.test
 
@@ -381,7 +388,7 @@ Sound.test:
 TGA.test:
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) $(TEST_FLAGS) \
-		src/tga.cpp test/tga.cpp -o $(BUILD_TEST_DIR)/TGA.test
+		src/TGA.cpp test/TGA.cpp -o $(BUILD_TEST_DIR)/TGA.test
 
 #################################################################
 

include/Emitter.h

@@ -273,6 +273,9 @@ class Emitter
 
  private:
 
+    static int compareParticleDist(const void *voidA, const void *voidB);
+
+
 	char *_name;              /* Emitter name */
 
 	unsigned int _flags;      /* Emitter flags */

include/List.h

@@ -337,7 +337,12 @@ template <class T> class List
     _cache = _head;
   }
 
-  bool operator ++ (int dummy)
+  bool operator ++ (int)
+  {
+    return Next();
+  }
+
+  bool operator ++ ()
   {
     return Next();
   }

include/Map.h

@@ -498,7 +498,12 @@ public:
 	}
 
 
-	bool operator ++ (int dummy)
+	bool operator ++ (int)
+	{
+		return Next();
+	}
+
+    bool operator ++ ()
 	{
 		return Next();
 	}

include/MatMath.h

@@ -27,15 +27,24 @@ typedef float vec4_t[4];    //!< 4D Vector
 typedef vec_t matrix_t[16]; //!< Used as _Column_major_ in every class now!
 
 /*!
+ * \fixme Add Documentation or remove, as it is unused?
+ */
+vec_t helIntersectionOfAbstractSpheres(vec3_t centerA, vec_t radiusA, vec3_t centerB, vec_t radiusB);
+
+/*!
+ * \fixme Add Documentation or remove, as it is unused?
+ */
+int helIntersectionOfAbstractSphereAndLine(vec3_t center, vec_t radius, vec3_t posA, vec3_t posB, vec3_t intersectionA, vec3_t intersectionB);
+
+/*!
  * \brief Calculate Intersection of a line and a polygon
  * \param intersect Where the intersection is stored, if it exists
  * \param p1 First point of line segment
  * \param p2 Second point of line segment
- * \param vertexCount number of vertices in polygon
- * \param polygon polygon vertex array
+ * \param polygon polygon vertex array (0 to 2 are used)
  * \returns 0 if there is no intersection
  */
-int helIntersectionLineAndPolygon(vec3_t intersect, vec3_t p1, vec3_t p2, unsigned int vertexCount, vec3_t *polygon);
+int helIntersectionLineAndPolygon(vec3_t intersect, vec3_t p1, vec3_t p2, vec3_t *polygon);
 
 /*!
  * \brief Calculate the distance from a sphere to a plane

src/Camera.cpp

@@ -306,6 +306,7 @@ void Camera::command(enum camera_command cmd)
   case CAMERA_SPEED_DOWN:
     if (--mTranslateDelta < 0.0)
       mTranslateDelta = 1.0;
+    break;
   default:
     ;
   }

src/Emitter.cpp

@@ -39,7 +39,7 @@
 vec_t Emitter::mFrustum[6][4];
 
 
-int compareParticleDist(const void *voidA, const void *voidB)
+int Emitter::compareParticleDist(const void *voidA, const void *voidB)
 {
 	Particle *a = (Particle *)voidA, *b = (Particle *)voidB;
 	float x, y, z, distA, distB;

src/MatMath.cpp

@@ -13,35 +13,6 @@
 #include <Vector3d.h>
 #include <Matrix.h>
 
-bool tmpHelSphereIntersectLine(Vector3d pos, Vector3d lastPos,
-										 Vector3d center, vec_t radius)
-{
-	Vector3d seg, segToCenter, delta;
-	vec_t s, dSquare;
-
-
-	seg = pos - lastPos;
-	segToCenter = center - lastPos;
-
-	s = seg * segToCenter;
-
-	if (s >= 1.0f || s <= 0.0f)
-		return false;
-
-	seg.normalize();
-	seg = seg * s;
-	seg = seg + lastPos;
-
-	delta = seg - center;
-
-	dSquare = delta * delta;
-
-	if (radius >= dSquare)
-		return true;
-	else
-		return false;
-}
-
 
 vec_t helIntersectionOfAbstractSpheres(vec3_t centerA, vec_t radiusA,
 													vec3_t centerB, vec_t radiusB)
@@ -128,7 +99,7 @@ int helIntersectionOfAbstractSphereAndLine(vec3_t center, vec_t radius,
 
 int helIntersectionLineAndPolygon(vec3_t intersect,
 											 vec3_t p1, vec3_t p2,
-											 unsigned int vertexCount, vec3_t *polygon)
+											 vec3_t *polygon)
 {
 	//	vec3_t normal, a, b;
 	Vector3d a, b, normal, pA, pB;

src/Texture.cpp

@@ -38,7 +38,7 @@
 #endif
 
 #ifdef USING_TGA
-#include <tga.h>
+#include <TGA.h>
 #endif
 
 #ifdef USING_PNG

src/TombRaider.cpp

@@ -59,7 +59,7 @@
 #endif
 
 #ifdef __TEST_TR5_DUMP_TGA
-#include <tga.h>
+#include <TGA.h>
 #endif
 
 #ifdef DEBUG_MEMORY

src/ViewVolume.cpp

@@ -159,7 +159,7 @@ vec_t ViewVolume::getDistToSphereFromNear(vec_t x, vec_t y, vec_t z,
 														vec_t radius)
 {
    unsigned int p;
-   vec_t d;
+   vec_t d = 0.0;
 
    for (p = 0; p < 6; ++p)
    {

src/World.cpp

@@ -127,7 +127,7 @@ int World::getAdjoiningRoom(int index,
 			if (!portal)
 				continue;
 
-			if (helIntersectionLineAndPolygon(intersect, p1, p2, 4,
+			if (helIntersectionLineAndPolygon(intersect, p1, p2, // 4,
 														 portal->vertices))
 			{
 				return portal->adjoining_room;
@@ -431,8 +431,13 @@ void World::moveEntity(entity_t *e, char movement)
 	case worldMoveType_walk:
 		pitch = 0.0f;  // in the future pitch could control jump up blocks here
 		break;
+
+    case worldMoveType_noClipping:
+    case worldMoveType_fly:
+    case worldMoveType_swim:
 	default:
 		pitch = e->angles[2];
+        break;
 	}
 
 	switch (movement)

src/tga.cpp

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <tga.h>
+#include <TGA.h>
 
 #ifdef DEBUG_MEMORY
 #include <memory_test.h>
@@ -391,6 +391,8 @@ int mtk_image__tga_save(FILE *f, unsigned char *image,
   case 4:
     header.image_type = TGA_TYPE__COLOR;
     header.desc_flags = 32;
+    header.bpp = 32;
+    break;
   case 2:
     header.bpp = 32;
     break;

test/TombRaider.cpp

@@ -53,7 +53,7 @@
 #include <TombRaider.h>
 
 #ifdef __TEST_TR5_DUMP_TGA
-#include <tga.h>
+#include <TGA.h>
 #endif
 
 #ifdef DEBUG_MEMORY

test/tga.cpp

@@ -1,12 +1,12 @@
 /*!
- * \file test/tga.cpp
+ * \file test/TGA.cpp
  * \brief The TGA reader Unit Test
  *
  * \author xythobuz
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <tga.h>
+#include <TGA.h>
 #include "greatest.h"
 
 //! \todo generate list?