Removed hel mstl subfolders

ChangeLog

@@ -6,6 +6,9 @@
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
 	[ 20140110 ]
+	* Converted many FIXME comments to be in the doxygen documentation
+	* Removed hel & mstl folders, moved into parent directory
+	* mtk_tga Unit Test uses greatest
 	* Moved remaining Unit Tests (Network & TombRaider)
 	* memory_test Unit Test no longer produces warnings
 	* Building a memory test build no longer produces warnings

Doxyfile

@@ -218,7 +218,7 @@ TAB_SIZE               = 4
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines.
 
-ALIASES                = "fixme=\xrefitem fixme \"FIXME\" \"Fix Me\""
+ALIASES                = "fixme=\xrefitem fixme \"FIXME\" \"Fix-Me Entries\""
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding "class=itcl::class"

Makefile

@@ -32,7 +32,7 @@ UNAME=$(shell uname -s)
 BASE_DEFS=$(shell sdl-config --cflags) -Iinclude -DSDL_INTERFACE \
 	-DUSING_OPENGL -DZLIB_SUPPORT -DUSING_EMITTER \
 	-DUSING_OPENAL -DUSING_MTK_TGA -DUSING_PTHREADS \
-	-DUSING_HEL -DHAVE_SDL_TTF
+	-DHAVE_SDL_TTF
 
 BASE_LIBS=$(shell sdl-config --libs) -lz -lstdc++ \
 	-lpthread -lSDL_ttf
@@ -175,26 +175,20 @@ depend:
 
 ################################################################
 
-# Later hel will become a seperate library once it matures
-HEL_OBJ = \
-	$(BUILDDIR)/math.o \
-	$(BUILDDIR)/Matrix.o \
-	$(BUILDDIR)/Quaternion.o \
-	$(BUILDDIR)/Vector3d.o \
-	$(BUILDDIR)/ViewVolume.o
-
 OBJS = \
 	$(DEBUG_OBJ) \
-	$(HEL_OBJ) \
 	$(BUILDDIR)/Camera.o \
 	$(BUILDDIR)/Emitter.o \
 	$(BUILDDIR)/GLString.o \
 	$(BUILDDIR)/Light.o \
+	$(BUILDDIR)/MatMath.o \
+	$(BUILDDIR)/Matrix.o \
 	$(BUILDDIR)/mtk_tga.o \
 	$(BUILDDIR)/Network.o \
 	$(BUILDDIR)/OpenGLMesh.o \
 	$(BUILDDIR)/OpenRaider.o \
 	$(BUILDDIR)/Particle.o \
+	$(BUILDDIR)/Quaternion.o \
 	$(BUILDDIR)/Render.o \
 	$(BUILDDIR)/SDLSystem.o \
 	$(BUILDDIR)/SkeletalModel.o \
@@ -202,6 +196,8 @@ OBJS = \
 	$(BUILDDIR)/System.o \
 	$(BUILDDIR)/Texture.o \
 	$(BUILDDIR)/TombRaider.o \
+	$(BUILDDIR)/Vector3d.o \
+	$(BUILDDIR)/ViewVolume.o \
 	$(BUILDDIR)/World.o
 
 
@@ -324,8 +320,8 @@ Matrix.test:
 	@-echo "Building Matrix unit test"
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) -Wall -g -lm -lstdc++ -Iinclude \
-	src/hel/Matrix.cpp src/hel/Quaternion.cpp src/hel/Vector3d.cpp \
-	test/hel/Matrix.cpp -o $(BUILD_TEST_DIR)/Matrix.test
+	src/Matrix.cpp src/Quaternion.cpp src/Vector3d.cpp \
+	test/Matrix.cpp -o $(BUILD_TEST_DIR)/Matrix.test
 	@-echo "================================================="
 	@-echo "Running Matrix unit test"
 	$(BUILD_TEST_DIR)/Matrix.test
@@ -334,7 +330,7 @@ Quaternion.test:
 	@-echo "Building Quaternion unit test"
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) -Wall -g -lm -lstdc++ -Iinclude \
-	src/hel/Quaternion.cpp test/hel/Quaternion.cpp -o $(BUILD_TEST_DIR)/Quaternion.test
+	src/Quaternion.cpp test/Quaternion.cpp -o $(BUILD_TEST_DIR)/Quaternion.test
 	@-echo "================================================="
 	@-echo "Running Quaternion unit test"
 	$(BUILD_TEST_DIR)/Quaternion.test
@@ -343,7 +339,7 @@ Math.test:
 	@-echo "Building Math unit test"
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) -Wall -g -lm -lstdc++ -Iinclude \
-	src/hel/math.cpp src/hel/Vector3d.cpp test/hel/math.cpp -o $(BUILD_TEST_DIR)/Math.test
+	src/MatMath.cpp src/Vector3d.cpp test/MatMath.cpp -o $(BUILD_TEST_DIR)/Math.test
 	@-echo "================================================="
 	@-echo "Running hel unit test"
 	$(BUILD_TEST_DIR)/Math.test

include/hel/BoundingVolume.h → include/BoundingVolume.h

@@ -28,7 +28,7 @@
 #ifndef GUARD__LIBHEL_MONGOOSE_BOUNDINGVOLUME_H_
 #define GUARD__LIBHEL_MONGOOSE_BOUNDINGVOLUME_H_
 
-#include <hel/math.h>
+#include <MatMath.h>
 
 
 class BoundingSphere

include/Camera.h

@@ -38,9 +38,9 @@
 #ifndef __HEL_MONGOOSE_CAMERA_H_
 #define __HEL_MONGOOSE_CAMERA_H_
 
