Unified include guards

include/BoundingVolume.h

@@ -25,8 +25,8 @@
  ================================================================*/
 
 
-#ifndef GUARD__LIBHEL_MONGOOSE_BOUNDINGVOLUME_H_
-#define GUARD__LIBHEL_MONGOOSE_BOUNDINGVOLUME_H_
+#ifndef _BOUNDINGVOLUME_H_
+#define _BOUNDINGVOLUME_H_
 
 #include <MatMath.h>
 

include/Camera.h

@@ -35,8 +35,8 @@
  ================================================================*/
 
 
-#ifndef __HEL_MONGOOSE_CAMERA_H_
-#define __HEL_MONGOOSE_CAMERA_H_
+#ifndef _CAMERA_H_
+#define _CAMERA_H_
 
 #include <MatMath.h>
 #include <Matrix.h>

include/Emitter.h

@@ -23,8 +23,8 @@
  ================================================================*/
 
 
-#ifndef __FREYJA_MONGOOSE_EMITTER_H_
-#define __FREYJA_MONGOOSE_EMITTER_H_
+#ifndef _EMITTER_H_
+#define _EMITTER_H_
 
 #include <Particle.h>
 

include/Entity.h

@@ -24,8 +24,8 @@
  ================================================================*/
 
 
-#ifndef GUARD__HEL_MONGOOSE_ENTITY_H_
-#define GUARD__HEL_MONGOOSE_ENTITY_H_
+#ifndef _ENTITY_H_
+#define _ENTITY_H_
 
 #include <MatMath.h>
 #include <BoundingVolume.h>

include/GLString.h

@@ -6,8 +6,8 @@
  * \author xythobuz
  */
 
-#ifndef __MTK_MONGOOSE_GLSTRING_H_
-#define __MTK_MONGOOSE_GLSTRING_H_
+#ifndef _GLSTRING_H_
+#define _GLSTRING_H_
 
 /*!
  * \brief Internal data structure representing GL Strings

include/List.h

@@ -21,8 +21,8 @@
  ================================================================*/
 
 
-#ifndef __FREYJA_MONGOOSE_LIST_H_
-#define __FREYJA_MONGOOSE_LIST_H_
+#ifndef _LIST_H_
+#define _LIST_H_
 
 #include <stdlib.h>
 #include <limits.h>

include/Map.h

@@ -33,8 +33,8 @@
  ================================================================*/
 
 
-#ifndef __FREYJA_MONGOOSE_MAP_H_
-#define __FREYJA_MONGOOSE_MAP_H_
+#ifndef _MAP_H_
+#define _MAP_H_
 
 #include <stdlib.h>
 #include <stdio.h>

include/MatMath.h

@@ -20,8 +20,8 @@
  ================================================================*/
 
 
-#ifndef __FREYJA_MONGOOSE_MATH_H
-#define __FREYJA_MONGOOSE_MATH_H
+#ifndef _MATMATH_H
+#define _MATMATH_H
 
 #define HEL_PI           3.14159265358979323846  /* pi */
 #define HEL_PI_OVER_2    1.57079632679489661923  /* pi/2 */

include/Matrix.h

@@ -24,8 +24,8 @@
  ================================================================*/
 
 
-#ifndef GUARD__FREYJA_MONGOOSE_MATRIX_H_
-#define GUARD__FREYJA_MONGOOSE_MATRIX_H_
+#ifndef _MATRIX_H_
+#define _MATRIX_H_
 
 
 #include <MatMath.h>

include/Network.h

@@ -1,27 +1,27 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : UnRaider
  * Author  : Terry 'Mongoose' Hendrix II
  * Website : http://www.westga.edu/~stu7440/
  * Email   : stu7440@westga.edu
  * Object  : Network
  * License : No use w/o permission (C) 2002 Mongoose
- * Comments: 
+ * Comments:
  *
  *
- *           This file was generated using Mongoose's C++ 
+ *           This file was generated using Mongoose's C++
  *           template generator script.  <stu7440@westga.edu>
- * 
- *-- History ------------------------------------------------ 
+ *
+ *-- History ------------------------------------------------
  *
  * 2002.06.21:
  * Mongoose - Created
  ================================================================*/
 
 