-#include "hel/math.h"
-#include "hel/Matrix.h"
-#include "hel/Quaternion.h"
+#include <MatMath.h>
+#include <Matrix.h>
+#include <Quaternion.h>
 
 enum camera_command                /* Interactive camera control */
 {

include/Emitter.h

@@ -26,7 +26,7 @@
 #ifndef __FREYJA_MONGOOSE_EMITTER_H_
 #define __FREYJA_MONGOOSE_EMITTER_H_
 
-#include "Particle.h"
+#include <Particle.h>
 
 
 class Emitter

include/hel/Entity.h → include/Entity.h

@@ -27,11 +27,11 @@
 #ifndef GUARD__HEL_MONGOOSE_ENTITY_H_
 #define GUARD__HEL_MONGOOSE_ENTITY_H_
 
-#include <hel/math.h>
-#include <hel/BoundingVolume.h>
-#include <hel/Quaternion.h>
-#include <hel/Vector3d.h>
-#include <hel/Mass.h>
+#include <MatMath.h>
+#include <BoundingVolume.h>
+#include <Quaternion.h>
+#include <Vector3d.h>
+#include <Mass.h>
 
 
 typedef enum

include/GLString.h

@@ -1,5 +1,5 @@
 /*!
- * \file GLString.h
+ * \file include/GLString.h
  * \brief Open GL rendering font/string class
  *
  * \author Mongoose

include/Light.h

@@ -23,7 +23,7 @@
 #ifndef __FREYJA_MONGOOSE_LIGHT_H_
 #define __FREYJA_MONGOOSE_LIGHT_H_
 
-#include "hel/math.h"
+#include <MatMath.h>
 
 
 class Light

include/mstl/Map.h → include/Map.h

@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <mstl/Tree.h>
+#include <Tree.h>
 
 #ifdef DEBUG_MEMORY
 #include <memory_test.h>

include/hel/Matrix.h → include/Matrix.h

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : Freyja
  * Author  : Terry 'Mongoose' Hendrix II
  * Website : http://www.westga.edu/~stu7440/
@@ -10,10 +10,10 @@
  * Comments: 3d Matrix in class form
  *
  *
- *           This file was generated using Mongoose's C++ 
+ *           This file was generated using Mongoose's C++
  *           template generator script.  <stu7440@westga.edu>
- * 
- *-- History ------------------------------------------------ 
+ *
+ *-- History ------------------------------------------------
  *
  * 2003.06.17:
  * Mongoose - Now in column order to match OpenGL user needs,
@@ -28,9 +28,9 @@
 #define GUARD__FREYJA_MONGOOSE_MATRIX_H_
 
 
-#include <hel/math.h>
-#include <hel/Quaternion.h>
-#include <hel/Vector3d.h>
+#include <MatMath.h>
+#include <Quaternion.h>
+#include <Vector3d.h>
 
 	///////////////////////////////////////////////
 	// Multidim map for row order encoding       //
@@ -61,29 +61,29 @@ class Matrix
 
 	Matrix();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs an object of Matrix
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.05.11: 
+	 * 2002.05.11:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	Matrix(matrix_t mat);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs an object of Matrix
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.05.11: 
+	 * 2002.05.11:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	Matrix(Quaternion &q);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Converts and asigns Q to a Matrix
 	 *        returns quaternion as Matrix
 	 *
@@ -100,7 +100,7 @@ class Matrix
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.05.11: 
+	 * 2002.05.11:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -110,7 +110,7 @@ class Matrix
 
 	void getMatrix(matrix_t mat);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns this matrix copy
 	 *
 	 *-- History ------------------------------------------
@@ -121,7 +121,7 @@ class Matrix
 
 	void getTransposeMatrix(matrix_t mat);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns this matrix transposed
 	 *
 	 *-- History ------------------------------------------
@@ -132,7 +132,7 @@ class Matrix
 
 	bool getInvert(matrix_t mat);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns this matrix inverted
 	 *
 	 *-- History ------------------------------------------
@@ -156,7 +156,7 @@ class Matrix
 	/*------------------------------------------------------
 	 * Pre  : Multiplies <V> vector (double[4]) and <This> matrix
 	 *
-	 * Post : Returns <Result> vector, 
+	 * Post : Returns <Result> vector,
 	 *        <V> and <Result> maybe be the same vector
 	 *
 	 *-- History ------------------------------------------
@@ -169,7 +169,7 @@ class Matrix
 	/*------------------------------------------------------
 	 * Pre  : Multiplies <V> vector and <This> matrix
 	 *
-	 * Post : Returns <Result> vector, 
+	 * Post : Returns <Result> vector,
 	 *        <V> and <Result> maybe be the same vector
 	 *
 	 *-- History ------------------------------------------
@@ -182,7 +182,7 @@ class Matrix
 	/*------------------------------------------------------
 	 * Pre  : Multiplies <V> vector and <This> matrix
 	 *
-	 * Post : Returns <Result> vector, 
+	 * Post : Returns <Result> vector,
 	 *        <V> and <Result> maybe be the same vector
 	 *
 	 *-- History ------------------------------------------
@@ -193,7 +193,7 @@ class Matrix
 
 	void print();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Prints matrix values to stdout
 	 *
 	 *-- History ------------------------------------------
@@ -204,7 +204,7 @@ class Matrix
 
 	bool isIdentity();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Is this matrix the identity matrix?
 	 *
 	 *-- History ------------------------------------------
@@ -242,7 +242,7 @@ class Matrix
 
 	void setIdentity();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Sets to identity matrix
 	 *
 	 *-- History ------------------------------------------
@@ -253,7 +253,7 @@ class Matrix
 
 	void setMatrix(matrix_t mat);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Set the matrix ( dangerous, scary boo )
 	 *
 	 *-- History ------------------------------------------
@@ -286,7 +286,7 @@ class Matrix
 
 	void scale(vec_t x, vec_t y, vec_t z);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Scales object in 3 space
 	 *
 	 *-- History ------------------------------------------
@@ -297,7 +297,7 @@ class Matrix
 
 	void scale(const vec_t *xyz);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Scales object in 3 space
 	 *
 	 *-- History ------------------------------------------
@@ -308,7 +308,7 @@ class Matrix
 
 	void translate(vec_t x, vec_t y, vec_t z);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Translates ( moves ) object in 3 space
 	 *
 	 *-- History ------------------------------------------
@@ -319,7 +319,7 @@ class Matrix
 
 	void translate(const vec_t *xyz);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Translates ( moves ) object in 3 space
 	 *
 	 *-- History ------------------------------------------
@@ -330,7 +330,7 @@ class Matrix
 
 	void transpose();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Transpose this matrix
 	 *
 	 *-- History ------------------------------------------
@@ -355,7 +355,7 @@ class Matrix
 
 	void copy(matrix_t source, matrix_t dest);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Copys value of source to dest
 	 *
 	 *-- History ------------------------------------------

include/OpenGLMesh.h

@@ -1,5 +1,5 @@
 /*!
- * \file OpenGLMesh.h
+ * \file include/OpenGLMesh.h
  * \brief OpenGL Mesh
  *
  * \author Mongoose
@@ -10,7 +10,7 @@
 #ifndef GUARD__OPENRAIDER_MONGOOSE_OPENGLMESH_H_
 #define GUARD__OPENRAIDER_MONGOOSE_OPENGLMESH_H_
 
-#include "hel/math.h"
+#include <MatMath.h>
 
 class OpenGLMesh {
 public:

include/OpenRaider.h

@@ -27,16 +27,16 @@
 #define GUARD__OPENRAIDER_MONGOOSE_OPENRAIDER_H_
 
 
-#include "mstl/List.h"
-#include "mstl/Map.h"
-#include "mstl/Vector.h"
-#include "TombRaider.h"
-#include "Camera.h"
-#include "Render.h"
-#include "Sound.h"
-#include "SDLSystem.h"
-#include "Network.h"
-#include "World.h"
+#include <List.h>
+#include <Map.h>
+#include <Vector.h>
+#include <TombRaider.h>
+#include <Camera.h>
+#include <Render.h>
+#include <Sound.h>
+#include <SDLSystem.h>
+#include <Network.h>
+#include <World.h>
 
 
 typedef enum

include/Particle.h

@@ -1,5 +1,5 @@
 /*!
- * \file Particle.h
+ * \file include/Particle.h
  * \brief Particle system base header
  *
  * \author Mongoose
@@ -8,7 +8,7 @@
 #ifndef __FREYJA_MONGOOSE_PARTICLE_H_
 #define __FREYJA_MONGOOSE_PARTICLE_H_
 
-#include "hel/math.h"
+#include <MatMath.h>
 
 /*!
  * \brief Partcle systems atomic base

include/hel/Quaternion.h → include/Quaternion.h

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : Hel
  * Author  : Terry 'Mongoose' Hendrix II
  * Website : http://www.westga.edu/~stu7440/
@@ -10,14 +10,14 @@
  * Comments: Quaternion now in C++ class form fresh from the grove
  *
  *
- *           This file was generated using Mongoose's C++ 
+ *           This file was generated using Mongoose's C++
  *           template generator script.  <stu7440@westga.edu>
- * 
+ *
  *-- Test Defines -----------------------------------------------
- *           
- * UNIT_TEST_QUATERNION - Builds Quaternion class as a console unit test 
  *
- *-- History ------------------------------------------------ 
+ * UNIT_TEST_QUATERNION - Builds Quaternion class as a console unit test
+ *
+ *-- History ------------------------------------------------
  *
  * 2002.12.16:
  * Mongoose - Created, based on mtk3d ( freyja )
@@ -27,8 +27,7 @@
 #ifndef GUARD__HEL_MONGOOSE_QUATERNION_H_
 #define GUARD__HEL_MONGOOSE_QUATERNION_H_
 
-#include <hel/math.h>
-//#include <hel/Matrix.h>
+#include <MatMath.h>
 
 class Quaternion
 {
@@ -40,23 +39,23 @@ class Quaternion
 
 	Quaternion();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs an object of Quaternion
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.16: 
+	 * 2002.12.16:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	Quaternion(vec_t w, vec_t x, vec_t y, vec_t z);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs an object of Quaternion
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.16: 
+	 * 2002.12.16:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -67,7 +66,7 @@ class Quaternion
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.16: 
+	 * 2002.12.16:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -78,7 +77,7 @@ class Quaternion
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.16: 
+	 * 2002.12.16:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -100,7 +99,7 @@ class Quaternion
 
 	Quaternion operator =(const Quaternion &q);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Asigns Q to this quaternion
 	 *        returns (this) resultant quaternion
 	 *
@@ -112,7 +111,7 @@ class Quaternion
 
 	Quaternion operator *(const Quaternion &q);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Multiplies Q and this quaternion
 	 *        returns resultant quaternion
 	 *        ( Use normalize() call for unit quaternion )
@@ -125,7 +124,7 @@ class Quaternion
 
 	Quaternion operator /(const Quaternion &q);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Dividess Q from this quaternion
 	 *        returns quotient quaternion
 	 *
@@ -137,7 +136,7 @@ class Quaternion
 
 	Quaternion operator +(const Quaternion &q);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Adds Q and this quaternion
 	 *        returns resultant quaternion
 	 *
@@ -149,7 +148,7 @@ class Quaternion
 
 	Quaternion operator -(const Quaternion &q);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Subtracts Q from this quaternion
 	 *        returns resultant quaternion
 	 *
@@ -161,7 +160,7 @@ class Quaternion
 
 	bool operator ==(const Quaternion &q);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Compares Q to this quaternion
 	 *        returns boolean true if equal, otherwise false
 	 *
@@ -173,7 +172,7 @@ class Quaternion
 
 	Quaternion conjugate();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns conjugate of this quaternion
 	 *
 	 *-- History ------------------------------------------
@@ -184,7 +183,7 @@ class Quaternion
 
 	Quaternion scale(vec_t s);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns scaled result of this quaternion
 	 *
 	 *-- History ------------------------------------------
@@ -195,7 +194,7 @@ class Quaternion
 
 	Quaternion inverse();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns inverse of this quaternion
 	 *
 	 *-- History ------------------------------------------
@@ -206,7 +205,7 @@ class Quaternion
 
 	static vec_t dot(Quaternion a, Quaternion b);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns dot product of A and B quaternions
 	 *
 	 *-- History ------------------------------------------
@@ -217,7 +216,7 @@ class Quaternion
 
 	vec_t magnitude();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns magnitude this quaternion
 	 *
 	 *-- History ------------------------------------------
@@ -228,7 +227,7 @@ class Quaternion
 
 	static Quaternion slerp(Quaternion a, Quaternion b, vec_t time);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Interpolates between A and B rotations and
 	 *        returns resultant quaternion using
 	 *        spherical linear interpolation:
@@ -248,7 +247,7 @@ class Quaternion
 
 	void setIdentity();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Sets this quaternion to identity
 	 *
 	 *-- History ------------------------------------------
@@ -259,7 +258,7 @@ class Quaternion
 
 	void set(vec_t angle, vec_t x, vec_t y, vec_t z);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Sets this quaternion
 	 *
 	 *-- History ------------------------------------------
@@ -270,7 +269,7 @@ class Quaternion
 
 	void normalize();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Normalize this quaternion
 	 *
 	 *-- History ------------------------------------------
@@ -281,7 +280,7 @@ class Quaternion
 
 	void copy(Quaternion q);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Set this quaternion using q
 	 *
 	 *-- History ------------------------------------------
@@ -310,7 +309,7 @@ class Quaternion
 
 	Quaternion multiply(Quaternion a, Quaternion b);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Multiplies A and B quaternions
 	 *        returns resultant quaternion
 	 *
@@ -322,7 +321,7 @@ class Quaternion
 
 	Quaternion divide(Quaternion a, Quaternion b);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Divides B from A quaternion
 	 *        returns quotient quaternion
 	 *
@@ -334,7 +333,7 @@ class Quaternion
 
 	Quaternion add(Quaternion a, Quaternion b);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Adds A and B quaternions
 	 *        returns resultant quaternion
 	 *
@@ -346,7 +345,7 @@ class Quaternion
 
 	Quaternion subtract(Quaternion a, Quaternion b);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Subtracts B from A quaternion
 	 *        returns resultant quaternion
 	 *

include/Render.h

@@ -23,20 +23,20 @@
 #ifndef GUARD__RENDER_MONGOOSE_RENDER_H_
 #define GUARD__RENDER_MONGOOSE_RENDER_H_
 
-#include "mstl/List.h"
-#include "mstl/Vector.h"
-#include "hel/Matrix.h"
-#include "hel/ViewVolume.h"
-#include "Light.h"
-#include "World.h"
-#include "SkeletalModel.h"
-#include "OpenGLMesh.h"
-#include "Texture.h"
-#include "Camera.h"
-#include "GLString.h"
+#include <List.h>
+#include <Vector.h>
+#include <Matrix.h>
+#include <ViewVolume.h>
+#include <Light.h>
+#include <World.h>
+#include <SkeletalModel.h>
+#include <OpenGLMesh.h>
+#include <Texture.h>
+#include <Camera.h>
+#include <GLString.h>
 
 #ifdef USING_EMITTER
-#   include "Emitter.h"
+#include <Emitter.h>
 #endif
 
 
@@ -50,7 +50,7 @@ public:
 
 	~RenderRoom()
 	{
-		// FIXME: hangs when erasing - might be shared pointers somewhere
+		//! \fixme Hangs when erasing - might be shared pointers somewhere
 		//lights.erase();
 	}
 
@@ -342,7 +342,7 @@ class Render
     * Mongoose - Created
     ------------------------------------------------------*/
 
-	// FIXME: Should be private
+	//! \fixme Should be private
    void drawLoadScreen();
    /*------------------------------------------------------
     * Pre  : Texture is init

include/SDLSystem.h

@@ -29,7 +29,7 @@
 #   error "SDLSystem requires -DSDL_INTERFACE"
 #endif
 
-#include "System.h"
+#include <System.h>
 
 class SDLSystem : public System
 {

include/SkeletalModel.h

@@ -1,5 +1,5 @@
 /*!
- * \file SkeletalModel.h
+ * \file include/SkeletalModel.h
  * \brief This is the factored out skeletal model class
  *
  * Defining UNIT_TEST_SKELETALMODEL builds SkeletalModel class as a console unit test
@@ -14,8 +14,8 @@
 #ifndef GUARD__OPENRAIDER_MONGOOSE_SKELETALMODEL_H_
 #define GUARD__OPENRAIDER_MONGOOSE_SKELETALMODEL_H_
 
-#include "mstl/Vector.h"
-#include "hel/math.h"
+#include <Vector.h>
+#include <MatMath.h>
 
 
 typedef struct bone_tag_s

include/Sound.h

@@ -1,5 +1,5 @@
 /*!
- * \file Sound.h
+ * \file include/Sound.h
  * \brief This is the audio manager Header
  *
  * \author Mongoose

include/System.h

@@ -1,5 +1,5 @@
 /*!
- * \file System.h
+ * \file include/System.h
  * \brief Mostly defines the interface of System implementations.
  *
  * Currently only SDL is used, but there was a GLUT implementation.
@@ -11,8 +11,8 @@
 #ifndef GUARD__UNRAIDER_MONGOOSE_SYSTEM_H_
 #define GUARD__UNRAIDER_MONGOOSE_SYSTEM_H_
 
-#include "mstl/Map.h"
-#include "mstl/Vector.h"
+#include <Map.h>
+#include <Vector.h>
 
 //! \todo Replace with unicode compatible key codes
 #define SYS_MOUSE_LEFT    6000

include/hel/Vector3d.h → include/Vector3d.h

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : Hel
  * Author  : Terry 'Mongoose' Hendrix II
  * Website : http://www.westga.edu/~stu7440/
@@ -10,14 +10,14 @@
  * Comments: Math vector
  *
  *
- *           This file was generated using Mongoose's C++ 
+ *           This file was generated using Mongoose's C++
  *           template generator script.  <stu7440@westga.edu>
- * 
+ *
  *-- Test Defines -----------------------------------------------
- *           
- * UNIT_TEST_VECTOR3D - Builds Vector3d class as a console unit test 
  *
- *-- History ------------------------------------------------ 
+ * UNIT_TEST_VECTOR3D - Builds Vector3d class as a console unit test
+ *
+ *-- History ------------------------------------------------
  *
  * 2002.12.24:
  * Mongoose - Created
@@ -28,7 +28,7 @@
 #define GUARD__HEL_MONGOOSE_VECTOR3D_H_
 
 
-#include <hel/math.h>
+#include <MatMath.h>
 
 class Vector3d
 {
@@ -40,34 +40,34 @@ class Vector3d
 
 	Vector3d();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs an object of Vector3d
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.24: 
+	 * 2002.12.24:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	Vector3d(vec3_t v);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs an object of Vector3d
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.24: 
+	 * 2002.12.24:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	Vector3d(vec_t x, vec_t y, vec_t z);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs an object of Vector3d
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.24: 
+	 * 2002.12.24:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -78,7 +78,7 @@ class Vector3d
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.24: 
+	 * 2002.12.24:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -89,7 +89,7 @@ class Vector3d
 
 	static vec_t dot(const Vector3d &u, const Vector3d &v);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns dot product of U and V vectors
 	 *
 	 *-- History ------------------------------------------
@@ -100,7 +100,7 @@ class Vector3d
 
 	static Vector3d cross(const Vector3d &u, const Vector3d &v);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns cross product of U and V vectors
 	 *
 	 *-- History ------------------------------------------
@@ -111,7 +111,7 @@ class Vector3d
 
 	vec_t magnitude();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns magnitude this vector
 	 *
 	 *-- History ------------------------------------------
@@ -122,7 +122,7 @@ class Vector3d
 
 	Vector3d unit();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns normalized copy of this vector
 	 *
 	 *-- History ------------------------------------------
@@ -133,7 +133,7 @@ class Vector3d
 
 	static Vector3d zeroVector();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns the Zero vector <0, 0, 0>
 	 *
 	 *-- History ------------------------------------------
@@ -144,7 +144,7 @@ class Vector3d
 
 	Vector3d operator +(const Vector3d &v);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns a vector = this vector + v
 	 *
 	 *-- History ------------------------------------------
@@ -155,7 +155,7 @@ class Vector3d
 
 	Vector3d operator -(const Vector3d &v);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns a vector = this vector - v
 	 *
 	 *-- History ------------------------------------------
@@ -166,7 +166,7 @@ class Vector3d
 
 	Vector3d operator -();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns a copy of this vector, negated
 	 *
 	 *-- History ------------------------------------------
@@ -215,7 +215,7 @@ class Vector3d
 
 	void normalize();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Normalizes *this vector
 	 *
 	 *-- History ------------------------------------------
@@ -226,7 +226,7 @@ class Vector3d
 
 	void zero();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post :This is set to the Zero vector <0, 0, 0>
 	 *
 	 *-- History ------------------------------------------
@@ -237,7 +237,7 @@ class Vector3d
 
 	void operator =(const Vector3d &v);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : this = v, values are assigned   =)
 	 *
 	 *-- History ------------------------------------------
@@ -248,7 +248,7 @@ class Vector3d
 
 	void operator +=(const Vector3d &v);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : this += v, values are sumed, assigned   =)
 	 *
 	 *-- History ------------------------------------------
@@ -259,7 +259,7 @@ class Vector3d
 
 	void operator -=(const Vector3d &v);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : this -= v, values are diffed, assigned   =)
 	 *
 	 *-- History ------------------------------------------
@@ -270,7 +270,7 @@ class Vector3d
 
 	void operator *=(vec_t s);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : this *= s, values are scaled, assigned   =)
 	 *
 	 *-- History ------------------------------------------

include/hel/ViewVolume.h → include/ViewVolume.h

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : hel
  * Author  : Terry 'Mongoose' Hendrix II
  * Website : http://www.westga.edu/~stu7440/
@@ -10,14 +10,14 @@
  * Comments: This is the viewing volume for culling use
  *
  *
- *           This file was generated using Mongoose's C++ 
+ *           This file was generated using Mongoose's C++
  *           template generator script.  <stu7440@westga.edu>
- * 
+ *
  *-- Test Defines -----------------------------------------------
- *           
- * UNIT_TEST_VIEWVOLUME - Builds ViewVolume class as a console unit test 
  *
- *-- History ------------------------------------------------ 
+ * UNIT_TEST_VIEWVOLUME - Builds ViewVolume class as a console unit test
+ *
+ *-- History ------------------------------------------------
  *
  * 2002.12.15:
  * Mongoose - Created
@@ -27,8 +27,8 @@
 #ifndef GUARD__HEL_MONGOOSE_VIEWVOLUME_H_
 #define GUARD__HEL_MONGOOSE_VIEWVOLUME_H_
 
-#include <hel/Matrix.h>
-#include <hel/BoundingVolume.h>
+#include <Matrix.h>
+#include <BoundingVolume.h>
 
 class ViewVolume
 {
@@ -59,12 +59,12 @@ class ViewVolume
 
 	ViewVolume();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs an object of ViewVolume
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.15: 
+	 * 2002.12.15:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -75,7 +75,7 @@ class ViewVolume
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.15: 
+	 * 2002.12.15:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -86,48 +86,48 @@ class ViewVolume
 
 	bool isBoundingVolumeInFrustum(BoundingVolume bvol);
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : Returns true if frustum contains the given 
+	 * Pre  :
+	 * Post : Returns true if frustum contains the given
 	 *        bounding volume
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.15: 
+	 * 2002.12.15:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	bool isBoundingSphereInFrustum(BoundingSphere bvol);
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : Returns true if frustum contains the given 
+	 * Pre  :
+	 * Post : Returns true if frustum contains the given
 	 *        bounding volume
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.15: 
+	 * 2002.12.15:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	bool isBoundingBoxInFrustum(BoundingBox bvol);
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : Returns true if frustum contains the given 
+	 * Pre  :
+	 * Post : Returns true if frustum contains the given
 	 *        bounding volume
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.15: 
+	 * 2002.12.15:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	bool isPointInFrustum(vec_t x, vec_t y, vec_t z);
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.15: 
+	 * 2002.12.15:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -138,7 +138,7 @@ class ViewVolume
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.15: 
+	 * 2002.12.15:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -149,19 +149,19 @@ class ViewVolume
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.15: 
+	 * 2002.12.15:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	vec_t getDistToSphereFromNear(vec_t x, vec_t y, vec_t z, vec_t radius);
 	/*------------------------------------------------------
 	 * Pre  : Abstract sphere is valid
-	 * Post : Returns distance to abstract sphere 
+	 * Post : Returns distance to abstract sphere
 	 *        bounding volume
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.15: 
+	 * 2002.12.15:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -173,7 +173,7 @@ class ViewVolume
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.12.15: 
+	 * 2002.12.15:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -190,7 +190,7 @@ class ViewVolume
 
 	void getPlane(ViewVolumeSide p, vec4_t plane);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Get a copy of a given plane in view volume
 	 *
 	 *-- History ------------------------------------------
@@ -199,7 +199,7 @@ class ViewVolume
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
-	
+
 	////////////////////////////////////////////////////////////
 	// Public Mutators
 	////////////////////////////////////////////////////////////

include/World.h

@@ -30,12 +30,12 @@
 #define BAD_BLOOD  // For temp rendering use
 
 #ifdef BAD_BLOOD
-#   include "SkeletalModel.h"
+#include <SkeletalModel.h>
 #endif
 
-#include "mstl/List.h"
-#include "mstl/Vector.h"
-#include "hel/math.h"
+#include <List.h>
+#include <Vector.h>
+#include <MatMath.h>
 
 
 // Mirrors TombRaider class' room flags really
@@ -103,9 +103,10 @@ typedef struct sprite_seq_s
 } sprite_seq_t;
 
 
-// FIXME: For now shaders are textures on tex objects
-//        and materials on color objects.  If -1
-//        then it doesn't have that information yet.
+/*! \fixme For now shaders are textures on tex objects
+ * and materials on color objects. If -1
+ * then it doesn't have that information yet.
+ */
 
 typedef struct texture_tri_s
 {
@@ -210,7 +211,7 @@ typedef struct sector_s
 
 } sector_t;
 
-// FIXME: No room mesh list or sprites and etc
+//! \fixme No room mesh list or sprites and etc
 typedef struct room_mesh_s
 {
 	Vector<int> adjacentRooms;

src/Camera.cpp

@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <hel/math.h>
+#include <MatMath.h>
 #include <Camera.h>
 
 #ifdef DEBUG_MEMORY

src/GLString.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file GLString.cpp
+ * \file src/GLString.cpp
  * \brief Open GL rendering font/string class
  *
  * \author Mongoose

src/hel/math.cpp → src/MatMath.cpp

@@ -3,9 +3,9 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include <hel/math.h>
-#include <hel/Vector3d.h>
-#include <hel/Matrix.h>
+#include <MatMath.h>
+#include <Vector3d.h>
+#include <Matrix.h>
 
 #define COMPUTE
 

src/hel/Matrix.cpp → src/Matrix.cpp

@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <hel/Matrix.h>
+#include <Matrix.h>
 
 
 ////////////////////////////////////////////////////////////

src/Network.cpp

@@ -444,7 +444,7 @@ int Network::runServer()
 			}
 		}
 
-		// FIXME: Combine with above, duh
+		//! \fixme Combine with above, duh
 		// 3. Send to network layer
 		if (gClients[i].frameExpected == f.header)
 		{

src/OpenGLMesh.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file OpenGLMesh.cpp
+ * \file src/OpenGLMesh.cpp
  * \brief OpenGL Mesh
  *
  * \author Mongoose
@@ -248,7 +248,7 @@ void OpenGLMesh::drawSolid()
 
 		glPointSize(1.0f);
 
-		return; // FIXME
+		return; //! \fixme
 
 		for (j = 0; j < mQuads[i].num_quads; ++j)
 		{
@@ -532,7 +532,7 @@ void OpenGLMesh::bufferTriangles(unsigned int count,
 	mTriangleFlags = flags;
 	mTriangleTexCoordArray = texCoords;
 
-	// FIXME: sortTrianglesByTexture();
+	//! \fixme sortTrianglesByTexture();
 }
 
 

src/OpenRaider.cpp

@@ -137,10 +137,11 @@ OpenRaider::OpenRaider() : SDLSystem()
 
 OpenRaider::~OpenRaider()
 {
-	// Mongoose 2002.01.02, FIXME GL call to critical section,
-	//   needs mutex really
+	/*! \fixme GL call to critical section,
+	 * needs mutex really -- Mongoose 2002.01.02
+     */
 	m_render.setMode(Render::modeDisabled);
-	//sleep(1); // Why should we sleep here? -- xythobuz
+	sleep(1);
 
 	printf("Removing World...\n");
 	gWorld.destroy();
@@ -1141,10 +1142,11 @@ void OpenRaider::loadLevel(char *mapname)
 	display_memory_usage();
 #endif
 
-	// Mongoose 2002.01.02, FIXME GL call to critical section,
-	//   needs mutex really
+	/*! \fixme GL call to critical section,
+	 * needs mutex really -- Mongoose 2002.01.02
+     */
 	m_render.setMode(Render::modeDisabled);
-	//sleep(2);
+	sleep(1);
 
 	// Draw game, level is loaded
 	m_render.setMode(Render::modeVertexLight);
@@ -1608,7 +1610,7 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
 		}
 	}
 
-	// FIXME: Check here and see if we already have one for object_id later
+	//! \fixme Check here and see if we already have one for object_id later
 	// if (gWorld.isCachedSkeletalModel(moveable[index].object_id))
 	// {
 	//   thing->modelId = m_render.add(sModel);
@@ -1688,8 +1690,7 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
 		return;
 	}
 