-#ifndef __UNRAIDER_MONGOOSE_NETWORK_H_
-#define __UNRAIDER_MONGOOSE_NETWORK_H_
+#ifndef _NETWORK_H_
+#define _NETWORK_H_
 
 /*----------------------------------------------
  * The packet holds the data for the network
@@ -86,13 +86,13 @@ class Network
 
 	static Network *Instance();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs the object of Network or
 	 *        returns pointer to it if previously allocated
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2001.08.24: 
+	 * 2001.08.24:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -103,18 +103,18 @@ class Network
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.21: 
+	 * 2002.06.21:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	////////////////////////////////////////////////////////////
 	// Public Accessors
 	////////////////////////////////////////////////////////////
-	
+
 	network_frame_t &getPiggyBack();
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -124,8 +124,8 @@ class Network
 
 	unsigned int getUID();
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -135,8 +135,8 @@ class Network
 
 	float getRandom(float from, float to);
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -146,8 +146,8 @@ class Network
 
 	int getPort();
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -161,8 +161,8 @@ class Network
 
 	void setDebug(bool toggle);
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -172,8 +172,8 @@ class Network
 
 	void setPort(unsigned int port);
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -183,8 +183,8 @@ class Network
 
 	void setBindHost(char *s);
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -194,8 +194,8 @@ class Network
 
 	void setRemoteHost(char *s);
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -205,8 +205,8 @@ class Network
 
 	void killServerThread();
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -216,8 +216,8 @@ class Network
 
 	void killClientThread();
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -227,8 +227,8 @@ class Network
 
 	void spawnServerThread();
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -238,8 +238,8 @@ class Network
 
 	void spawnClientThread();
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -249,8 +249,8 @@ class Network
 
 	int runServer();
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -260,8 +260,8 @@ class Network
 
 	void runClient();
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -277,12 +277,12 @@ class Network
 
 	Network();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs an object of Network
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.21: 
+	 * 2002.06.21:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 

include/OpenGLMesh.h

@@ -7,8 +7,8 @@
  * \todo Unify the parallel systems here, arrays and the allocate/set
  */
 
-#ifndef GUARD__OPENRAIDER_MONGOOSE_OPENGLMESH_H_
-#define GUARD__OPENRAIDER_MONGOOSE_OPENGLMESH_H_
+#ifndef _OPENGLMESH_H_
+#define _OPENGLMESH_H_
 
 #include <MatMath.h>
 

include/OpenRaider.h

@@ -23,8 +23,8 @@
  ================================================================*/
 
 
-#ifndef GUARD__OPENRAIDER_MONGOOSE_OPENRAIDER_H_
-#define GUARD__OPENRAIDER_MONGOOSE_OPENRAIDER_H_
+#ifndef _OPENRAIDER_H_
+#define _OPENRAIDER_H_
 
 
 #include <List.h>

include/Particle.h

@@ -5,8 +5,8 @@
  * \author Mongoose
  */
 
-#ifndef __FREYJA_MONGOOSE_PARTICLE_H_
-#define __FREYJA_MONGOOSE_PARTICLE_H_
+#ifndef _PARTICLE_H_
+#define _PARTICLE_H_
 
 #include <MatMath.h>
 

include/Quaternion.h

@@ -24,8 +24,8 @@
  ================================================================*/
 
 
-#ifndef GUARD__HEL_MONGOOSE_QUATERNION_H_
-#define GUARD__HEL_MONGOOSE_QUATERNION_H_
+#ifndef _QUATERNION_H_
+#define _QUATERNION_H_
 
 #include <MatMath.h>
 

include/Render.h

@@ -20,8 +20,8 @@
  ================================================================*/
 
 
-#ifndef GUARD__RENDER_MONGOOSE_RENDER_H_
-#define GUARD__RENDER_MONGOOSE_RENDER_H_
+#ifndef _RENDER_H_
+#define _RENDER_H_
 
 #include <List.h>
 #include <Vector.h>

include/SDLSystem.h

@@ -20,8 +20,8 @@
  ================================================================*/
 
 
-#ifndef GUARD__UNRAIDER_MONGOOSE_SDLSYSTEM_H_
-#define GUARD__UNRAIDER_MONGOOSE_SDLSYSTEM_H_
+#ifndef _SDLSYSTEM_H_
+#define _SDLSYSTEM_H_
 
 #ifdef SDL_INTERFACE
 #   include <SDL/SDL.h>

include/SkeletalModel.h

@@ -11,8 +11,8 @@
  * Better animation system in general - this is memory wasteful
  */
 
-#ifndef GUARD__OPENRAIDER_MONGOOSE_SKELETALMODEL_H_
-#define GUARD__OPENRAIDER_MONGOOSE_SKELETALMODEL_H_
+#ifndef _SKELETALMODEL_H_
+#define _SKELETALMODEL_H_
 
 #include <Vector.h>
 #include <MatMath.h>

include/Sound.h

@@ -6,8 +6,8 @@
  * \author xythobuz
  */
 