-	// FIXME: Might be better UID for each model, but this seems
-	//        to work well
+	//! \fixme Might be better UID for each model, but this seems to work well
 	j = object_id;
 
 	// We only want one copy of the skeletal model in memory
@@ -2023,7 +2024,7 @@ void OpenRaider::processModel(int index)
 	// Assert common sense
 	if (index < 0 || !m_tombraider.isMeshValid(index))
 	{
-		// FIXME: allow sparse lists with matching ids instead?
+		//! \fixme allow sparse lists with matching ids instead?
 		gWorld.addMesh(NULL); // Filler, to make meshes array ids align
 		printf("x");
 		fflush(stdout);
@@ -2038,7 +2039,7 @@ void OpenRaider::processModel(int index)
 	// Mongoose 2002.08.30, Testing support for 'shootable' models ( traceable )
 	m_tombraider.getMeshCollisionInfo(index, mesh->center, &mesh->radius);
 
-	// FIXME: Arrays don't work either  =)
+	//! \fixme Arrays don't work either  =)
 	// Mesh geometery, colors, etc
 	m_tombraider.getMeshVertexArrays(index,
 												&mesh->vertexCount, &mesh->vertices,
@@ -2266,7 +2267,7 @@ void OpenRaider::processRoom(int index)
 	float portalVertices[12];
 	count = m_tombraider.getRoomPortalCount(index);
 
-	// FIXME: OR wrongly uses a cached adj room list for rendering vis
+	//! \fixme OR wrongly uses a cached adj room list for rendering vis
 	r_mesh->adjacentRooms.reserve(count + 1);
 	r_mesh->adjacentRooms.setError(-1);
 
@@ -2304,7 +2305,7 @@ void OpenRaider::processRoom(int index)
 
 	// Physics/gameplay use /////////////////////////////
 
-	// FIXME: Use more of sector structure, boxes, and floordata
+	//! \fixme Use more of sector structure, boxes, and floordata
 
 	// List of sectors in this room
 	unsigned int sectorFlags;
@@ -2340,7 +2341,7 @@ void OpenRaider::processRoom(int index)
 	r_mesh->boxes.reserve(count);
 	r_mesh->boxes.setError(0x0);
 
-	// FIXME: Only to be done only on room[0]?  I don't think so...
+	//! fixme Only to be done only on room[0]?  I don't think so...
 	for (i = 0; !index && i < count; ++i)
 	{
 		box_t *box = new box_t;

src/Particle.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file Particle.cpp
+ * \file src/Particle.cpp
  * \brief Particle system base implementation
  *
  * \author Mongoose

src/hel/Quaternion.cpp → src/Quaternion.cpp

@@ -21,7 +21,7 @@
 
 #include <math.h>
 
-#include <hel/Quaternion.h>
+#include <Quaternion.h>
 
 
 ////////////////////////////////////////////////////////////

src/Render.cpp

@@ -779,7 +779,7 @@ void Render::Display()
 		return;
 		break;
 	case Render::modeLoadScreen:
-		// Mongoose 2002.01.01, FIXME entry for seperate main drawing method
+		//! \fixme entry for seperate main drawing method -- Mongoose 2002.01.01
 		drawLoadScreen();
 		return;
 	default:
@@ -1123,7 +1123,8 @@ void Render::buildRoomRenderList(RenderRoom *rRoom)
 	if (!rRoom || !rRoom->room)
 		return;
 
-	// Must be visible, FIXME: Add depth sorting here - remove multipass
+	// Must be visible
+    //! \fixme Add depth sorting here - remove multipass
 	if (!isVisible(rRoom->room->bbox_min, rRoom->room->bbox_max))
 		return;
 
@@ -1218,7 +1219,7 @@ void Render::drawLoadScreen()
 		return;
 
 	// Mongoose 2002.01.01, Rendered while game is loading...
-	//   FIXME seperate logo/particle coor later
+	//! \fixme seperate logo/particle coor later
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	glLoadIdentity();
 
@@ -1585,7 +1586,7 @@ void draw_bbox(vec3_t min, vec3_t max, bool draw_points)
 	glPointSize(4.0);
 	//glLineWidth(1.25);
 
-	//FIXME: Need to make custom color key for this
+	//! \fixme Need to make custom color key for this
 	glColor3fv(RED);
 
 	glBegin(GL_POINTS);
@@ -1662,7 +1663,7 @@ void draw_bbox_color(vec3_t min, vec3_t max, bool draw_points,
 	glPointSize(4.0);
 	//glLineWidth(1.25);
 
-	//FIXME: Need to make custom color key for this
+	//! \fixme Need to make custom color key for this
 	glColor3fv(c1);
 
 	glBegin(GL_POINTS);
@@ -2033,7 +2034,7 @@ void Render::drawModelMesh(model_mesh_t *r_mesh, RenderMeshType type)
 
 	// If they pass NULL structs let it hang up - this is tmp
 
-	// FIXME: Duh, vis tests need to be put back
+	//! \fixme Duh, vis tests need to be put back
 	//if (!isVisible(r_mesh->center,	r_mesh->radius, r_mesh->bbox))
 	//{
 	//	 return;
@@ -2082,7 +2083,7 @@ void Render::drawModelMesh(model_mesh_t *r_mesh, RenderMeshType type)
 #endif
 
 
-	// Mongoose 2002.01.08, FIXME 'AMBIENT'
+	//! \fixme 'AMBIENT' -- Mongoose 2002.01.08
 	glColor3fv(WHITE);
 
 	if (mMode == modeWireframe)

src/SDLSystem.cpp

@@ -171,7 +171,7 @@ void SDLSystem::glPrintf2d(float x, float y, char *string)
 {
 #ifdef HAVE_SDL_TTF
 #   ifdef FIXME
-	// FIXME: Filler
+	//! \fixme Filler
 	glBindTexture(GL_TEXTURE_2D, texture);
 	glBegin(GL_TRIANGLE_STRIP);
 	glTexCoord2f(texMinX, texMinY); glVertex2i(x,   y  );
@@ -187,8 +187,9 @@ void SDLSystem::glPrintf2d(float x, float y, char *string)
 void SDLSystem::glPrintf3d(float x, float y, float z, char *string)
 {
 #ifdef HAVE_SDL_TTF_FIXME
-	// FIXME: Filler
-	// FIXME: Billboarding here requires a yaw jackass   =)
+	/*! \fixme Filler
+	 * Billboarding here requires a yaw jackass =)
+     */
 	glBindTexture(GL_TEXTURE_2D, texture);
 	glBegin(GL_TRIANGLE_STRIP);
 	glTexCoord2f(texMinX, texMinY); glVertex2i(x,   y  );
@@ -364,11 +365,11 @@ void SDLSystem::runGame()
 
 				if (event.button.state == SDL_PRESSED)
 				{
-					handleKeyPressEvent(btn, 0); // FIXME: mod not used
+					handleKeyPressEvent(btn, 0); //! \fixme mod not used
 				}
 				else
 				{
-					handleKeyReleaseEvent(btn, 0); // FIXME: mod not used
+					handleKeyReleaseEvent(btn, 0); //! \fixme mod not used
 				}
 				break;
 			case SDL_KEYUP:
@@ -504,9 +505,10 @@ void SDLSystem::runGame()
 					}
 				}
 #else
-				// FIXME: Avoid passing modifers as a key, since the
-				// consoles using this expect text characters, add unicode
-				// support later when they're able to handle it
+				/*! \fixme Avoid passing modifers as a key, since the
+				 * consoles using this expect text characters, add unicode
+				 * support later when they're able to handle it
+                 */
 				if (key > 255 && key < 1000)
 				{
 					key = 0;

src/Sound.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file Sound.cpp
+ * \file src/Sound.cpp
  * \brief This is the audio manager Implementation
  *
  * \author Mongoose

src/System.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file System.cpp
+ * \file src/System.cpp
  * \brief Mostly defines the interface of System implementations.
  *
  * Currently only SDL is used, but there was a GLUT implementation.

src/TombRaider.cpp

@@ -426,7 +426,7 @@ int TombRaider::checkMime(char *filename)
      return -1;
    }
 
-	/* FIXME: Endianess */
+	//! \fixme Endianess
    fread(&version, sizeof(version), 1, f);
 	fclose(f);
 
@@ -474,7 +474,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 	mReset = false;
 
    Fread(&mPakVersion, sizeof(mPakVersion), 1, f);
-   //FIXME: endian
+   //! \fixme endian
 
    printDebug("Load", "mPakVersion = %u", mPakVersion);
 
@@ -776,7 +776,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
      if (mEngineVersion != TR_VERSION_1)
      {
-       //FIXME: need endian checking here
+       //! \fixme need endian checking here
        Fread(_textile16, sizeof(tr2_textile16_t), _num_textiles, f);
        printDebug("Load", "Read in 16bit texture tiles");
      }
@@ -790,7 +790,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
    printDebug("Load", "_unknown_t = 0x%x", _unknown_t);
 
    /* Read raw room data */
-   //FIXME: needs endian checking
+   //! \fixme needs endian checking
    Fread(&_num_rooms, sizeof(_num_rooms), 1, f);
    printDebug("Load", "_num_rooms = %i", _num_rooms);
 
@@ -806,7 +806,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 		}
 
      /* Read RoomInfo */
-     //FIXME: endian check needed
+     //! \fixme endian check needed
      Fread(&_rooms[i].info, sizeof(tr2_room_info_t), 1, f);
 
      printDebug("Load", "_rooms[%i].info =\n { x=%i, z=%i, yt=%i, yb=%i}",
@@ -825,7 +825,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
      /* Identify vertices */
      data_offset = 0;
-     //FIXME: endian
+     //! \fixme endian
      _rooms[i].room_data.num_vertices = *(short *)(_rooms[i].data);
 
      data_offset += sizeof(_rooms[0].room_data.num_vertices);
@@ -865,13 +865,13 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 					  _rooms[i].data + data_offset, data_size);
        }
 
-       //FIXME: endian conversions for verts needed
+       //! \fixme endian conversions for verts needed
      }
 
      data_offset += data_size;
 
      /* identify rectangles */
-     //FIXME: endian conversion
+     //! \fixme endian conversion
      _rooms[i].room_data.num_rectangles =
        *(short *)(_rooms[i].data + data_offset);
 
@@ -899,7 +899,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 				 _rooms[i].room_data.rectangles[j].texture &= 0x7fff;
 			 }
        }
-       //FIXME: endian conversion
+       //! \fixme endian conversion
      }
 
      data_offset += data_size;
@@ -907,7 +907,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      /* Identify triangles */
      _rooms[i].room_data.num_triangles =
        *(short *)(_rooms[i].data + data_offset);
-     //FIXME: endian
+     //! \fixme endian
 
      data_offset += sizeof(_rooms[0].room_data.num_triangles);
      data_size = _rooms[i].room_data.num_triangles * sizeof(tr2_tri_t);
@@ -933,7 +933,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 			 {
 				 _rooms[i].room_data.triangles[j].texture &= 0x7fff;
 			 }
-			 //FIXME: endian
+			 //! \fixme endian
        }
      }
 
@@ -942,7 +942,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
       /* Identify sprites */
       _rooms[i].room_data.num_sprites =
 			*(short *)(_rooms[i].data + data_offset);
-      //FIXME: endian
+      //! \fixme endian
 
       data_offset += sizeof(_rooms[0].room_data.num_sprites);
       data_size = _rooms[i].room_data.num_sprites * sizeof(tr2_room_sprite_t);
@@ -969,7 +969,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 				}
 			}
 
-			//FIXME: endian
+			//! \fixme endian
       }
 
       /* Free the raw room data */
@@ -977,7 +977,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
       _rooms[i].data = NULL;
 
       /* Read door info */
-      //FIXME: endian
+      //! \fixme endian
       Fread(&_rooms[i].num_portals, sizeof(_rooms[0].num_portals), 1, f);
 
       printDebug("Load", "_rooms[%i].num_portals = %i",
@@ -990,10 +990,10 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
       Fread(_rooms[i].portals, sizeof(tr2_room_portal_t),
 	    _rooms[i].num_portals, f);
-      //FIXME: endian
+      //! \fixme endian
 
       /* Read sector info */
-      //FIXME: endian
+      //! \fixme endian
       Fread(&_rooms[i].num_zsectors, sizeof(_rooms[0].num_zsectors), 1, f);
       Fread(&_rooms[i].num_xsectors, sizeof(_rooms[0].num_xsectors), 1, f);
 
@@ -1014,7 +1014,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
       Fread(_rooms[i].sector_list, sizeof(tr2_room_sector_t),
 	    _rooms[i].num_zsectors * _rooms[i].num_xsectors, f);
-      //FIXME: endian
+      //! \fixme endian
 
       printDebug("Load", "Read %u room sectors",
 		 _rooms[i].num_zsectors * _rooms[i].num_xsectors);
@@ -1045,7 +1045,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
       }
 
       /* Read room lighting info */
-       //FIXME: endian
+       //! \fixme endian
       Fread(&_rooms[i].num_lights, sizeof(_rooms[i].num_lights), 1, f);
 
       printDebug("Load", "_rooms[%i].num_lights = %u",
@@ -1106,11 +1106,11 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 						_rooms[i].num_lights, f);
 			}
       }
-      //FIXME: endian
+      //! \fixme endian
 
       /* Read Static Mesh Data */
       Fread(&_rooms[i].num_static_meshes, sizeof(unsigned short), 1, f);
-      //FIXME: endian
+      //! \fixme endian
 
       printDebug("Load", "_rooms[%i].num_static_meshes = %u",
 					  i, _rooms[i].num_static_meshes);
@@ -1142,16 +1142,16 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 						_rooms[i].num_static_meshes, f);
 			}
       }
-      //FIXME: endian
+      //! \fixme endian
 
       Fread(&_rooms[i].alternate_room, sizeof(short), 1, f);