-#ifndef __OPENRAIDER_MONGOOSE_SOUND_H_
-#define __OPENRAIDER_MONGOOSE_SOUND_H_
+#ifndef _SOUND_H_
+#define _SOUND_H_
 
 /*!
  * \brief This is the audio manager for OpenRaider

include/System.h

@@ -8,8 +8,8 @@
  * \author xythobuz
  */
 
-#ifndef GUARD__UNRAIDER_MONGOOSE_SYSTEM_H_
-#define GUARD__UNRAIDER_MONGOOSE_SYSTEM_H_
+#ifndef _SYSTEM_H_
+#define _SYSTEM_H_
 
 #include <Map.h>
 #include <Vector.h>

include/Texture.h

@@ -29,8 +29,8 @@
  ==========================================================================*/
 
 
-#ifndef __MTK_MONGOOSE_MTKTEXTURE_H
-#define __MTK_MONGOOSE_MTKTEXTURE_H
+#ifndef _TEXTURE_H
+#define _TEXTURE_H
 
 #include <stdio.h>
 

include/TombRaider.h

@@ -66,8 +66,8 @@
  *                TR Rosetta Stone ( TombRaider pak format specs )
  ================================================================*/
 
-#ifndef __OPENRAIDER_MONGOOSE_TOMBRAIDER_H_
-#define __OPENRAIDER_MONGOOSE_TOMBRAIDER_H_
+#ifndef _TOMBRAIDER_H_
+#define _TOMBRAIDER_H_
 
 #ifdef WIN32
 // Have to remove GCC packing, by removing in preprocessor

include/TombRaider1.h

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : OpenRaider
  * Author  : Mongoose
  * Website : http://www.westga.edu/~stu7440/
@@ -9,17 +9,17 @@
  * License : GPL, See file COPYING for details
  * Comments: Loads TR 1 states and etc
  *
- *           This file was generated using Mongoose's C++ 
+ *           This file was generated using Mongoose's C++
  *           template generator script.  <stu7440@westga.edu>
- * 
- *-- History ------------------------------------------------ 
+ *
+ *-- History ------------------------------------------------
  *
  * Mongoose - Created, based on:
  *                TR Rosetta Stone ( TombRaider pak format specs )
  ================================================================*/
 
-#ifndef __OPENRAIDER_MONGOOSE_TOMBRAIDER1_H_
-#define __OPENRAIDER_MONGOOSE_TOMBRAIDER1_H_
+#ifndef _TOMBRAIDER1_H_
+#define _TOMBRAIDER1_H_
 
 
 class TombRaider1
@@ -30,7 +30,7 @@ public:
 
 	~TombRaider1();
 