-      //FIXME: endian
+      //! \fixme endian
 
       printDebug("Load", "_rooms[%i].alternate_room = %i",
 		 i, _rooms[i].alternate_room);
 
       Fread(&_rooms[i].flags, sizeof(short), 1, f);
-      //FIXME: endian
+      //! \fixme endian
 
       printDebug("Load", "_rooms[%i].flags = 0x%x",
 					  i, _rooms[i].flags);
@@ -1188,12 +1188,12 @@ int TombRaider::Load(char *filename, void (*percent)(int))
    {
      _floor_data = new unsigned short[_num_floor_data];
      Fread(_floor_data, sizeof(short), _num_floor_data, f);
-     //FIXME: endian
+     //! \fixme endian
    }
 
    /* Read mesh data */
    Fread(&num_mesh_data_words, sizeof(num_mesh_data_words), 1, f);
-   //FIXME: endian
+   //! \fixme endian
 
    printDebug("Load", "num_mesh_data_words = %u", num_mesh_data_words);
 
@@ -1205,13 +1205,13 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
    /* Read mesh pointers */
    Fread(&num_mesh_pointers, sizeof(num_mesh_pointers), 1, f);
-   //FIXME: endian
+   //! \fixme endian
 
    printDebug("Load", "num_mesh_pointers = %u", num_mesh_pointers);
 
    mesh_pointer_list = new unsigned int[num_mesh_pointers];
    Fread(mesh_pointer_list, sizeof(unsigned int), num_mesh_pointers, f);
-   //FIXME: endian
+   //! \fixme endian
 
    printDebug("Load", "Read mesh_pointer_list");
 
@@ -1222,7 +1222,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
    /* Read animations */
    Fread(&_num_animations, sizeof(_num_animations), 1, f);
-   //FIXME: endian
+   //! \fixme endian
 
    printDebug("Load", "_num_animations = %u", _num_animations);
 
@@ -1264,11 +1264,11 @@ int TombRaider::Load(char *filename, void (*percent)(int))
          Fread(_animations, sizeof(tr2_animation_t), _num_animations, f);
      }
    }
-   //FIXME: endian
+   //! \fixme endian
 
    /* Read state changes */
    Fread(&_num_state_changes, sizeof(_num_state_changes), 1, f);
-   //FIXME: endian
+   //! \fixme endian
 
 
    if (percent)
@@ -1282,11 +1282,11 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
      Fread(_state_changes, sizeof(tr2_state_change_t), _num_state_changes, f);
    }
-   //FIXME: endian
+   //! \fixme endian
 
    /* Read AnimDispatches */
    Fread(&_num_anim_dispatches, sizeof(_num_anim_dispatches), 1, f);
-   //FIXME: endian
+   //! \fixme endian
 
    printDebug("Load", "_num_anim_dispatches = %u", _num_anim_dispatches);
 
@@ -1298,11 +1298,11 @@ int TombRaider::Load(char *filename, void (*percent)(int))
       Fread(_anim_dispatches, sizeof(tr2_anim_dispatch_t),
 	    _num_anim_dispatches, f);
    }
-   //FIXME: endian
+   //! \fixme endian
 
    /* Read anim commands */
    Fread(&_num_anim_commands, sizeof(_num_anim_commands), 1, f);
-   //FIXME: endian
+   //! \fixme endian
 
    printDebug("Load", "_num_anim_commands = %u", _num_anim_commands);
 
@@ -1313,11 +1313,11 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      _anim_commands = new tr2_anim_command_t[_num_anim_commands];
      Fread(_anim_commands, sizeof(tr2_anim_command_t), _num_anim_commands, f);
    }
-   //FIXME: endian
+   //! \fixme endian
 
    /* Read MeshTrees */
    Fread(&_num_mesh_trees, sizeof(_num_mesh_trees), 1, f);
-   //FIXME: endian
+   //! \fixme endian
 
    printDebug("Load", "_num_mesh_trees = %u", _num_mesh_trees);
 
@@ -1328,11 +1328,11 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      _mesh_trees = new tr2_meshtree_t[_num_mesh_trees];
      Fread(_mesh_trees, sizeof(int), _num_mesh_trees, f);
    }
-   //FIXME: endian
+   //! \fixme endian
 
    /* Read frames */
    Fread(&_num_frames, sizeof(_num_frames), 1, f);
-   //FIXME: endian
+   //! \fixme endian
 
    printDebug("Load", "_num_frames = %u", _num_frames);
 
@@ -1342,7 +1342,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
    {
      _frames = new unsigned short[_num_frames];
      Fread(_frames, 2, _num_frames, f);
-     //FIXME: endian
+     //! \fixme endian
 
      if (mEngineVersion == TR_VERSION_1)
      {
@@ -1373,7 +1373,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
    /* Read moveables */
    Fread(&_num_moveables, sizeof(_num_moveables), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_moveables = %u", _num_moveables);
 
 	_moveables = 0x0;
@@ -1384,10 +1384,10 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      _moveables = new tr2_moveable_t[_num_moveables];
      Fread(_moveables, 18, _num_moveables, f);
    }
-   //FIXME: endian
+   //! \fixme endian
 
    Fread(&_num_static_meshes, sizeof(int), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_static_meshes = %u", _num_static_meshes);
 
    // SAFE EXIT //////////////////////////
@@ -1399,7 +1399,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      _static_meshes = new tr2_staticmesh_t[_num_static_meshes];
      Fread(_static_meshes, sizeof(tr2_staticmesh_t),
 	   _num_static_meshes, f);
-     //FIXME: endian
+     //! \fixme endian
    }
 
 	_object_textures = 0x0;
@@ -1409,7 +1409,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      /* Read object textures */
      Fread(&_num_object_textures, sizeof(int), 1, f);
      printDebug("Load", "_num_object_textures = %u", _num_object_textures);
-     //FIXME: endian
+     //! \fixme endian
 
      if (_num_object_textures > 0)
      {
@@ -1418,7 +1418,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
        Fread(_object_textures, sizeof(tr2_object_texture_t),
 	     _num_object_textures, f);
      }
-     //FIXME: endian
+     //! \fixme endian
    }
 
 
@@ -1436,7 +1436,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
    /* Read sprite textures */
    Fread(&_num_sprite_textures, sizeof(int), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_sprite_textures = %u", _num_sprite_textures);
 
 	_sprite_textures = 0x0;
@@ -1447,11 +1447,11 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      Fread(_sprite_textures, sizeof(tr2_sprite_texture_t),
 	   _num_sprite_textures, f);
    }
-   //FIXME: endian
+   //! \fixme endian
 
    /* Read sprite texture data (?) */
    Fread(&_num_sprite_sequences, sizeof(int), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_sprite_sequences = %u", _num_sprite_sequences);
 
 	_sprite_sequences = 0x0;
@@ -1462,11 +1462,11 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      Fread(_sprite_sequences, sizeof(tr2_sprite_sequence_t),
 	   _num_sprite_sequences, f);
    }
-   //FIXME: endian
+   //! \fixme endian
 
    /* Read cameras */
    Fread(&_num_cameras, sizeof(_num_cameras), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_cameras = %i", _num_cameras);
 
 	_cameras = 0x0;
@@ -1475,7 +1475,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
    {
      _cameras = new tr2_camera_t[_num_cameras];
      Fread(_cameras, sizeof(tr2_camera_t), _num_cameras, f);
-     //FIXME: endian
+     //! \fixme endian
    }
 
 	if (mEngineVersion == TR_VERSION_4)
@@ -1497,7 +1497,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
    /* Read sound effects (?) */
    Fread(&_num_sound_sources, sizeof(_num_sound_sources), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_sound_sources = %i", _num_sound_sources);
 
 	_sound_sources = 0x0;
@@ -1518,7 +1518,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
        Fread(_sound_sources, sizeof(tr2_sound_source_t),
 	     _num_sound_sources, f);
      }
-     //FIXME: endian
+     //! \fixme endian
    }
 
 #ifdef OBSOLETE
@@ -1539,7 +1539,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
    /* Read boxes */
    Fread(&_num_boxes, sizeof(_num_boxes), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_boxes = %i", _num_boxes);
 
 	_boxes = 0x0;
@@ -1559,7 +1559,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 		  tr1box = new tr1_box[_num_boxes];
 
 		  Fread(tr1box, sizeof(struct tr1_box), _num_boxes, f);
-		  //FIXME: endian
+		  //! \fixme endian
 
          for (j = 0; j < _num_boxes; ++j)
 			{
@@ -1577,12 +1577,12 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      {
        Fread(_boxes, sizeof(tr2_box_t), _num_boxes, f);
      }
-     //FIXME: endian
+     //! \fixme endian
    }
 
    /* Read overlaps (?) */
    Fread(&_num_overlaps, sizeof(_num_overlaps), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_overlaps = %i", _num_overlaps);
 
 	_overlaps = 0x0;
@@ -1591,7 +1591,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
    {
      _overlaps = new short[_num_overlaps];
      Fread(_overlaps, 2, _num_overlaps, f);
-     //FIXME: endian
+     //! \fixme endian
    }
 
 	_zones = 0x0;
@@ -1609,12 +1609,12 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      {
        Fread(_zones, 20, _num_boxes, f);
      }
-     //FIXME: endian
+     //! \fixme endian
    }
 
    /* Read animation textures (?) */
    Fread(&_num_animated_textures, sizeof(_num_animated_textures), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_animated_textures = %i", _num_animated_textures);
 
 	_animated_textures = 0x0;
@@ -1623,7 +1623,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
    {
      _animated_textures = new short[_num_animated_textures];
      Fread(_animated_textures, 2, _num_animated_textures, f);
-     //FIXME: endian
+     //! \fixme endian
    }
 
    if (mEngineVersion >= TR_VERSION_3)
@@ -1639,7 +1639,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
       }
 
       Fread(&_num_object_textures, sizeof(_num_object_textures), 1, f);
-      //FIXME: endian
+      //! \fixme endian
 
       printDebug("Load", "_num_object_textures = %i", _num_object_textures);
 
@@ -1650,7 +1650,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 			// Used to be 2 * num, and I forgot why...
 			_object_textures = new tr2_object_texture_t[_num_object_textures];
 
-			//FIXME: This is fu fu fu fu fu fu
+			//! \fixme This is fu fu fu fu fu fu
 			if (mEngineVersion == TR_VERSION_4)
 	      {
 				int jjj, kkk;
@@ -1690,12 +1690,12 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 						_num_object_textures, f);
 			}
       }
-      //FIXME: endian
+      //! \fixme endian
    }
 
    /* Read items */
    Fread(&_num_items, sizeof(_num_items), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_items = %i", _num_items);
 
 	_items = 0x0;
@@ -1718,7 +1718,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
        Fread(_items, sizeof(tr2_item_t), _num_items, f);
      }
    }
-   //FIXME: endian
+   //! \fixme endian
 
    /* Read LightMaps */
    _light_map = new unsigned char[32 * 256];
@@ -1786,7 +1786,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 		unsigned short num_cinematic_frames;
 
      Fread(&num_cinematic_frames, sizeof(num_cinematic_frames), 1, f);
-     //FIXME: endian
+     //! \fixme endian
 
 	  _num_cinematic_frames = num_cinematic_frames;
 
@@ -1807,7 +1807,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
    /* Read demodata (?) */
    Fread(&_num_demo_data, sizeof(_num_demo_data), 1, f);
-   //FIXME: endian
+   //! \fixme endian
    printDebug("Load", "_num_demo_data = %i", _num_demo_data);
 
 	_demo_data = 0x0;
@@ -1826,7 +1826,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
    if (mEngineVersion == TR_VERSION_1)
    {
      Fread(mSoundMap, sizeof(short), 256, f);
-     //memset(_sound_map, 0, 370 * sizeof(short));   //FIXME: KLUDGE!!!
+     //memset(_sound_map, 0, 370 * sizeof(short));   //! \fixme KLUDGE!!!
    }
    else
    {
@@ -1839,12 +1839,12 @@ int TombRaider::Load(char *filename, void (*percent)(int))
        Fread(mSoundMap, sizeof(short), 370, f);
      }
    }
-   //FIXME: endian
+   //! \fixme endian
 
    /* Read SoundDetails */
    Fread(&mNumSoundDetails, sizeof(mNumSoundDetails), 1, f);
    printDebug("Load", "mNumSoundDetails = %i", mNumSoundDetails);
-   //FIXME: endian
+   //! \fixme endian
 
 	mSoundDetails = 0x0;
 
@@ -1853,7 +1853,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      mSoundDetails = new tr2_sound_details_t[mNumSoundDetails];
      Fread(mSoundDetails, sizeof(tr2_sound_details_t), mNumSoundDetails, f);
    }
-   //FIXME: endian
+   //! \fixme endian
 
 	// Read sound sample indices
 	mSampleIndices = 0x0;
@@ -1881,7 +1881,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 		if (mNumSampleIndices > 0)
 		{
 			mSampleIndices = new int[mNumSampleIndices];
-			// FIXME: (Endian)
+			//! \fixme (Endian)
 			Fread(mSampleIndices, 4, mNumSampleIndices, f);
 		}
 		break;
@@ -1889,7 +1889,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 		mFreadMode = TR_FREAD_NORMAL;
 		// 0x46464952
 
-		// FIXME: (Endian) Read bitu32 / u_int32_t
+		//! \fixme (Endian) Read bitu32 / u_int32_t
 		Fread(&mNumTR4Samples, 4, 1, f);
 		printDebug("Load", "mNumTR4Samples = %i", mNumTR4Samples);
 
@@ -1979,14 +1979,14 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 		}
 		break;
 	default:
-		// FIXME: (Endian) Read bit32 / int32_t
+		//! \fixme (Endian) Read bit32 / int32_t
 		Fread(&mNumSampleIndices, 4, 1, f);
 		printDebug("Load", "mNumSampleIndices = %i", mNumSampleIndices);
 
 		if (mNumSampleIndices > 0)
 		{
 			mSampleIndices = new int[mNumSampleIndices];
-			// FIXME: (Endian)
+			//! \fixme (Endian)
 			Fread(mSampleIndices, 4, mNumSampleIndices, f);
 		}
    }
@@ -1998,7 +1998,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
      delete [] mCompressedLevelData;
    }
 
-	// FIXME: memory damage?
+	//! \fixme memory damage?
 	mCompressedLevelData = NULL;
 #endif
 
@@ -2187,7 +2187,7 @@ int TombRaider::getMeshCount()
 }
 
 
-// FIXME: Needs refinement once the ideal format it's feeding is refined
+//! \fixme Needs refinement once the ideal format it's feeding is refined
 // I should stick a HACK postfix on the method name - it's temporary
 // until an array format can be crafted from a pinned down design and
 // RE notes review session ( eg what about TR5? )