-	enum Items 
+	enum Items
    {
 		Lara = 0,
 		PistolAnimation  = 1,

include/TombRaider5.h

@@ -1,20 +1,23 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : OpenRaider
  * Author  : Mongoose
  * Website : http://www.westga.edu/~stu7440/
  * Email   : stu7440@westga.edu
- * Object  : 
+ * Object  :
  * License : GPL, also (C) 2002 Mongoose
- * Comments: 
+ * Comments:
  *
- *-- History ------------------------------------------------ 
+ *-- History ------------------------------------------------
  *
  * 2002.04.04:
  * Mongoose - Created, based on work by ? ( one of the TRE guys )
  ================================================================*/
 
+#ifndef _TOMBRAIDER5_H_
+#define _TOMBRAIDER5_H_
+
 typedef enum
 {
 		TR4_OBJ_LARA = 0,
@@ -484,3 +487,5 @@ typedef enum
 		TR4_OBJ_MISC_SPRITES = 464
 
 } tr4_objects_t;
+
+#endif

include/Tree.h

@@ -40,8 +40,8 @@
  ================================================================*/
 
 
-#ifndef __FREYJA_MONGOOSE_TREE_H_
-#define __FREYJA_MONGOOSE_TREE_H_
+#ifndef _TREE_H_
+#define _TREE_H_
 
 #include <stdlib.h>
 #include <stdio.h>

include/Vector.h

@@ -21,8 +21,8 @@
  ================================================================*/
 
 
-#ifndef __FREYJA_MONGOOSE_VECTOR_H_
-#define __FREYJA_MONGOOSE_VECTOR_H_
+#ifndef _VECTOR_H_
+#define _VECTOR_H_
 
 #include <stdlib.h>
 #include <stdio.h>

include/Vector3d.h

@@ -24,8 +24,8 @@
  ================================================================*/
 
 
-#ifndef GUARD__HEL_MONGOOSE_VECTOR3D_H_
-#define GUARD__HEL_MONGOOSE_VECTOR3D_H_
+#ifndef _VECTOR3D_H_
+#define _VECTOR3D_H_
 
 
 #include <MatMath.h>

include/ViewVolume.h

@@ -24,8 +24,8 @@
  ================================================================*/
 
 
-#ifndef GUARD__HEL_MONGOOSE_VIEWVOLUME_H_
-#define GUARD__HEL_MONGOOSE_VIEWVOLUME_H_
+#ifndef _VIEWVOLUME_H_
+#define _VIEWVOLUME_H_
 
 #include <Matrix.h>
 #include <BoundingVolume.h>

include/World.h

@@ -24,8 +24,8 @@
  ================================================================*/
 
 
-#ifndef GUARD__OPENRAIDER_MONGOOSE_WORLD_H_
-#define GUARD__OPENRAIDER_MONGOOSE_WORLD_H_
+#ifndef _WORLD_H_
+#define _WORLD_H_
 
 #define BAD_BLOOD  // For temp rendering use
 

include/memory_test.h

@@ -21,8 +21,8 @@
 
 #include <cstddef>
 
-#ifndef __MTK_MONGOOSE_MEMORY_TEST_H_
-#define __MTK_MONGOOSE_MEMORY_TEST_H_
+#ifndef _MEMORY_TEST_H_
+#define _MEMORY_TEST_H_
 
 #if defined(DEBUG_MEMORY) && !defined(UNIT_TEST_MEMORY)
 

include/mtk_tga.h

@@ -1,31 +1,31 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : Freyja
  * Author  : Mongoose
  * Website : http://www.westga.edu/~stu7440/
  * Email   : stu7440@westga.edu
- * Object  : 
+ * Object  :
  * License : GPL See file COPYING, also (C) 2000 Mongoose
  * Comments: TGA plug-in
  *
  *
- *           This file was generated using Mongoose's C++ 
+ *           This file was generated using Mongoose's C++
  *           template generator script.  <stu7440@westga.edu>
- * 
- *-- History ------------------------------------------------ 
+ *
+ *-- History ------------------------------------------------
  *
  * 2000-10-15:
  * Mongoose - Created
  ================================================================*/
 
-#ifndef __MONGOOSE_TGA_H
-#define __MONGOOSE_TGA_H
+#ifndef _MTK_TGA_H
+#define _MTK_TGA_H
 
 #include <stdio.h>
 
 
-typedef enum 
+typedef enum
 {
   TGA_TYPE__NO_DATA    = 0,
   TGA_TYPE__MAPPED     = 1,
@@ -40,24 +40,24 @@ typedef enum
 } tga_type_t;
 
 
-typedef struct mtk_image_tga_s 
+typedef struct mtk_image_tga_s
 {
   unsigned char comment_lenght;       /* Number of bytes in comment */
   unsigned char colormap_type;        /* 0 No colormap; 1 Has colormap  */
   unsigned char image_type;           /* 1 Colormapped, 2 Unmapped;
 					 9 Colormapped RLE; 10 Unmapped RLE */
-  
+
   unsigned short colormap_index;      /* Index of first color map entry */
   unsigned short colormap_lenght;     /* Number of color map entries */
   unsigned char colormap_bbp;         /* 16, 24, or 32 bits per pixel format */
-  
+
   unsigned short origin_x;            /* X coor of lower-left corner */
   unsigned short origin_y;            /* Y coor of lower-left corner */
   unsigned short width;               /* Width in pixels */
   unsigned short height;              /* Height in pixels */
   unsigned char bpp;                  /* Number of bits in a pixel index */
   unsigned char desc_flags;           /* Various magic bits */
-  
+
 } mtk_image_tga_t;
 
 
@@ -72,7 +72,7 @@ typedef struct mtk_image_tga_s
    * Mongoose - Created
    ------------------------------------------------------*/
 
-  int mtk_image__tga_load(FILE *f, unsigned char **image, 
+  int mtk_image__tga_load(FILE *f, unsigned char **image,
 			 unsigned int *width, unsigned int *height, char *type);
   /*------------------------------------------------------
    * Pre  : Filename is a valid image file
@@ -84,10 +84,10 @@ typedef struct mtk_image_tga_s
    * Mongoose - Created
    ------------------------------------------------------*/
 
-  int mtk_image__tga_save(FILE *f, unsigned char *image, 
+  int mtk_image__tga_save(FILE *f, unsigned char *image,
 			  unsigned int width, unsigned int height, char type);
   /*------------------------------------------------------
-   * Pre  : 
+   * Pre  :
    * Post : Image is saved to diskfile if valid and can
    *
    *-- History ------------------------------------------
@@ -102,7 +102,7 @@ typedef struct mtk_image_tga_s
 				   char type,
 				   char *s, ...);
   /*------------------------------------------------------
-   * Pre  : 
+   * Pre  :
    * Post : Image is saved to diskfile if valid and can
    *
    *-- History ------------------------------------------