@@ -2315,7 +2315,7 @@ void TombRaider::getMeshTexturedRectangle(unsigned int meshIndex,
 	{
 		givenWarning = true;
 
-		// FIXME: Use Material class to handle greyscale alpha intensity
+		//! \fixme Use Material class to handle greyscale alpha intensity
 		//        (partial alpha)
 		print("getMeshTexturedRectangle",
 				"TR3+ greyscale alpha intensity not implmented, %s:%i",
@@ -2364,7 +2364,7 @@ void TombRaider::getMeshTexturedTriangle(unsigned int meshIndex,
 	{
 		givenWarning = true;
 
-		// FIXME: Use Material class to handle greyscale alpha intensity
+		//! \fixme Use Material class to handle greyscale alpha intensity
 		//        (partial alpha)
 		print("getMeshTexturedTriangle",
 				"TR3+ greyscale alpha intensity not implmented, %s:%i",
@@ -2425,7 +2425,7 @@ int TombRaider::getMeshColoredRectangleCount(unsigned int meshIndex)
 }
 
 
-// FIXME: Perhaps making color an 8bit intensity would be a better idea
+//! \fixme Perhaps making color an 8bit intensity would be a better idea
 void TombRaider::getMeshVertexArrays(unsigned int meshIndex,
 												 unsigned int *vertexCount, float **verts,
 												 unsigned int *normalCount, float **norms,
@@ -2597,7 +2597,7 @@ void TombRaider::getRoomInfo(unsigned int index,
 		// Bounding Box setup
 		for (i = 0; i < mRoomsTR5[index].numLayers; ++i)
 		{
-			// FIXME: check the boxes are in min, max order in TRC
+			//! \fixme check the boxes are in min, max order in TRC
 
 			if (i == 0)
 			{
@@ -3000,7 +3000,7 @@ unsigned int TombRaider::getRoomPortalCount(unsigned int roomIndex)
 }
 
 
-// FIXME: No TRC support
+//! \fixme No TRC support
 void TombRaider::getRoomRectangle(unsigned int roomIndex,
 											 unsigned int rectangleIndex,
 											 unsigned int *indices, float *texCoords,
@@ -3539,7 +3539,7 @@ unsigned int TombRaider::getRoomTriangleCount(unsigned int roomIndex)
 }
 
 
-// FIXME: No TR5 support
+//! \fixme No TR5 support
 void TombRaider::getRoomVertex(unsigned int roomIndex,unsigned int vertexIndex,
 										 float *xyz, float *rgba)
 {
@@ -3655,7 +3655,7 @@ void TombRaider::getRoomVertexArrays(unsigned int roomIndex,
 				(*normals)[k*3+1] = mRoomsTR5[roomIndex].faces[i].verts[j].ny;
 				(*normals)[k*3+2] = mRoomsTR5[roomIndex].faces[i].verts[j].nz;
 
-				// FIXME: Ah, yeah this may be wrong
+				//! \fixme Ah, yeah this may be wrong
 				c = ((unsigned char *)&mRoomsTR5[roomIndex].faces[i].verts[j].vColor)[1];
 				(*colors)[k*4] = (float)c / 255.0f;
 				c = ((unsigned char *)&mRoomsTR5[roomIndex].faces[i].verts[j].vColor)[2];
@@ -3670,7 +3670,7 @@ void TombRaider::getRoomVertexArrays(unsigned int roomIndex,
 	default:
 		*vertexCount = count;
 		*vertices = new float[count*3];
-		*normalCount = 0;  // FIXME: Do some TR1-TR4 levels support normals here?
+		*normalCount = 0;  //! \fixme Do some TR1-TR4 levels support normals here?
 		*normals = 0x0;
 		*colorCount = count;
 		*colors = new float[count*4];
@@ -3930,7 +3930,7 @@ void TombRaider::getSoundSample(unsigned int index,
 	switch (Engine())
 	{
 	case TR_VERSION_1:
-		// FIXME: This implies higher tmp memory cost ( copy safety )
+		//! \fixme This implies higher tmp memory cost ( copy safety )
 		getRiffData(bytes, &riff);
 
 		if (riff && (int)index < mNumSampleIndices)
@@ -4137,7 +4137,7 @@ void TombRaider::reset()
 		return;
 	}
 
-  // FIXME: Palettes aren't the same size anymore
+  //! \fixme Palettes aren't the same size anymore
   //memset(_palette8, 0, 256);
   //memset(_palette16, 0, 256);
 
@@ -4336,7 +4336,7 @@ void TombRaider::reset()
   if (_textile32)
     delete [] _textile32;
 
-  // FIXME: Damaged memory causes delete to not set pointer to NULL?
+  //! \fixme Damaged memory causes delete to not set pointer to NULL?
   _tex_special = NULL;
   _textile8 = NULL;
   _textile16 = NULL;
@@ -4435,7 +4435,7 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 
 		/* Get Centre + Unknowns */
 		memcpy(&mMeshes[i].centre.x, mesh_pointer, 10);
-		//FIXME: endian
+		//! \fixme endian
 
 		// depending on the interpretation of the unknowns that follow the Centre
 		// element, more endian conversion may be necessary
@@ -4443,7 +4443,7 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 
 		/* Get number of vertices */
 		memcpy(&mMeshes[i].num_vertices, mesh_pointer, 2);
-		//FIXME: endian
+		//! \fixme endian
 
 		printDebug("ExtractMeshes", "mMeshes[%i].num_vertices = %u",
 					  i, mMeshes[i].num_vertices);
@@ -4459,13 +4459,13 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 			mMeshes[i].vertices = new tr2_vertex_t[mMeshes[i].num_vertices];
 
 		memcpy(mMeshes[i].vertices, mesh_pointer, size);
-		//FIXME: endian
+		//! \fixme endian
 
 		mesh_pointer += size;
 
 		/* Get number of normals */
 		memcpy(&mMeshes[i].num_normals, mesh_pointer, sizeof(unsigned short));
-		//FIXME: endian
+		//! \fixme endian
 
 		mesh_pointer += sizeof(unsigned short);
 		negative_size = (mMeshes[i].num_normals < 0);
@@ -4501,14 +4501,14 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 
 			memcpy(mMeshes[i].normals, mesh_pointer, size);
 		}
-		//FIXME: endian
+		//! \fixme endian
 
 		mesh_pointer += size;
 
 		/* Get number of textured rectangles */
 		memcpy(&mMeshes[i].num_textured_rectangles,
 				 mesh_pointer, sizeof(unsigned short));
-		//FIXME: endian
+		//! \fixme endian
 
 		mesh_pointer += sizeof(unsigned short);
 		mMeshes[i].num_textured_rectangles =
@@ -4543,7 +4543,7 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 			{
 				memcpy(mMeshes[i].textured_rectangles, mesh_pointer, size);
 			}
-			//FIXME: endian
+			//! \fixme endian
 
 			if (mEngineVersion != TR_VERSION_4)
 				mesh_pointer += size;
@@ -4552,7 +4552,7 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 		/* Get number of textured triangles */
 		memcpy(&mMeshes[i].num_textured_triangles,
 				 mesh_pointer, sizeof(unsigned short));
-		//FIXME: endian
+		//! \fixme endian
 
 		mesh_pointer += sizeof(unsigned short);
 		mMeshes[i].num_textured_triangles =
@@ -4592,7 +4592,7 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 			{
 				memcpy(mMeshes[i].textured_triangles, mesh_pointer, size);
 			}
-			//FIXME: endian
+			//! \fixme endian
 
 			if (mEngineVersion != TR_VERSION_4)
 				mesh_pointer += size;
@@ -4613,7 +4613,7 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 		/* Get number of coloured rectangles */
 		memcpy(&mMeshes[i].num_coloured_rectangles, mesh_pointer,
 				 sizeof(unsigned short));
-		//FIXME: endian
+		//! \fixme endian
 		mesh_pointer += sizeof(unsigned short);
 		mMeshes[i].num_coloured_rectangles =
       (short)abs(mMeshes[i].num_coloured_rectangles);
@@ -4633,14 +4633,14 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 		if (mMeshes[i].num_coloured_rectangles > 0)
 		{
 			memcpy(mMeshes[i].coloured_rectangles, mesh_pointer, size);
-			//FIXME: endian
+			//! \fixme endian
 			mesh_pointer += size;
 		}
 
 		/* Get number of coloured triangles */
 		memcpy(&mMeshes[i].num_coloured_triangles, mesh_pointer,
 				 sizeof(unsigned short));
-		//FIXME: endian
+		//! \fixme endian
 
 		mesh_pointer += sizeof(unsigned short);
 		mMeshes[i].num_coloured_triangles =
@@ -4661,7 +4661,7 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 		if (mMeshes[i].num_coloured_triangles > 0)
 		{
 			memcpy(mMeshes[i].coloured_triangles, mesh_pointer, size);
-			//FIXME: endian
+			//! \fixme endian
 
 			mesh_pointer += size;
 		}
@@ -4859,7 +4859,7 @@ unsigned char *TombRaider::getTexTile(int texture)
 		case TR_VERSION_3: // Account for alpha flags
 			for (j = 0; j < (int)_num_object_textures; j++)
 			{
-				// FIXME: This kind of works for lighting - but messes up lara
+				//! \fixme This kind of works for lighting - but messes up lara
 #ifdef FIXME
 				if (_object_textures[j].tile == texture &&
 					 _object_textures[j].transparency_flags == 1)
@@ -4994,7 +4994,7 @@ unsigned char *TombRaider::getTexTile(int texture)
 }
 
 
-// FIXME: Move these data about to make full use in the class  ;)
+//! \fixme Move these data about to make full use in the class  ;)
 int TombRaider::loadTR5(FILE *f, void (*percent)(int))
 {
 	unsigned int level_data_sz, riffOffset, seperator0;
@@ -6155,7 +6155,7 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int))
 		fseek(f, u, SEEK_SET);
 	}
 
-	// FIXME: (Endian) Read bitu32 / u_int32_t
+	//! \fixme (Endian) Read bitu32 / u_int32_t
 	Fread(&mNumTR4Samples, 4, 1, f);
 	printDebug("Load", "mNumTR4Samples = %i", mNumTR4Samples);
 

src/hel/Vector3d.cpp → src/Vector3d.cpp

@@ -21,7 +21,7 @@
 
 #include <math.h>
 
-#include <hel/Vector3d.h>
+#include <Vector3d.h>
 
 
 ////////////////////////////////////////////////////////////

src/hel/ViewVolume.cpp → src/ViewVolume.cpp

@@ -23,7 +23,7 @@
 
 #include <math.h>
 
-#include <hel/ViewVolume.h>
+#include <ViewVolume.h>
 
 
 ////////////////////////////////////////////////////////////

src/World.cpp

@@ -537,8 +537,9 @@ void World::moveEntity(entity_t *e, char movement)
 			break;
 		}
 
-		// FIXME: Test for vector (move vector) / plane (portal) collision here
-		//        to see if we need to switch rooms... man...
+		/*! \fixme Test for vector (move vector) / plane (portal) collision here
+		 * to see if we need to switch rooms... man...
+         */
 
 		h = y;
 		getHeightAtPosition(room, x, &h, z);

test/GLString.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file GLString.cpp
+ * \file test/GLString.cpp
  * \brief Open GL rendering font/string Unit Test
  *
  * \author Mongoose

test/hel/math.cpp → test/MatMath.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <hel/math.h>
+#include <MatMath.h>
 
 void helMathTest()
 {

test/hel/Matrix.cpp → test/Matrix.cpp

@@ -23,7 +23,7 @@
 #include <math.h>
 #include <strings.h>
 
-#include <hel/Matrix.h>
+#include <Matrix.h>
 
 
 /* <Order> is (r)ow or (c)ol */

test/hel/Quaternion.cpp → test/Quaternion.cpp

@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <hel/Quaternion.h>
+#include <Quaternion.h>
 
 int runQuaternionUnitTest(int argc, char *argv[])
 {

test/Sound.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file Sound.cpp
+ * \file test/Sound.cpp
  * \brief This is the audio manager Unit Test
  *
  * \author Mongoose

test/mtk_tga.cpp

@@ -1,66 +1,45 @@
-/*================================================================
+/*!
+ * \file test/mtk_tga.cpp
+ * \brief The TGA reader Unit Test
  *
- * Project : Freyja
- * Author  : Mongoose
- * Website : http://www.westga.edu/~stu7440/
- * Email   : stu7440@westga.edu
- * Object  :
- * License : GPL See file COPYING, also (C) 2000 Mongoose
- * Comments: TGA plug-in
- *
- *           TODO: type should pass more info
- *                 2 bits for RGBA | RGB | GREY
- *                 val for depth
- *
- *           This file was generated using Mongoose's C++
- *           template generator script.  <stu7440@westga.edu>
- *
- *-- History ------------------------------------------------
- *
- * 2001-10-25:
- * Mongoose - support for screen origin bit
- *
- * 2000-10-15:
- * Mongoose - Created
- ================================================================*/
-
-#include <string.h>
-#include <stdarg.h>
-
+ * \author xythobuz
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <greatest.h>
 #include <mtk_tga.h>
 
-int main(int argc, char *argv[])
-{
-  FILE *f;
-  unsigned char *image;
-  unsigned int width;
-  unsigned int height;
-  char type;
-
-  if (argc > 1)
-  {
-    f = fopen(argv[1], "r");
+#define TESTFILE "data/font-0.tga"
+FILE *f = NULL;
 
-    if (!f)
-    {
-      perror("Failed to open file> ");
-      return -1;
-    }
+TEST checkFile() {
+    ASSERTm("File wasn't opened. Please run the suite!", f != NULL);
+    ASSERT_FALSEm("File is invalid?!", mtk_image__tga_check(f));
+    PASS();
+}
 
-    if (!mtk_image__tga_check(f))
-    {
-      if (!mtk_image__tga_load(f, &image, &width, &height, &type))
-      {
-        printf("Loaded %s successfully!\n", argv[1]);
-        delete [] image;
-      }
-    }
+TEST loadFile() {
+    unsigned char *image;
+    unsigned int width, height;
+    char type;
+    ASSERTm("File wasn't opened. Please run the suite!", f != NULL);
+    ASSERT_FALSEm("File couldn't be loaded!", mtk_image__tga_load(f, &image, &width, &height, &type));
+    printf("\nWidth: %u\nHeight: %u\nType: %d\n", width, height, type);
+    PASS();
+}
 
+SUITE(tgaSuite) {
+    f = fopen(TESTFILE, "r");
+    RUN_TEST(checkFile);
+    RUN_TEST(loadFile);
     fclose(f);
-  } else {
-      printf("Usage: %s testfile.tga\n", argv[0]);
-  }
+}
+
+GREATEST_MAIN_DEFS();
 
-  return 0;
+int main(int argc, char *argv[]) {
+    GREATEST_MAIN_BEGIN();
+    RUN_SUITE(tgaSuite);
+    GREATEST_MAIN_END();
 }