diff --git a/source/collada/CommonConvert.h b/source/collada/CommonConvert.h index 19103cf676..01fb0c2501 100644 --- a/source/collada/CommonConvert.h +++ b/source/collada/CommonConvert.h @@ -1,5 +1,5 @@ -#ifndef COMMONCONVERT_H__ -#define COMMONCONVERT_H__ +#ifndef INCLUDED_COMMONCONVERT +#define INCLUDED_COMMONCONVERT #include #include @@ -157,4 +157,4 @@ void TransformBones(std::vector& bones, const FMMatrix44& scaleTr extern FMMatrix44 FMMatrix44_Identity; -#endif // COMMONCONVERT_H__ +#endif // INCLUDED_COMMONCONVERT diff --git a/source/collada/DLL.h b/source/collada/DLL.h index e442dfebdd..3b01b067f3 100644 --- a/source/collada/DLL.h +++ b/source/collada/DLL.h @@ -1,5 +1,5 @@ -#ifndef COLLADA_DLL_H__ -#define COLLADA_DLL_H__ +#ifndef INCLUDED_COLLADA_DLL +#define INCLUDED_COLLADA_DLL #ifdef _WIN32 # ifdef COLLADA_DLL @@ -29,4 +29,4 @@ EXPORT int set_skeleton_definitions(const char* xml, int length); EXPORT int convert_dae_to_pmd(const char* dae, OutputFn pmd_writer, void* cb_data); EXPORT int convert_dae_to_psa(const char* dae, OutputFn psa_writer, void* cb_data); -#endif /* COLLADA_DLL_H__ */ +#endif /* INCLUDED_COLLADA_DLL */ diff --git a/source/collada/Decompose.h b/source/collada/Decompose.h index f5d63a6ed0..c131ee7496 100644 --- a/source/collada/Decompose.h +++ b/source/collada/Decompose.h @@ -1,6 +1,6 @@ /**** Decompose.h - Basic declarations ****/ -#ifndef _H_Decompose -#define _H_Decompose +#ifndef INCLUDED_DECOMPOSE +#define INCLUDED_DECOMPOSE typedef struct {float x, y, z, w;} Quat; /* Quaternion */ enum QuatPart {X, Y, Z, W}; typedef Quat HVect; /* Homogeneous 3D vector */ diff --git a/source/collada/GeomReindex.h b/source/collada/GeomReindex.h index 28bd7a13b1..e751124033 100644 --- a/source/collada/GeomReindex.h +++ b/source/collada/GeomReindex.h @@ -1,9 +1,9 @@ -#ifndef GEOMREINDEX_H__ -#define GEOMREINDEX_H__ +#ifndef INCLUDED_GEOMREINDEX +#define INCLUDED_GEOMREINDEX class FCDGeometryPolygons; class FCDSkinController; void ReindexGeometry(FCDGeometryPolygons* polys, FCDSkinController* skin = 0); -#endif // GEOMREINDEX_H__ +#endif // INCLUDED_GEOMREINDEX diff --git a/source/collada/Maths.h b/source/collada/Maths.h index a171632dff..e5f5932110 100644 --- a/source/collada/Maths.h +++ b/source/collada/Maths.h @@ -1,5 +1,5 @@ -#ifndef MATHS_H__ -#define MATHS_H__ +#ifndef INCLUDED_MATHS +#define INCLUDED_MATHS class FMMatrix44; @@ -11,4 +11,4 @@ extern FMMatrix44 DecomposeToScaleMatrix(const FMMatrix44& m); // extern FMMatrix44 operator/ (const FMMatrix44& a, const float b); // extern FMMatrix44 QuatToMatrix(float x, float y, float z, float w); -#endif // MATHS_H__ +#endif // INCLUDED_MATHS diff --git a/source/collada/PMDConvert.h b/source/collada/PMDConvert.h index 2675ce5154..5c65264518 100644 --- a/source/collada/PMDConvert.h +++ b/source/collada/PMDConvert.h @@ -1,5 +1,5 @@ -#ifndef PMDCONVERT_H__ -#define PMDCONVERT_H__ +#ifndef INCLUDED_PMDCONVERT +#define INCLUDED_PMDCONVERT #include @@ -7,4 +7,4 @@ struct OutputCB; void ColladaToPMD(const char* input, OutputCB& output, std::string& xmlErrors); -#endif // PMDCONVERT_H__ +#endif // INCLUDED_PMDCONVERT diff --git a/source/collada/PSAConvert.h b/source/collada/PSAConvert.h index e4a5454979..855693200f 100644 --- a/source/collada/PSAConvert.h +++ b/source/collada/PSAConvert.h @@ -1,5 +1,5 @@ -#ifndef PSACONVERT_H__ -#define PSACONVERT_H__ +#ifndef INCLUDED_PSACONVERT +#define INCLUDED_PSACONVERT #include @@ -7,4 +7,4 @@ struct OutputCB; void ColladaToPSA(const char* input, OutputCB& output, std::string& xmlErrors); -#endif // PSACONVERT_H__ +#endif // INCLUDED_PSACONVERT diff --git a/source/collada/StdSkeletons.h b/source/collada/StdSkeletons.h index f6b7adadfd..a4ac61c671 100644 --- a/source/collada/StdSkeletons.h +++ b/source/collada/StdSkeletons.h @@ -1,5 +1,5 @@ -#ifndef STDSKELETONS_H__ -#define STDSKELETONS_H__ +#ifndef INCLUDED_STDSKELETONS +#define INCLUDED_STDSKELETONS #include @@ -77,4 +77,4 @@ private: Skeleton(Skeleton&); }; -#endif // STDSKELETONS_H__ +#endif // INCLUDED_STDSKELETONS diff --git a/source/collada/precompiled.h b/source/collada/precompiled.h index ba460245a1..c221f86f1d 100644 --- a/source/collada/precompiled.h +++ b/source/collada/precompiled.h @@ -1,5 +1,5 @@ -#ifndef PRECOMPILED_H__ -#define PRECOMPILED_H__ +#ifndef INCLUDED_COLLADA_PRECOMPILED +#define INCLUDED_COLLADA_PRECOMPILED #define COLLADA_DLL #include "DLL.h" @@ -41,4 +41,4 @@ extern void Log(int severity, const char* fmt, ...); #undef min #undef max -#endif // PRECOMPILED_H__ +#endif // INCLUDED_COLLADA_PRECOMPILED diff --git a/source/graphics/Camera.cpp b/source/graphics/Camera.cpp index 671df75d6c..83f350576e 100644 --- a/source/graphics/Camera.cpp +++ b/source/graphics/Camera.cpp @@ -1,14 +1,11 @@ -//*********************************************************** -// -// Name: Camera.Cpp -// Last Update: 24/2/02 -// Author: Poya Manouchehri -// -// Description: CCamera holds a view and a projection matrix. -// It also has a frustum which can be used to -// cull objects for rendering. -// -//*********************************************************** +/** + * ========================================================================= + * File : Camera.cpp + * Project : 0 A.D. + * Description : CCamera holds a view and a projection matrix. It also has + * a frustum which can be used to cull objects for rendering. + * ========================================================================= + */ #include "precompiled.h" @@ -380,3 +377,4 @@ void CCamera::Render(uint intermediates) const } } + diff --git a/source/graphics/Camera.h b/source/graphics/Camera.h index 3933f030ff..d7b26482c4 100644 --- a/source/graphics/Camera.h +++ b/source/graphics/Camera.h @@ -1,17 +1,14 @@ -//*********************************************************** -// -// Name: Camera.H -// Last Update: 24/2/02 -// Author: Poya Manouchehri -// -// Description: CCamera holds a view and a projection matrix. -// It also has a frustum which can be used to -// cull objects for rendering. -// -//*********************************************************** +/** + * ========================================================================= + * File : Camera.h + * Project : 0 A.D. + * Description : CCamera holds a view and a projection matrix. It also has + * a frustum which can be used to cull objects for rendering. + * ========================================================================= + */ -#ifndef CAMERA_H -#define CAMERA_H +#ifndef INCLUDED_CAMERA +#define INCLUDED_CAMERA #include "Frustum.h" #include "maths/Matrix3D.h" diff --git a/source/graphics/CinemaTrack.h b/source/graphics/CinemaTrack.h index b541d98a48..64b16562ff 100644 --- a/source/graphics/CinemaTrack.h +++ b/source/graphics/CinemaTrack.h @@ -1,6 +1,6 @@ -#ifndef H_CinemaTracks_H -#define H_CinemaTracks_H +#ifndef INCLUDED_CINEMATRACK +#define INCLUDED_CINEMATRACK #include #include @@ -8,8 +8,6 @@ #include "maths/NUSpline.h" /* - Andrew Decker (aka pyrolink) - Contact: ajdecker1022@msn.com desc: contains various functions used for cinematic camera paths See also: CinemaHandler.cpp, Cinematic.h/.cpp */ diff --git a/source/graphics/ColladaManager.h b/source/graphics/ColladaManager.h index 5f2ad8b782..5a8bb0adb9 100644 --- a/source/graphics/ColladaManager.h +++ b/source/graphics/ColladaManager.h @@ -1,5 +1,5 @@ -#ifndef COLLADAMANAGER_H__ -#define COLLADAMANAGER_H__ +#ifndef INCLUDED_COLLADAMANAGER +#define INCLUDED_COLLADAMANAGER class CStr8; @@ -29,4 +29,4 @@ private: CColladaManagerImpl* m; }; -#endif // COLLADAMANAGER_H__ +#endif // INCLUDED_COLLADAMANAGER diff --git a/source/graphics/Color.cpp b/source/graphics/Color.cpp index 95e80b080c..82497f6f54 100644 --- a/source/graphics/Color.cpp +++ b/source/graphics/Color.cpp @@ -1,3 +1,11 @@ +/** + * ========================================================================= + * File : Color.cpp + * Project : 0 A.D. + * Description : Convert float RGB(A) colors to unsigned byte + * ========================================================================= + */ + #include "precompiled.h" #include "graphics/Color.h" diff --git a/source/graphics/Color.h b/source/graphics/Color.h index ae79813ed8..b9b76fe45b 100644 --- a/source/graphics/Color.h +++ b/source/graphics/Color.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: Color.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : Color.h + * Project : 0 A.D. + * Description : Convert float RGB(A) colors to unsigned byte + * ========================================================================= + */ -#ifndef _COLOR_H -#define _COLOR_H +#ifndef INCLUDED_COLOR +#define INCLUDED_COLOR #include "maths/Vector3D.h" #include "maths/Vector4D.h" diff --git a/source/graphics/DefaultEmitter.cpp b/source/graphics/DefaultEmitter.cpp index fdbe72f9f6..4a8ec25899 100644 --- a/source/graphics/DefaultEmitter.cpp +++ b/source/graphics/DefaultEmitter.cpp @@ -1,10 +1,10 @@ -///////////////////////////////////////////////////// -// File Name: DefaultEmitter.cpp -// Date: 7/20/05 -// Author: Will Dull -// Purpose: Implementation of the default -// emitter class. -///////////////////////////////////////////////////// +/** + * ========================================================================= + * File : DefaultEmitter.cpp + * Project : 0 A.D. + * Description : Default particle emitter implementation. + * ========================================================================= + */ #include "precompiled.h" #include "maths/MathUtil.h" diff --git a/source/graphics/DefaultEmitter.h b/source/graphics/DefaultEmitter.h index d9b916d8c2..d653119072 100644 --- a/source/graphics/DefaultEmitter.h +++ b/source/graphics/DefaultEmitter.h @@ -1,12 +1,13 @@ -///////////////////////////////////////////////////// -// File Name: DefaultEmitter.h -// Date: 7/20/05 -// Author: Will Dull -// Purpose: Default emitter -///////////////////////////////////////////////////// +/** + * ========================================================================= + * File : DefaultEmitter.h + * Project : 0 A.D. + * Description : Default particle emitter implementation. + * ========================================================================= + */ -#ifndef _DEFAULTEMITTER_H_ -#define _DEFAULTEMITTER_H_ +#ifndef INCLUDED_DEFAULTEMITTER +#define INCLUDED_DEFAULTEMITTER #include "ParticleEmitter.h" diff --git a/source/graphics/Frustum.cpp b/source/graphics/Frustum.cpp index 1134c257d2..dccd66b55c 100644 --- a/source/graphics/Frustum.cpp +++ b/source/graphics/Frustum.cpp @@ -1,17 +1,17 @@ -//*********************************************************** -// -// Name: Frustum.Cpp -// Last Update: 24/2/02 -// Author: Poya Manouchehri -// -// Description: CFrustum is a collection of planes which define -// a viewing space. Usually associated with the -// camera, there are 6 planes which define the -// view pyramid. But we allow more planes per -// frustum which maybe used for portal rendering, -// where a portal may have 3 or more edges. -// -//*********************************************************** +/** + * ========================================================================= + * File : Frustum.cpp + * Project : 0 A.D. + * Description : CFrustum is a collection of planes which define + * a viewing space. + * ========================================================================= + */ + +/* +Usually associated with the camera, there are 6 planes which define the +view pyramid. But we allow more planes per frustum which may be used for +portal rendering, where a portal may have 3 or more edges. +*/ #include "precompiled.h" @@ -164,3 +164,4 @@ bool CFrustum::IsBoxVisible (const CVector3D &position,const CBound &bounds) con return true; } + diff --git a/source/graphics/Frustum.h b/source/graphics/Frustum.h index 5726e9092d..b9e8fb5b4f 100644 --- a/source/graphics/Frustum.h +++ b/source/graphics/Frustum.h @@ -1,20 +1,20 @@ -//*********************************************************** -// -// Name: Frustum.H -// Last Update: 24/2/02 -// Author: Poya Manouchehri -// -// Description: CFrustum is a collection of planes which define -// a viewing space. Usually associated with the -// camera, there are 6 planes which define the -// view pyramid. But we allow more planes per -// frustum which maybe used for portal rendering, -// where a portal may have 3 or more edges. -// -//*********************************************************** +/** + * ========================================================================= + * File : Frustum.cpp + * Project : 0 A.D. + * Description : CFrustum is a collection of planes which define + * a viewing space. + * ========================================================================= + */ -#ifndef FRUSTUM_H -#define FRUSTUM_H +/* +Usually associated with the camera, there are 6 planes which define the +view pyramid. But we allow more planes per frustum which may be used for +portal rendering, where a portal may have 3 or more edges. +*/ + +#ifndef INCLUDED_FRUSTUM +#define INCLUDED_FRUSTUM #include "maths/Plane.h" diff --git a/source/graphics/GameView.h b/source/graphics/GameView.h index f3aa119391..2259319284 100644 --- a/source/graphics/GameView.h +++ b/source/graphics/GameView.h @@ -1,5 +1,5 @@ -#ifndef _GameView_H -#define _GameView_H +#ifndef INCLUDED_GAMEVIEW +#define INCLUDED_GAMEVIEW // needed by minimap extern float g_MaxZoomHeight; //note: Max terrain height is this minus YMinOffset diff --git a/source/graphics/HFTracer.cpp b/source/graphics/HFTracer.cpp index c73720fef2..700fe0db8d 100644 --- a/source/graphics/HFTracer.cpp +++ b/source/graphics/HFTracer.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: HFTracer.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : HFTracer.cpp + * Project : 0 A.D. + * Description : Determine intersection of rays with a heightfield. + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/graphics/HFTracer.h b/source/graphics/HFTracer.h index de3d3169a2..7cf1d03610 100644 --- a/source/graphics/HFTracer.h +++ b/source/graphics/HFTracer.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: HFTracer.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : HFTracer.h + * Project : 0 A.D. + * Description : Determine intersection of rays with a heightfield. + * ========================================================================= + */ -#ifndef _HFTRACER_H -#define _HFTRACER_H +#ifndef INCLUDED_HFTRACER +#define INCLUDED_HFTRACER class CVector3D; class CTerrain; diff --git a/source/graphics/LightEnv.cpp b/source/graphics/LightEnv.cpp index 5f77eb2f5b..1b51541c61 100644 --- a/source/graphics/LightEnv.cpp +++ b/source/graphics/LightEnv.cpp @@ -3,8 +3,6 @@ * File : LightEnv.cpp * Project : Pyrogenesis * Description : CLightEnv implementation - * - * @author Nicolai Haehnle * ========================================================================= */ diff --git a/source/graphics/LightEnv.h b/source/graphics/LightEnv.h index 858d476ca7..534678e67e 100644 --- a/source/graphics/LightEnv.h +++ b/source/graphics/LightEnv.h @@ -3,14 +3,11 @@ * File : LightEnv.h * Project : Pyrogenesis * Description : CLightEnv, a class describing the current lights - * - * @author Rich Cross - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef __LIGHTENV_H -#define __LIGHTENV_H +#ifndef INCLUDED_LIGHTENV +#define INCLUDED_LIGHTENV #include "Color.h" #include "maths/Vector3D.h" diff --git a/source/graphics/MapIO.h b/source/graphics/MapIO.h index 1415ca2211..42e4e53d9f 100644 --- a/source/graphics/MapIO.h +++ b/source/graphics/MapIO.h @@ -1,5 +1,5 @@ -#ifndef _MAPIO_H -#define _MAPIO_H +#ifndef INCLUDED_MAPIO +#define INCLUDED_MAPIO class CMapIO { diff --git a/source/graphics/MapReader.h b/source/graphics/MapReader.h index 9c9c81d447..ba557dace6 100644 --- a/source/graphics/MapReader.h +++ b/source/graphics/MapReader.h @@ -1,5 +1,5 @@ -#ifndef _MAPREADER_H -#define _MAPREADER_H +#ifndef INCLUDED_MAPREADER +#define INCLUDED_MAPREADER #include "MapIO.h" #include "lib/res/handle.h" diff --git a/source/graphics/MapWriter.h b/source/graphics/MapWriter.h index 6152e1e878..00eb32a22a 100644 --- a/source/graphics/MapWriter.h +++ b/source/graphics/MapWriter.h @@ -1,5 +1,5 @@ -#ifndef _MAPWRITER_H -#define _MAPWRITER_H +#ifndef INCLUDED_MAPWRITER +#define INCLUDED_MAPWRITER #include #include "MapIO.h" diff --git a/source/graphics/Material.h b/source/graphics/Material.h index 2287a778c1..9cd6011a5d 100644 --- a/source/graphics/Material.h +++ b/source/graphics/Material.h @@ -1,5 +1,5 @@ -#ifndef __H_MATERIAL_H__ -#define __H_MATERIAL_H__ +#ifndef INCLUDED_MATERIAL +#define INCLUDED_MATERIAL #include "ps/CStr.h" diff --git a/source/graphics/MaterialManager.h b/source/graphics/MaterialManager.h index 9f34761d39..ad9ae01050 100644 --- a/source/graphics/MaterialManager.h +++ b/source/graphics/MaterialManager.h @@ -1,5 +1,5 @@ -#ifndef __H_MATERIALREADER_H__ -#define __H_MATERIALREADER_H__ +#ifndef INCLUDED_MATERIALMANAGER +#define INCLUDED_MATERIALMANAGER #include #include "ps/Singleton.h" diff --git a/source/graphics/MeshManager.h b/source/graphics/MeshManager.h index cf8245ed6a..c324fedf02 100644 --- a/source/graphics/MeshManager.h +++ b/source/graphics/MeshManager.h @@ -1,5 +1,5 @@ -#ifndef __H_MESHMANAGER_H__ -#define __H_MESHMANAGER_H__ +#ifndef INCLUDED_MESHMANAGER +#define INCLUDED_MESHMANAGER #include "ps/CStr.h" diff --git a/source/graphics/MiniPatch.cpp b/source/graphics/MiniPatch.cpp index 6ac868e4d7..58e3dea4f9 100644 --- a/source/graphics/MiniPatch.cpp +++ b/source/graphics/MiniPatch.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: MiniPatch.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : MiniPatch.cpp + * Project : 0 A.D. + * Description : Definition of a single terrain tile + * ========================================================================= + */ #include "precompiled.h" @@ -37,3 +37,4 @@ void CMiniPatch::GetTileIndex(u32& x,u32& z) z=(m_Parent->m_Z*PATCH_SIZE)+tindex/PATCH_SIZE; } + diff --git a/source/graphics/MiniPatch.h b/source/graphics/MiniPatch.h index c89cd47559..923db8aee3 100644 --- a/source/graphics/MiniPatch.h +++ b/source/graphics/MiniPatch.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: MiniPatch.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : MiniPatch.h + * Project : 0 A.D. + * Description : Definition of a single terrain tile + * ========================================================================= + */ -#ifndef _MINIPATCH_H -#define _MINIPATCH_H +#ifndef INCLUDED_MINIPATCH +#define INCLUDED_MINIPATCH #include "lib/res/handle.h" diff --git a/source/graphics/Model.cpp b/source/graphics/Model.cpp index f3c5a6c0a1..5826fe0a82 100644 --- a/source/graphics/Model.cpp +++ b/source/graphics/Model.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// -// Name: Model.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -///////////////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : Model.cpp + * Project : 0 A.D. + * Description : Mesh object with texture and skinning information + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/graphics/Model.h b/source/graphics/Model.h index 22bd0ed4eb..0c9832c081 100644 --- a/source/graphics/Model.h +++ b/source/graphics/Model.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: Model.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : Model.h + * Project : 0 A.D. + * Description : Mesh object with texture and skinning information + * ========================================================================= + */ -#ifndef _MODEL_H -#define _MODEL_H +#ifndef INCLUDED_MODEL +#define INCLUDED_MODEL #include diff --git a/source/graphics/ModelDef.cpp b/source/graphics/ModelDef.cpp index 9fc4eae5f4..a5b79f2260 100644 --- a/source/graphics/ModelDef.cpp +++ b/source/graphics/ModelDef.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: ModelDef.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : ModelDef.cpp + * Project : 0 A.D. + * Description : Defines a raw 3d model. + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/graphics/ModelDef.h b/source/graphics/ModelDef.h index cabb0e1108..2ec9fd3b59 100644 --- a/source/graphics/ModelDef.h +++ b/source/graphics/ModelDef.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: ModelDef.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : ModelDef.h + * Project : 0 A.D. + * Description : Defines a raw 3d model. + * ========================================================================= + */ -#ifndef _MODELDEF_H -#define _MODELDEF_H +#ifndef INCLUDED_MODELDEF +#define INCLUDED_MODELDEF #include "ps/CStr.h" #include "maths/Vector3D.h" diff --git a/source/graphics/ObjectBase.h b/source/graphics/ObjectBase.h index 77a646cf0f..70fe63c026 100644 --- a/source/graphics/ObjectBase.h +++ b/source/graphics/ObjectBase.h @@ -1,5 +1,5 @@ -#ifndef _OBJECTBASE_H -#define _OBJECTBASE_H +#ifndef INCLUDED_OBJECTBASE +#define INCLUDED_OBJECTBASE class CModel; class CSkeletonAnim; diff --git a/source/graphics/ObjectEntry.h b/source/graphics/ObjectEntry.h index 34882d04e0..1f6b26d33c 100644 --- a/source/graphics/ObjectEntry.h +++ b/source/graphics/ObjectEntry.h @@ -1,5 +1,5 @@ -#ifndef _OBJECTENTRY_H -#define _OBJECTENTRY_H +#ifndef INCLUDED_OBJECTENTRY +#define INCLUDED_OBJECTENTRY class CModel; class CSkeletonAnim; diff --git a/source/graphics/ObjectManager.h b/source/graphics/ObjectManager.h index a8768aa52b..2bd8280533 100644 --- a/source/graphics/ObjectManager.h +++ b/source/graphics/ObjectManager.h @@ -1,5 +1,5 @@ -#ifndef _OBJECTMANAGER_H -#define _OBJECTMANAGER_H +#ifndef INCLUDED_OBJECTMANAGER +#define INCLUDED_OBJECTMANAGER #include #include diff --git a/source/graphics/ParticleEmitter.cpp b/source/graphics/ParticleEmitter.cpp index a2010deb4f..36b42219ee 100644 --- a/source/graphics/ParticleEmitter.cpp +++ b/source/graphics/ParticleEmitter.cpp @@ -1,10 +1,10 @@ -///////////////////////////////////////////////////// -// File Name: ParticleEmitter.cpp -// Date: 6/29/05 -// Author: Will Dull -// Purpose: The base particle and emitter -// classes implementations. -///////////////////////////////////////////////////// +/** + * ========================================================================= + * File : ParticleEmitter.cpp + * Project : 0 A.D. + * Description : Particle and Emitter base classes. + * ========================================================================= + */ #include "precompiled.h" #include "ParticleEmitter.h" diff --git a/source/graphics/ParticleEmitter.h b/source/graphics/ParticleEmitter.h index 9984373ef5..141aab940a 100644 --- a/source/graphics/ParticleEmitter.h +++ b/source/graphics/ParticleEmitter.h @@ -1,13 +1,13 @@ -///////////////////////////////////////////////////// -// File Name: ParticleEmitter.h -// Date: 6/29/05 -// Author: Will Dull -// Purpose: The base particle and emitter -// classes. -///////////////////////////////////////////////////// +/** + * ========================================================================= + * File : ParticleEmitter.h + * Project : 0 A.D. + * Description : Particle and Emitter base classes. + * ========================================================================= + */ -#ifndef _PARTICLEEMITTER_H_ -#define _PARTICLEEMITTER_H_ +#ifndef INCLUDED_PARTICLEEMITTER +#define INCLUDED_PARTICLEEMITTER #include "maths/Vector3D.h" diff --git a/source/graphics/ParticleEngine.cpp b/source/graphics/ParticleEngine.cpp index ba3ec44006..3ee310f072 100644 --- a/source/graphics/ParticleEngine.cpp +++ b/source/graphics/ParticleEngine.cpp @@ -1,10 +1,10 @@ -///////////////////////////////////////////////////// -// File Name: ParticleEngine.cpp -// Date: 6/29/05 -// Author: Will Dull -// Purpose: The particle engine system -// implementation. -///////////////////////////////////////////////////// +/** + * ========================================================================= + * File : ParticleEngine.cpp + * Project : 0 A.D. + * Description : Particle engine implementation + * ========================================================================= + */ #include "precompiled.h" #include "ParticleEngine.h" diff --git a/source/graphics/ParticleEngine.h b/source/graphics/ParticleEngine.h index c3dc3a98e0..1de3cea7f5 100644 --- a/source/graphics/ParticleEngine.h +++ b/source/graphics/ParticleEngine.h @@ -1,15 +1,13 @@ -///////////////////////////////////////////////////// -// File Name: ParticleEngine.h -// Date: 6/29/05 -// Author: Will Dull -// Purpose: The particle engine system. -// controls and maintain particles -// through emitters that are passed -// into each of the main functions. -///////////////////////////////////////////////////// +/** + * ========================================================================= + * File : ParticleEngine.h + * Project : 0 A.D. + * Description : Particle engine implementation + * ========================================================================= + */ -#ifndef _PARTICLEENGINE_H_ -#define _PARTICLEENGINE_H_ +#ifndef INCLUDED_PARTICLEENGINE +#define INCLUDED_PARTICLEENGINE #include "ParticleEmitter.h" #include "lib/res/graphics/tex.h" diff --git a/source/graphics/Patch.cpp b/source/graphics/Patch.cpp index 4474ef898c..84555802cf 100644 --- a/source/graphics/Patch.cpp +++ b/source/graphics/Patch.cpp @@ -1,11 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: ModelDef.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// Modified by: 30. April 2007 - Christian Heubach -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : Patch.cpp + * Project : 0 A.D. + * Description : A patch of terrain holding NxN MiniPatch tiles + * ========================================================================= + */ #include "precompiled.h" @@ -81,3 +80,4 @@ void CPatch::CalcBounds() } } + diff --git a/source/graphics/Patch.h b/source/graphics/Patch.h index 4b90c99b35..3104eb3fb2 100644 --- a/source/graphics/Patch.h +++ b/source/graphics/Patch.h @@ -1,14 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: Patch.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// Modified by: 30. April 2007 - Christian Heubach -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : Patch.h + * Project : 0 A.D. + * Description : A patch of terrain holding NxN MiniPatch tiles + * ========================================================================= + */ -#ifndef _PATCH_H -#define _PATCH_H +#ifndef INCLUDED_PATCH +#define INCLUDED_PATCH #include "MiniPatch.h" #include "RenderableObject.h" @@ -78,3 +77,4 @@ public: #endif + diff --git a/source/graphics/RenderableObject.h b/source/graphics/RenderableObject.h index 34cf46c498..f888fa2a6f 100644 --- a/source/graphics/RenderableObject.h +++ b/source/graphics/RenderableObject.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: RenderableObject.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : RenderableObject.h + * Project : 0 A.D. + * Description : Base class for renderable objects + * ========================================================================= + */ -#ifndef _RENDERABLEOBJECT_H -#define _RENDERABLEOBJECT_H +#ifndef INCLUDED_RENDERABLEOBJECT +#define INCLUDED_RENDERABLEOBJECT #include "maths/Bound.h" diff --git a/source/graphics/SColor.h b/source/graphics/SColor.h index 59db64d8ce..b1dd23c84d 100644 --- a/source/graphics/SColor.h +++ b/source/graphics/SColor.h @@ -1,5 +1,5 @@ -#ifndef SCOLOR_H__ -#define SCOLOR_H__ +#ifndef INCLUDED_SCOLOR +#define INCLUDED_SCOLOR // SColor3ub: structure for packed RGB colors struct SColor3ub diff --git a/source/graphics/SkeletonAnim.h b/source/graphics/SkeletonAnim.h index 4946807102..f375888326 100644 --- a/source/graphics/SkeletonAnim.h +++ b/source/graphics/SkeletonAnim.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: SkeletonAnim.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : SkeletonAnim.h + * Project : 0 A.D. + * Description : Instance of CSkeletonAnimDef for application onto a model + * ========================================================================= + */ -#ifndef _SKELETONANIM_H -#define _SKELETONANIM_H +#ifndef INCLUDED_SKELETONANIM +#define INCLUDED_SKELETONANIM #include "maths/Bound.h" diff --git a/source/graphics/SkeletonAnimDef.cpp b/source/graphics/SkeletonAnimDef.cpp index f903c67f45..f53bca67b9 100644 --- a/source/graphics/SkeletonAnimDef.cpp +++ b/source/graphics/SkeletonAnimDef.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: SkeletonAnimDef.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : SkeletonAnim.cpp + * Project : 0 A.D. + * Description : Raw description of a skeleton animation + * ========================================================================= + */ #include "precompiled.h" @@ -120,3 +120,4 @@ void CSkeletonAnimDef::Save(const char* filename,const CSkeletonAnimDef* anim) packer.Write(filename); } + diff --git a/source/graphics/SkeletonAnimDef.h b/source/graphics/SkeletonAnimDef.h index 997d18d506..3e9d9ecba1 100644 --- a/source/graphics/SkeletonAnimDef.h +++ b/source/graphics/SkeletonAnimDef.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: SkeletonAnimDef.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : SkeletonAnim.h + * Project : 0 A.D. + * Description : Raw description of a skeleton animation + * ========================================================================= + */ -#ifndef _SKELETONANIMDEF_H -#define _SKELETONANIMDEF_H +#ifndef INCLUDED_SKELETONANIMDEF +#define INCLUDED_SKELETONANIMDEF #include "maths/Vector3D.h" #include "maths/Quaternion.h" diff --git a/source/graphics/SkeletonAnimManager.cpp b/source/graphics/SkeletonAnimManager.cpp index c8c1d83d14..c2dde65262 100644 --- a/source/graphics/SkeletonAnimManager.cpp +++ b/source/graphics/SkeletonAnimManager.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: SkeletonAnimManager.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : SkeletonAnimManager.cpp + * Project : 0 A.D. + * Description : Owner of all skeleton animations + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/graphics/SkeletonAnimManager.h b/source/graphics/SkeletonAnimManager.h index 3ce91a8ebb..0348213bfa 100644 --- a/source/graphics/SkeletonAnimManager.h +++ b/source/graphics/SkeletonAnimManager.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: SkeletonAnimManager.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : SkeletonAnimManager.h + * Project : 0 A.D. + * Description : Owner of all skeleton animations + * ========================================================================= + */ -#ifndef _SKELETONANIMMANAGER_H -#define _SKELETONANIMMANAGER_H +#ifndef INCLUDED_SKELETONANIMMANAGER +#define INCLUDED_SKELETONANIMMANAGER #include #include diff --git a/source/graphics/Sprite.cpp b/source/graphics/Sprite.cpp index 83316d1270..65b278c461 100644 --- a/source/graphics/Sprite.cpp +++ b/source/graphics/Sprite.cpp @@ -1,28 +1,14 @@ -/*================================================================== -| -| Name: Sprite.cpp -| -|=================================================================== -| -| Author: Ben Vinegar -| Contact: benvinegar () hotmail ! com -| -| -| Last Modified: 03/08/04 -| -| Overview: Billboarding sprite class - always faces the camera. It -| does this by getting the current model view matrix state. -| -| -| Usage: The functions speak for themselves. Instantiate, then be -| sure to pass a loaded (using ogl_tex_load()) texture before -| calling Render(). -| -| To do: TBA -| -| More Information: TBA -| -==================================================================*/ +/** + * ========================================================================= + * File : Sprite.h + * Project : 0 A.D. + * Description : Billboarding sprite class - always faces the camera. It + * does this by getting the current model view matrix state. + * ========================================================================= + */ + +// Usage: Instantiate, then be sure to pass a loaded +// (using ogl_tex_load()) texture before calling Render(). #include "precompiled.h" @@ -32,7 +18,7 @@ #include "lib/res/graphics/ogl_tex.h" CSprite::CSprite() : - m_texture(NULL) +m_texture(NULL) { // default scale 1:1 diff --git a/source/graphics/Sprite.h b/source/graphics/Sprite.h index 26cbc9d214..5d673a46b2 100644 --- a/source/graphics/Sprite.h +++ b/source/graphics/Sprite.h @@ -1,31 +1,17 @@ -/*================================================================== -| -| Name: Sprite.h -| -|=================================================================== -| -| Author: Ben Vinegar -| Contact: benvinegar () hotmail ! com -| -| -| Last Modified: 03/08/04 -| -| Overview: Billboarding sprite class - always faces the camera. It -| does this by getting the current model view matrix state. -| -| -| Usage: The functions speak for themselves. Instantiate, then be -| sure to pass a loaded (using ogl_tex_load()) texture before -| calling Render(). -| -| To do: TBA -| -| More Information: TBA -| -==================================================================*/ +/** + * ========================================================================= + * File : Sprite.h + * Project : 0 A.D. + * Description : Billboarding sprite class - always faces the camera. It + * does this by getting the current model view matrix state. + * ========================================================================= + */ -#ifndef SPRITE_H -#define SPRITE_H +// Usage: Instantiate, then be sure to pass a loaded +// (using ogl_tex_load()) texture before calling Render(). + +#ifndef INCLUDED_SPRITE +#define INCLUDED_SPRITE //-------------------------------------------------------- // Includes / Compiler directives @@ -83,4 +69,4 @@ private: float m_colour[4]; }; -#endif // SPRITE_H +#endif // INCLUDED_SPRITE diff --git a/source/graphics/Terrain.cpp b/source/graphics/Terrain.cpp index 22e9406fd9..306b455387 100644 --- a/source/graphics/Terrain.cpp +++ b/source/graphics/Terrain.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: Terrain.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : Terrain.cpp + * Project : 0 A.D. + * Description : Describes ground via heightmap and array of CPatch. + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/graphics/Terrain.h b/source/graphics/Terrain.h index 97bb1ff654..ec6bf5d4d5 100644 --- a/source/graphics/Terrain.h +++ b/source/graphics/Terrain.h @@ -1,14 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: Terrain.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : Terrain.h + * Project : 0 A.D. + * Description : Describes ground via heightmap and array of CPatch. + * ========================================================================= + */ - -#ifndef _TERRAIN_H -#define _TERRAIN_H +#ifndef INCLUDED_TERRAIN +#define INCLUDED_TERRAIN #include "maths/Vector3D.h" #include "graphics/SColor.h" diff --git a/source/graphics/TerrainProperties.h b/source/graphics/TerrainProperties.h index 0b9ccfac3c..31ba69853a 100644 --- a/source/graphics/TerrainProperties.h +++ b/source/graphics/TerrainProperties.h @@ -1,5 +1,5 @@ /* - +/////////////////////////////////////////////// CTerrainProperties Basically represents a set of terrain attributes loaded from XML. These @@ -7,8 +7,8 @@ */ -#ifndef graphics_TerrainProperties_H -#define graphics_TerrainProperties_H +#ifndef INCLUDED_TERRAINPROPERTIES +#define INCLUDED_TERRAINPROPERTIES #include "ps/CStr.h" #include diff --git a/source/graphics/Texture.h b/source/graphics/Texture.h index 3bb857733d..fb9056f6b2 100644 --- a/source/graphics/Texture.h +++ b/source/graphics/Texture.h @@ -1,16 +1,11 @@ //----------------------------------------------------------- -// // Name: Texture.h -// Last Update: 25/11/03 -// Author: Rich Cross -// Contact: rich@0ad.wildfiregames.com -// // Description: Basic texture class // //----------------------------------------------------------- -#ifndef _TEXTURE_H -#define _TEXTURE_H +#ifndef INCLUDED_TEXTURE +#define INCLUDED_TEXTURE #include "lib/res/handle.h" #include "ps/CStr.h" diff --git a/source/graphics/TextureEntry.h b/source/graphics/TextureEntry.h index 850e774d9e..c9064ce377 100644 --- a/source/graphics/TextureEntry.h +++ b/source/graphics/TextureEntry.h @@ -1,5 +1,5 @@ -#ifndef _TEXTUREENTRY_H -#define _TEXTUREENTRY_H +#ifndef INCLUDED_TEXTUREENTRY +#define INCLUDED_TEXTUREENTRY #include diff --git a/source/graphics/TextureManager.h b/source/graphics/TextureManager.h index cfca8f15f5..1bab4393de 100644 --- a/source/graphics/TextureManager.h +++ b/source/graphics/TextureManager.h @@ -1,5 +1,5 @@ -#ifndef _TEXTUREMANAGER_H -#define _TEXTUREMANAGER_H +#ifndef INCLUDED_TEXTUREMANAGER +#define INCLUDED_TEXTUREMANAGER #include #include diff --git a/source/graphics/Unit.h b/source/graphics/Unit.h index 58300a895b..2efc5534d8 100644 --- a/source/graphics/Unit.h +++ b/source/graphics/Unit.h @@ -1,5 +1,5 @@ -#ifndef _UNIT_H -#define _UNIT_H +#ifndef INCLUDED_UNIT +#define INCLUDED_UNIT #include diff --git a/source/graphics/UnitAnimation.h b/source/graphics/UnitAnimation.h index da1c96511c..24f18da21c 100644 --- a/source/graphics/UnitAnimation.h +++ b/source/graphics/UnitAnimation.h @@ -1,5 +1,5 @@ -#ifndef UNITANIMATION_H__ -#define UNITANIMATION_H__ +#ifndef INCLUDED_UNITANIMATION +#define INCLUDED_UNITANIMATION #include "ps/CStr.h" @@ -25,4 +25,4 @@ private: float m_TimeToNextSync; }; -#endif // UNITANIMATION_H__ +#endif // INCLUDED_UNITANIMATION diff --git a/source/graphics/UnitManager.cpp b/source/graphics/UnitManager.cpp index eb619a02cd..c710e1602a 100644 --- a/source/graphics/UnitManager.cpp +++ b/source/graphics/UnitManager.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: UnitManager.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : UnitManager.cpp + * Project : 0 A.D. + * Description : Container that owns all units + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/graphics/UnitManager.h b/source/graphics/UnitManager.h index b7c9f200a3..e79ac4b2d7 100644 --- a/source/graphics/UnitManager.h +++ b/source/graphics/UnitManager.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: UnitManager.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : UnitManager.h + * Project : 0 A.D. + * Description : Container that owns all units + * ========================================================================= + */ -#ifndef _UNITMANAGER_H -#define _UNITMANAGER_H +#ifndef INCLUDED_UNITMANAGER +#define INCLUDED_UNITMANAGER #include #include diff --git a/source/graphics/scripting/JSInterface_Camera.h b/source/graphics/scripting/JSInterface_Camera.h index b9014fdef0..c5b7e0e189 100644 --- a/source/graphics/scripting/JSInterface_Camera.h +++ b/source/graphics/scripting/JSInterface_Camera.h @@ -3,8 +3,6 @@ // A JavaScript wrapper around a camera object. // // Usage: When manipulating objects of type 'Camera' in JavaScript -// -// Mark Thompson (mot20@cam.ac.uk / mark@wildfiregames.com) #include "scripting/ScriptingHost.h" @@ -12,8 +10,8 @@ #include "graphics/Camera.h" #include "graphics/HFTracer.h" -#ifndef JSI_CAMERA_INCLUDED -#define JSI_CAMERA_INCLUDED +#ifndef INCLUDED_JSI_CAMERA +#define INCLUDED_JSI_CAMERA namespace JSI_Camera { diff --git a/source/graphics/scripting/JSInterface_LightEnv.cpp b/source/graphics/scripting/JSInterface_LightEnv.cpp index 3fbf380b10..56425f67db 100644 --- a/source/graphics/scripting/JSInterface_LightEnv.cpp +++ b/source/graphics/scripting/JSInterface_LightEnv.cpp @@ -3,8 +3,6 @@ * File : JSInterface_LightEnv.cpp * Project : Pyrogenesis * Description : Provide the LightEnv object type for JavaScript - * - * @author Nicolai Haehnle * ========================================================================= */ @@ -236,3 +234,4 @@ JSBool setLightEnv(JSContext* cx, JSObject* UNUSED(obj), jsval UNUSED(id), jsval } // namespace JSI_LightEnv + diff --git a/source/graphics/scripting/JSInterface_LightEnv.h b/source/graphics/scripting/JSInterface_LightEnv.h index ac0bf6210a..1fa4318b98 100644 --- a/source/graphics/scripting/JSInterface_LightEnv.h +++ b/source/graphics/scripting/JSInterface_LightEnv.h @@ -3,13 +3,11 @@ * File : JSInterface_LightEnv.h * Project : Pyrogenesis * Description : Provide the LightEnv object type for JavaScript - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef JSI_LIGHTENV_INCLUDED -#define JSI_LIGHTENV_INCLUDED +#ifndef INCLUDED_JSI_LIGHTENV +#define INCLUDED_JSI_LIGHTENV #include "scripting/ScriptingHost.h" diff --git a/source/gui/CButton.cpp b/source/gui/CButton.cpp index 05c8542c79..5c827bbaf7 100644 --- a/source/gui/CButton.cpp +++ b/source/gui/CButton.cpp @@ -1,7 +1,5 @@ /* CButton -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CButton.h b/source/gui/CButton.h index 1fec4f21ac..809891203e 100644 --- a/source/gui/CButton.h +++ b/source/gui/CButton.h @@ -1,7 +1,5 @@ /* GUI Object - Button -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -13,8 +11,8 @@ gee@pyro.nu */ -#ifndef CButton_H -#define CButton_H +#ifndef INCLUDED_CBUTTON +#define INCLUDED_CBUTTON //-------------------------------------------------------- // Includes / Compiler directives @@ -34,8 +32,6 @@ gee@pyro.nu //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Button * * @see IGUIObject diff --git a/source/gui/CCheckBox.cpp b/source/gui/CCheckBox.cpp index 64cbda9970..984a015554 100644 --- a/source/gui/CCheckBox.cpp +++ b/source/gui/CCheckBox.cpp @@ -1,7 +1,5 @@ /* CCheckBox -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CCheckBox.h b/source/gui/CCheckBox.h index 1813898e94..1e3a9aaa29 100644 --- a/source/gui/CCheckBox.h +++ b/source/gui/CCheckBox.h @@ -1,7 +1,5 @@ /* GUI Object - Check box -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -13,8 +11,8 @@ gee@pyro.nu */ -#ifndef CCheckBox_H -#define CCheckBox_H +#ifndef INCLUDED_CCHECKBOX +#define INCLUDED_CCHECKBOX //-------------------------------------------------------- // Includes / Compiler directives @@ -34,8 +32,6 @@ gee@pyro.nu //-------------------------------------------------------- /** - * @author Gustav Larsson - * * CheckBox * * @see IGUIObject diff --git a/source/gui/CDropDown.cpp b/source/gui/CDropDown.cpp index 787dea1ac0..8c8b6aa1ab 100644 --- a/source/gui/CDropDown.cpp +++ b/source/gui/CDropDown.cpp @@ -1,7 +1,5 @@ /* CDropDown -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CDropDown.h b/source/gui/CDropDown.h index fe0be9e1b0..18faab1a05 100644 --- a/source/gui/CDropDown.h +++ b/source/gui/CDropDown.h @@ -1,7 +1,5 @@ /* GUI Object - Drop Down (list) -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -15,8 +13,8 @@ gee@pyro.nu */ -#ifndef CDropDown_H -#define CDropDown_H +#ifndef INCLUDED_CDROPDOWN +#define INCLUDED_CDROPDOWN //-------------------------------------------------------- // Includes / Compiler directives @@ -38,8 +36,6 @@ gee@pyro.nu //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Drop Down * * The control can be pressed, but we will not inherent diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp index d7b0f1d10e..cb77989ede 100644 --- a/source/gui/CGUI.cpp +++ b/source/gui/CGUI.cpp @@ -1,7 +1,5 @@ /* CGUI -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CGUI.h b/source/gui/CGUI.h index 40c8cc5a55..09953646cf 100644 --- a/source/gui/CGUI.h +++ b/source/gui/CGUI.h @@ -1,7 +1,5 @@ /* CGUI -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -14,8 +12,8 @@ gee@pyro.nu */ -#ifndef CGUI_H -#define CGUI_H +#ifndef INCLUDED_CGUI +#define INCLUDED_CGUI #include "ps/Errors.h" ERROR_GROUP(GUI); @@ -56,8 +54,6 @@ extern InReaction gui_handler(const SDL_Event_* ev); //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Contains a list of values for new defaults to objects. */ struct SGUIStyle @@ -80,8 +76,6 @@ struct SGUIScrollBarStyle; class GUITooltip; /** - * @author Gustav Larsson - * * The main object that includes the whole GUI. Is singleton * and accessed by g_GUI. * diff --git a/source/gui/CGUIList.h b/source/gui/CGUIList.h index 35c7f73d3e..af8e02053e 100644 --- a/source/gui/CGUIList.h +++ b/source/gui/CGUIList.h @@ -1,6 +1,6 @@ -#ifndef CGUIList_H -#define CGUIList_H +#ifndef INCLUDED_CGUILIST +#define INCLUDED_CGUILIST #include "GUItext.h" diff --git a/source/gui/CGUIScrollBarStyle.cpp b/source/gui/CGUIScrollBarStyle.cpp index b8824c7a31..b372e6df02 100644 --- a/source/gui/CGUIScrollBarStyle.cpp +++ b/source/gui/CGUIScrollBarStyle.cpp @@ -1,7 +1,5 @@ /* SGUIScrollBarStyle -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CGUIScrollBarStyle.h b/source/gui/CGUIScrollBarStyle.h index 52d987018d..bf3fbbf8f8 100644 --- a/source/gui/CGUIScrollBarStyle.h +++ b/source/gui/CGUIScrollBarStyle.h @@ -1,7 +1,5 @@ /* A GUI ScrollBar Style -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -18,8 +16,8 @@ gee@pyro.nu */ -#ifndef CGUIScrollBarStyle_H -#define CGUIScrollBarStyle_H +#ifndef INCLUDED_CGUISCROLLBARSTYLE +#define INCLUDED_CGUISCROLLBARSTYLE //-------------------------------------------------------- // Includes / Compiler directives @@ -31,8 +29,6 @@ gee@pyro.nu //-------------------------------------------------------- /** - * @author Gustav Larsson - * * The GUI Scroll-bar style. * * A scroll-bar style can choose whether to support horizontal, vertical diff --git a/source/gui/CGUIScrollBarVertical.cpp b/source/gui/CGUIScrollBarVertical.cpp index b120d070c0..60a611463b 100644 --- a/source/gui/CGUIScrollBarVertical.cpp +++ b/source/gui/CGUIScrollBarVertical.cpp @@ -1,7 +1,5 @@ /* IGUIScrollBar -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CGUIScrollBarVertical.h b/source/gui/CGUIScrollBarVertical.h index e685a65d0a..3252e47efd 100644 --- a/source/gui/CGUIScrollBarVertical.h +++ b/source/gui/CGUIScrollBarVertical.h @@ -1,7 +1,5 @@ /* A GUI ScrollBar -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -19,8 +17,8 @@ gee@pyro.nu */ -#ifndef CGUIScrollBarVertical_H -#define CGUIScrollBarVertical_H +#ifndef INCLUDED_CGUISCROLLBARVERTICAL +#define INCLUDED_CGUISCROLLBARVERTICAL //-------------------------------------------------------- // Includes / Compiler directives @@ -32,8 +30,6 @@ gee@pyro.nu //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Vertical implementation of IGUIScrollBar * * @see IGUIScrollBar diff --git a/source/gui/CGUISprite.h b/source/gui/CGUISprite.h index c436ec2b5c..9b1f9bb4e7 100644 --- a/source/gui/CGUISprite.h +++ b/source/gui/CGUISprite.h @@ -1,7 +1,5 @@ /* A GUI Sprite -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -19,8 +17,8 @@ gee@pyro.nu */ -#ifndef CGUISprite_H -#define CGUISprite_H +#ifndef INCLUDED_CGUISPRITE +#define INCLUDED_CGUISPRITE //-------------------------------------------------------- // Includes / Compiler directives @@ -57,8 +55,6 @@ struct SGUIImageEffects /** - * @author Gustav Larsson - * * A CGUISprite is actually a collage of several real * sprites, this struct represents is such real sprite. */ @@ -106,8 +102,6 @@ struct SGUIImage /** - * @author Gustav Larsson - * * The GUI sprite, is actually several real sprites (images) * like a collage. View the section in the GUI * TDD for more information. diff --git a/source/gui/CImage.cpp b/source/gui/CImage.cpp index 0911d84092..86c70a450c 100644 --- a/source/gui/CImage.cpp +++ b/source/gui/CImage.cpp @@ -1,7 +1,5 @@ /* CImage -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CImage.h b/source/gui/CImage.h index ad975b11c3..05b51e2b7e 100644 --- a/source/gui/CImage.h +++ b/source/gui/CImage.h @@ -1,7 +1,5 @@ /* GUI Object - Image object -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -13,8 +11,8 @@ gee@pyro.nu */ -#ifndef CImage_H -#define CImage_H +#ifndef INCLUDED_CIMAGE +#define INCLUDED_CIMAGE //-------------------------------------------------------- // Includes / Compiler directives @@ -34,8 +32,6 @@ gee@pyro.nu //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Object just for drawing a sprite. Like CText, without the * possibility to draw text. * diff --git a/source/gui/CInput.cpp b/source/gui/CInput.cpp index b6729a9fda..719183a78d 100644 --- a/source/gui/CInput.cpp +++ b/source/gui/CInput.cpp @@ -1,7 +1,5 @@ /* CInput -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CInput.h b/source/gui/CInput.h index d9ac729b09..7c9e9b65ad 100644 --- a/source/gui/CInput.h +++ b/source/gui/CInput.h @@ -1,7 +1,5 @@ /* GUI Object - Input [box] -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -13,8 +11,8 @@ gee@pyro.nu */ -#ifndef CInput_H -#define CInput_H +#ifndef INCLUDED_CINPUT +#define INCLUDED_CINPUT //-------------------------------------------------------- // Includes / Compiler directives @@ -37,8 +35,6 @@ class IGUIScrollBar; //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Text field where you can input and edit the text. * * It doesn't use IGUITextOwner, because we don't need diff --git a/source/gui/CList.cpp b/source/gui/CList.cpp index 716e8ed31a..b7758cc65d 100644 --- a/source/gui/CList.cpp +++ b/source/gui/CList.cpp @@ -1,7 +1,5 @@ /* CList -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CList.h b/source/gui/CList.h index 7d84e63179..deeb8ab7c6 100644 --- a/source/gui/CList.h +++ b/source/gui/CList.h @@ -1,7 +1,5 @@ /* GUI Object - List [box] -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -15,8 +13,8 @@ gee@pyro.nu */ -#ifndef CList_H -#define CList_H +#ifndef INCLUDED_CLIST +#define INCLUDED_CLIST //-------------------------------------------------------- // Includes / Compiler directives @@ -40,8 +38,6 @@ gee@pyro.nu /** - * @author Gustav Larsson - * * Create a list of elements, where one can be selected * by the user. The control will use a pre-processed * text-object for each element, which will be managed diff --git a/source/gui/CProgressBar.cpp b/source/gui/CProgressBar.cpp index 402f03d1b1..d11d011c31 100644 --- a/source/gui/CProgressBar.cpp +++ b/source/gui/CProgressBar.cpp @@ -1,7 +1,5 @@ /* CProgressBar -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CProgressBar.h b/source/gui/CProgressBar.h index 1b1cb5e176..a46e23e1eb 100644 --- a/source/gui/CProgressBar.h +++ b/source/gui/CProgressBar.h @@ -1,7 +1,5 @@ /* GUI Object - Progress bar -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -13,8 +11,8 @@ gee@pyro.nu */ -#ifndef CProgressBar_H -#define CProgressBar_H +#ifndef INCLUDED_CPROGRESSBAR +#define INCLUDED_CPROGRESSBAR //-------------------------------------------------------- // Includes / Compiler directives @@ -34,8 +32,6 @@ gee@pyro.nu //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Object used to draw a value from 0 to 100 visually. * * @see IGUIObject diff --git a/source/gui/CRadioButton.cpp b/source/gui/CRadioButton.cpp index 169ad48933..bf7b273002 100644 --- a/source/gui/CRadioButton.cpp +++ b/source/gui/CRadioButton.cpp @@ -1,7 +1,5 @@ /* CCheckBox -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CRadioButton.h b/source/gui/CRadioButton.h index 35d95a04b3..c45ea5e356 100644 --- a/source/gui/CRadioButton.h +++ b/source/gui/CRadioButton.h @@ -1,7 +1,5 @@ /* GUI Object - Radio Button -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -13,8 +11,8 @@ gee@pyro.nu */ -#ifndef CRadioButton_H -#define CRadioButton_H +#ifndef INCLUDED_CRADIOBUTTON +#define INCLUDED_CRADIOBUTTON //-------------------------------------------------------- // Includes / Compiler directives @@ -23,8 +21,6 @@ gee@pyro.nu #include "CCheckBox.h" /** - * @author Gustav Larsson - * * Just like a check box, but it'll nullify its siblings (of the same kind), * and it won't switch itself. * diff --git a/source/gui/CText.cpp b/source/gui/CText.cpp index 6bdd32c9da..93343a1351 100644 --- a/source/gui/CText.cpp +++ b/source/gui/CText.cpp @@ -1,7 +1,5 @@ /* CText -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/CText.h b/source/gui/CText.h index 7b43c16cef..ec5e60fa0b 100644 --- a/source/gui/CText.h +++ b/source/gui/CText.h @@ -1,7 +1,5 @@ /* GUI Object - Text [field] -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -13,8 +11,8 @@ gee@pyro.nu */ -#ifndef CText_H -#define CText_H +#ifndef INCLUDED_CTEXT +#define INCLUDED_CTEXT //-------------------------------------------------------- // Includes / Compiler directives @@ -37,8 +35,6 @@ class IGUIScrollBar; //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Text field that just displays static text. * * @see IGUIObject diff --git a/source/gui/CTooltip.h b/source/gui/CTooltip.h index cd9332bda8..27360d557e 100644 --- a/source/gui/CTooltip.h +++ b/source/gui/CTooltip.h @@ -7,8 +7,8 @@ Mostly like CText, but intended for dynamic tooltips */ -#ifndef CTooltip_H -#define CTooltip_H +#ifndef INCLUDED_CTOOLTIP +#define INCLUDED_CTOOLTIP #include "IGUITextOwner.h" diff --git a/source/gui/GUI.h b/source/gui/GUI.h index b053e6010e..9425592f39 100644 --- a/source/gui/GUI.h +++ b/source/gui/GUI.h @@ -1,7 +1,5 @@ /* GUI Inclusion file -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -14,8 +12,8 @@ gee@pyro.nu */ -#ifndef GUI_H -#define GUI_H +#ifndef INCLUDED_GUI +#define INCLUDED_GUI //-------------------------------------------------------- // Includes diff --git a/source/gui/GUITooltip.h b/source/gui/GUITooltip.h index c2ef48018e..06e7090478 100644 --- a/source/gui/GUITooltip.h +++ b/source/gui/GUITooltip.h @@ -1,5 +1,5 @@ -#ifndef GUITooltip_H -#define GUITooltip_H +#ifndef INCLUDED_GUITOOLTIP +#define INCLUDED_GUITOOLTIP class IGUIObject; class CGUI; @@ -26,4 +26,4 @@ private: double m_Time; }; -#endif // GUITooltip_H +#endif // INCLUDED_GUITOOLTIP diff --git a/source/gui/GUIbase.cpp b/source/gui/GUIbase.cpp index 21f37899b0..89b0c004e5 100644 --- a/source/gui/GUIbase.cpp +++ b/source/gui/GUIbase.cpp @@ -1,7 +1,5 @@ /* GUI base -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/GUIbase.h b/source/gui/GUIbase.h index 16217485f3..8ecb9e8420 100644 --- a/source/gui/GUIbase.h +++ b/source/gui/GUIbase.h @@ -1,7 +1,5 @@ /* GUI Core, stuff that the whole GUI uses -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -14,8 +12,8 @@ gee@pyro.nu */ -#ifndef GUIbase_H -#define GUIbase_H +#ifndef INCLUDED_GUIBASE +#define INCLUDED_GUIBASE //-------------------------------------------------------- @@ -86,8 +84,6 @@ enum EGUIMessageType }; /** - * @author Gustav Larsson - * * Message send to IGUIObject::HandleMessage() in order * to give life to Objects manually with * a derived HandleMessage(). @@ -162,8 +158,6 @@ struct SGUIIcon }; /** - * @author Gustav Larsson - * * Client Area is a rectangle relative to a parent rectangle * * You can input the whole value of the Client Area by diff --git a/source/gui/GUItext.cpp b/source/gui/GUItext.cpp index 4f5ffb3900..c0deb749e9 100644 --- a/source/gui/GUItext.cpp +++ b/source/gui/GUItext.cpp @@ -1,7 +1,5 @@ /* GUI text -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/GUItext.h b/source/gui/GUItext.h index 52b28eb1de..b9ece21bba 100644 --- a/source/gui/GUItext.h +++ b/source/gui/GUItext.h @@ -1,7 +1,5 @@ /* GUI text, handles text stuff -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -14,8 +12,8 @@ gee@pyro.nu */ -#ifndef GUItext_H -#define GUItext_H +#ifndef INCLUDED_GUITEXT +#define INCLUDED_GUITEXT //-------------------------------------------------------- @@ -30,8 +28,6 @@ gee@pyro.nu //-------------------------------------------------------- /** - * @author Gustav Larsson - * * An SGUIText object is a parsed string, divided into * text-rendering components. Each component, being a * call to the Renderer. For instance, if you by tags @@ -49,8 +45,6 @@ gee@pyro.nu struct SGUIText { /** - * @author Gustav Larsson - * * A sprite call to the CRenderer */ struct SSpriteCall @@ -71,8 +65,6 @@ struct SGUIText }; /** - * @author Gustav Larsson - * * A text call to the CRenderer */ struct STextCall @@ -144,8 +136,6 @@ struct SGUIText }; /** - * @author Gustav Larsson - * * String class, substitute for CStr, but that parses * the tags and builds up a list of all text that will * be different when outputted. @@ -160,8 +150,6 @@ class CGUIString { public: /** - * @author Gustav Larsson - * * A chunk of text that represents one call to the renderer. * In other words, all text in one chunk, will be drawn * exactly with the same settings. @@ -169,8 +157,6 @@ public: struct TextChunk { /** - * @author Gustav Larsson - * * A tag looks like this "Hello [B]there[/B] little" */ struct Tag @@ -228,8 +214,6 @@ public: }; /** - * @author Gustav Larsson - * * All data generated in GenerateTextCall() */ struct SFeedback diff --git a/source/gui/GUIutil.cpp b/source/gui/GUIutil.cpp index a8b57727a8..1d0ee8e340 100644 --- a/source/gui/GUIutil.cpp +++ b/source/gui/GUIutil.cpp @@ -1,7 +1,5 @@ /* GUI utilities -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/GUIutil.h b/source/gui/GUIutil.h index 5bfd801644..1679dc388f 100644 --- a/source/gui/GUIutil.h +++ b/source/gui/GUIutil.h @@ -1,7 +1,5 @@ /* GUI util -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -14,8 +12,8 @@ gee@pyro.nu */ -#ifndef GUIutil_H -#define GUIutil_H +#ifndef INCLUDED_GUIUTIL +#define INCLUDED_GUIUTIL //-------------------------------------------------------- @@ -50,8 +48,6 @@ void guiLoadIdentity(); struct SGUIMessage; /** - * @author Gustav Larsson - * * Base class to only the class GUI. This superclass is * kind of a templateless extention of the class GUI. * Used for other functions to friend with, because it @@ -81,8 +77,6 @@ template void CheckType(const IGUIObject* obj, const CStr& setting); /** - * @author Gustav Larsson - * * Includes static functions that needs one template * argument. * diff --git a/source/gui/IGUIButtonBehavior.cpp b/source/gui/IGUIButtonBehavior.cpp index a52c7b7fa5..7762d7fbb2 100644 --- a/source/gui/IGUIButtonBehavior.cpp +++ b/source/gui/IGUIButtonBehavior.cpp @@ -1,7 +1,5 @@ /* IGUIButtonBehavior -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/IGUIButtonBehavior.h b/source/gui/IGUIButtonBehavior.h index f1c3cbb7f9..766a3d1b98 100644 --- a/source/gui/IGUIButtonBehavior.h +++ b/source/gui/IGUIButtonBehavior.h @@ -1,7 +1,5 @@ /* GUI Object Base - Button Behavior -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -17,8 +15,8 @@ gee@pyro.nu */ -#ifndef IGUIButtonBehavior_H -#define IGUIButtonBehavior_H +#ifndef INCLUDED_IGUIBUTTONBEHAVIOR +#define INCLUDED_IGUIBUTTONBEHAVIOR //-------------------------------------------------------- // Includes / Compiler directives @@ -40,8 +38,6 @@ class CGUISpriteInstance; //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Appends button behaviours to the IGUIObject. * Can be used with multiple inheritance alongside * IGUISettingsObject and such. diff --git a/source/gui/IGUIObject.cpp b/source/gui/IGUIObject.cpp index 2d2a0012a8..aeb336df8c 100644 --- a/source/gui/IGUIObject.cpp +++ b/source/gui/IGUIObject.cpp @@ -1,7 +1,5 @@ /* IGUIObject -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/IGUIObject.h b/source/gui/IGUIObject.h index a33fb801f9..546a73e30a 100644 --- a/source/gui/IGUIObject.h +++ b/source/gui/IGUIObject.h @@ -1,7 +1,5 @@ /* The base class of an object -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -25,8 +23,8 @@ gee@pyro.nu */ -#ifndef IGUIObject_H -#define IGUIObject_H +#ifndef INCLUDED_IGUIOBJECT +#define INCLUDED_IGUIOBJECT //-------------------------------------------------------- // Includes / Compiler directives @@ -81,8 +79,6 @@ enum EGUISettingType #undef TYPE /** - * @author Gustav Larsson - * * A GUI Setting is anything that can be inputted from XML as * -attributes (with exceptions). For instance: * @@ -98,8 +94,6 @@ struct SGUISetting }; /** - * @author Gustav Larsson - * * Base settings, all objects possess these settings * in their m_BaseSettings * Instructions can be found in the documentations. @@ -120,8 +114,6 @@ struct SGUISetting ////////////////////////////////////////////////////////// /** - * @author Gustav Larsson - * * GUI object such as a button or an input-box. * Abstract data type ! */ @@ -533,8 +525,6 @@ private: /** - * @author Gustav Larsson - * * Dummy object used primarily for the root object * or objects of type 'empty' */ diff --git a/source/gui/IGUIScrollBar.cpp b/source/gui/IGUIScrollBar.cpp index 9b8e966842..10a9adb636 100644 --- a/source/gui/IGUIScrollBar.cpp +++ b/source/gui/IGUIScrollBar.cpp @@ -1,7 +1,5 @@ /* IGUIScrollBar -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/IGUIScrollBar.h b/source/gui/IGUIScrollBar.h index 70cfb4a92d..d020c60942 100644 --- a/source/gui/IGUIScrollBar.h +++ b/source/gui/IGUIScrollBar.h @@ -1,7 +1,5 @@ /* A GUI ScrollBar -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -19,8 +17,8 @@ gee@pyro.nu */ -#ifndef IGUIScrollBar_H -#define IGUIScrollBar_H +#ifndef INCLUDED_IGUISCROLLBAR +#define INCLUDED_IGUISCROLLBAR //-------------------------------------------------------- // Includes / Compiler directives @@ -32,8 +30,6 @@ gee@pyro.nu //-------------------------------------------------------- /** - * @author Gustav Larsson - * * The GUI Scroll-bar style. Tells us how scroll-bars look and feel. * * A scroll-bar style can choose whether to support horizontal, vertical @@ -121,8 +117,6 @@ struct SGUIScrollBarStyle /** - * @author Gustav Larsson - * * The GUI Scroll-bar, used everywhere there is a scroll-bar in the game. * * To include a scroll-bar to an object, inherent the object from diff --git a/source/gui/IGUIScrollBarOwner.cpp b/source/gui/IGUIScrollBarOwner.cpp index 8cef34c42c..1426eb1c33 100644 --- a/source/gui/IGUIScrollBarOwner.cpp +++ b/source/gui/IGUIScrollBarOwner.cpp @@ -1,7 +1,5 @@ /* IGUIScrollBarOwner -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/IGUIScrollBarOwner.h b/source/gui/IGUIScrollBarOwner.h index a2de89b934..1bb8723836 100644 --- a/source/gui/IGUIScrollBarOwner.h +++ b/source/gui/IGUIScrollBarOwner.h @@ -1,7 +1,5 @@ /* GUI Object Base - Scroll-bar owner -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -13,8 +11,8 @@ gee@pyro.nu */ -#ifndef IGUIScrollBarOwner_H -#define IGUIScrollBarOwner_H +#ifndef INCLUDED_IGUISCROLLBAROWNER +#define INCLUDED_IGUISCROLLBAROWNER //-------------------------------------------------------- // Includes / Compiler directives @@ -37,8 +35,6 @@ class IGUIScrollBar; //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Base-class this if you want an object to contain * one, or several, scroll-bars. * diff --git a/source/gui/IGUITextOwner.cpp b/source/gui/IGUITextOwner.cpp index c338e33fef..47cc237f2f 100644 --- a/source/gui/IGUITextOwner.cpp +++ b/source/gui/IGUITextOwner.cpp @@ -1,7 +1,5 @@ /* IGUITextOwner -by Gustav Larsson -gee@pyro.nu */ #include "precompiled.h" diff --git a/source/gui/IGUITextOwner.h b/source/gui/IGUITextOwner.h index 6fd9004427..94e367bb55 100644 --- a/source/gui/IGUITextOwner.h +++ b/source/gui/IGUITextOwner.h @@ -1,7 +1,5 @@ /* GUI Object Base - Text Owner -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -17,8 +15,8 @@ gee@pyro.nu */ -#ifndef IGUITextOwner_H -#define IGUITextOwner_H +#ifndef INCLUDED_IGUITEXTOWNER +#define INCLUDED_IGUITEXTOWNER //-------------------------------------------------------- // Includes / Compiler directives @@ -38,8 +36,6 @@ gee@pyro.nu //-------------------------------------------------------- /** - * @author Gustav Larsson - * * Framework for handling Output text. * * @see IGUIObject diff --git a/source/gui/MiniMap.h b/source/gui/MiniMap.h index 6db6efb217..0f26e8f9d1 100644 --- a/source/gui/MiniMap.h +++ b/source/gui/MiniMap.h @@ -1,5 +1,5 @@ -#ifndef __H_MINIMAP_H__ -#define __H_MINIMAP_H__ +#ifndef INCLUDED_MINIMAP +#define INCLUDED_MINIMAP #include "gui/GUI.h" diff --git a/source/gui/scripting/JSInterface_GUITypes.h b/source/gui/scripting/JSInterface_GUITypes.h index 7ba9859fca..12464d76df 100644 --- a/source/gui/scripting/JSInterface_GUITypes.h +++ b/source/gui/scripting/JSInterface_GUITypes.h @@ -1,7 +1,7 @@ #include "scripting/ScriptingHost.h" -#ifndef JSI_GUITYPES_INCLUDED -#define JSI_GUITYPES_INCLUDED +#ifndef INCLUDED_JSI_GUITYPES +#define INCLUDED_JSI_GUITYPES #define GUISTDTYPE(x) \ namespace JSI_GUI##x \ diff --git a/source/gui/scripting/JSInterface_IGUIObject.h b/source/gui/scripting/JSInterface_IGUIObject.h index 394ed987d7..cd85060e80 100644 --- a/source/gui/scripting/JSInterface_IGUIObject.h +++ b/source/gui/scripting/JSInterface_IGUIObject.h @@ -1,7 +1,7 @@ #include "scripting/ScriptingHost.h" -#ifndef JSI_IGUIOBJECT_INCLUDED -#define JSI_IGUIOBJECT_INCLUDED +#ifndef INCLUDED_JSI_IGUIOBJECT +#define INCLUDED_JSI_IGUIOBJECT namespace JSI_IGUIObject { diff --git a/source/i18n/BufferVariable.h b/source/i18n/BufferVariable.h index ad901a89c8..186ea401ab 100644 --- a/source/i18n/BufferVariable.h +++ b/source/i18n/BufferVariable.h @@ -5,8 +5,8 @@ providing hashes and strings on request. */ -#ifndef I18N_BUFFERVARIABLE_H -#define I18N_BUFFERVARIABLE_H +#ifndef INCLUDED_I18N_BUFFERVARIABLE +#define INCLUDED_I18N_BUFFERVARIABLE #include "Common.h" @@ -84,4 +84,4 @@ namespace I18n bool operator== (BufferVariable&, BufferVariable&); } -#endif // I18N_BUFFERVARIABLE_H +#endif // INCLUDED_I18N_BUFFERVARIABLE diff --git a/source/i18n/CLocale.h b/source/i18n/CLocale.h index b52c23c264..be95e658eb 100644 --- a/source/i18n/CLocale.h +++ b/source/i18n/CLocale.h @@ -8,8 +8,8 @@ All other methods are used internally by other I18n components. */ -#ifndef I18N_CLOCALE_H -#define I18N_CLOCALE_H +#ifndef INCLUDED_I18N_CLOCALE +#define INCLUDED_I18N_CLOCALE #include "Common.h" @@ -122,4 +122,4 @@ namespace I18n }; } -#endif // I18N_CLOCALE_H +#endif // INCLUDED_I18N_CLOCALE diff --git a/source/i18n/Common.h b/source/i18n/Common.h index c0c2f33d55..1b975d94d7 100644 --- a/source/i18n/Common.h +++ b/source/i18n/Common.h @@ -1,7 +1,7 @@ // Things that are used by most I18n code: -#ifndef I18N_COMMON_H -#define I18N_COMMON_H +#ifndef INCLUDED_I18N_COMMON +#define INCLUDED_I18N_COMMON #include @@ -17,4 +17,4 @@ ERROR_GROUP(I18n); // That was exciting. -#endif // I18N_COMMON_H +#endif // INCLUDED_I18N_COMMON diff --git a/source/i18n/DataTypes.h b/source/i18n/DataTypes.h index 6f5d88dceb..384742b98c 100644 --- a/source/i18n/DataTypes.h +++ b/source/i18n/DataTypes.h @@ -1,5 +1,5 @@ -#ifndef I18N_DATATYPES_H -#define I18N_DATATYPES_H +#ifndef INCLUDED_I18N_DATATYPES +#define INCLUDED_I18N_DATATYPES #include "StrImmutable.h" @@ -28,4 +28,4 @@ namespace I18n } -#endif // I18N_DATATYPES_H +#endif // INCLUDED_I18N_DATATYPES diff --git a/source/i18n/Interface.h b/source/i18n/Interface.h index 2df98ff84d..261e0bda5a 100644 --- a/source/i18n/Interface.h +++ b/source/i18n/Interface.h @@ -4,8 +4,8 @@ The only file that external code should need to include. */ -#ifndef I18N_INTERFACE_H -#define I18N_INTERFACE_H +#ifndef INCLUDED_I18N_INTERFACE +#define INCLUDED_I18N_INTERFACE #include "StringBuffer.h" #include "DataTypes.h" @@ -43,4 +43,4 @@ namespace I18n CLocale_interface* NewLocale(JSContext* cx, JSObject* scope); } -#endif // I18N_INTERFACE_H +#endif // INCLUDED_I18N_INTERFACE diff --git a/source/i18n/ScriptInterface.h b/source/i18n/ScriptInterface.h index eeb80f8171..4c674f90ab 100644 --- a/source/i18n/ScriptInterface.h +++ b/source/i18n/ScriptInterface.h @@ -7,8 +7,8 @@ and 'variables' (dependent on the type passed with "translate(...) <<"). */ -#ifndef I18N_SCRIPTINTERFACE_H -#define I18N_SCRIPTINTERFACE_H +#ifndef INCLUDED_I18N_SCRIPTINTERFACE +#define INCLUDED_I18N_SCRIPTINTERFACE #include "Common.h" #include "BufferVariable.h" @@ -95,4 +95,4 @@ namespace I18n }; } -#endif // I18N_SCRIPTINTERFACE_H +#endif // INCLUDED_I18N_SCRIPTINTERFACE diff --git a/source/i18n/StrImmutable.h b/source/i18n/StrImmutable.h index 8b42710a83..58b83ddf30 100644 --- a/source/i18n/StrImmutable.h +++ b/source/i18n/StrImmutable.h @@ -6,8 +6,8 @@ which is not insignificant). */ -#ifndef I18N_STRIMMUTABLE_H -#define I18N_STRIMMUTABLE_H +#ifndef INCLUDED_I18N_STRIMMUTABLE +#define INCLUDED_I18N_STRIMMUTABLE #include #include @@ -103,4 +103,4 @@ namespace I18n }; } -#endif // I18N_STRIMMUTABLE_H +#endif // INCLUDED_I18N_STRIMMUTABLE diff --git a/source/i18n/StringBuffer.h b/source/i18n/StringBuffer.h index eff7e8eb9e..7e4d40c02b 100644 --- a/source/i18n/StringBuffer.h +++ b/source/i18n/StringBuffer.h @@ -5,8 +5,8 @@ before converting into a string. */ -#ifndef I18N_STRINGBUF_H -#define I18N_STRINGBUF_H +#ifndef INCLUDED_I18N_STRINGBUFFER +#define INCLUDED_I18N_STRINGBUFFER #include "Common.h" #include "TranslatedString.h" @@ -56,4 +56,4 @@ namespace I18n } -#endif // I18N_STRINGBUF_H +#endif // INCLUDED_I18N_STRINGBUFFER diff --git a/source/i18n/TSComponent.h b/source/i18n/TSComponent.h index 80c7e388d2..6ce2a292e0 100644 --- a/source/i18n/TSComponent.h +++ b/source/i18n/TSComponent.h @@ -5,8 +5,8 @@ and JS function calls, allowing conversion to strings. */ -#ifndef I18N_TSCOMPONENT_H -#define I18N_TSCOMPONENT_H +#ifndef INCLUDED_I18N_TSCOMPONENT +#define INCLUDED_I18N_TSCOMPONENT #include "StrImmutable.h" #include "BufferVariable.h" @@ -71,4 +71,4 @@ namespace I18n } -#endif // I18N_TSCOMPONENT_H +#endif // INCLUDED_I18N_TSCOMPONENT diff --git a/source/i18n/TranslatedString.h b/source/i18n/TranslatedString.h index b14c982dc3..6aa4980fe4 100644 --- a/source/i18n/TranslatedString.h +++ b/source/i18n/TranslatedString.h @@ -5,8 +5,8 @@ Simple storage for translated phrases, made up of lots of TSComponents */ -#ifndef I18N_TSTRING_H -#define I18N_TSTRING_H +#ifndef INCLUDED_I18N_TRANSLATEDSTRING +#define INCLUDED_I18N_TRANSLATEDSTRING #include @@ -25,4 +25,4 @@ namespace I18n } -#endif // I18N_TSTRING_H +#endif // INCLUDED_I18N_TRANSLATEDSTRING diff --git a/source/i18n/tests2/utf16string.h b/source/i18n/tests2/utf16string.h index c56ec7fe57..e3678cd734 100644 --- a/source/i18n/tests2/utf16string.h +++ b/source/i18n/tests2/utf16string.h @@ -2,8 +2,8 @@ A basic_string derivative that works with uint16_t as its underlying char type. */ -#ifndef utf16string_H -#define utf16string_H +#ifndef INCLUDED_UTF16STRING +#define INCLUDED_UTF16STRING // On Windows, wchar_t is typedef'ed to unsigned short, which conflicts // with uint16_t (which is also an unsigned short), so just use std::wstring diff --git a/source/lib/adts.h b/source/lib/adts.h index 6a0f69877f..311e5c5811 100644 --- a/source/lib/adts.h +++ b/source/lib/adts.h @@ -3,25 +3,13 @@ * File : adts.h * Project : 0 A.D. * Description : useful Abstract Data Types not provided by STL. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef ADTS_H__ -#define ADTS_H__ +#ifndef INCLUDED_ADTS +#define INCLUDED_ADTS //----------------------------------------------------------------------------- // dynamic (grow-able) hash table @@ -643,4 +631,4 @@ public: }; -#endif // #ifndef ADTS_H__ +#endif // #ifndef INCLUDED_ADTS diff --git a/source/lib/allocators.cpp b/source/lib/allocators.cpp index 1a10b39cd3..ec8a150b35 100644 --- a/source/lib/allocators.cpp +++ b/source/lib/allocators.cpp @@ -3,22 +3,10 @@ * File : allocators.cpp * Project : 0 A.D. * Description : memory suballocators. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "allocators.h" diff --git a/source/lib/allocators.h b/source/lib/allocators.h index b1abec9301..df7821ed3a 100644 --- a/source/lib/allocators.h +++ b/source/lib/allocators.h @@ -3,25 +3,13 @@ * File : allocators.h * Project : 0 A.D. * Description : memory suballocators. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef ALLOCATORS_H__ -#define ALLOCATORS_H__ +#ifndef INCLUDED_ALLOCATORS +#define INCLUDED_ALLOCATORS #include @@ -615,4 +603,4 @@ private: Allocs allocs; }; -#endif // #ifndef ALLOCATORS_H__ +#endif // #ifndef INCLUDED_ALLOCATORS diff --git a/source/lib/app_hooks.cpp b/source/lib/app_hooks.cpp index 04a69ab32a..a6cf98ba94 100644 --- a/source/lib/app_hooks.cpp +++ b/source/lib/app_hooks.cpp @@ -3,22 +3,10 @@ * File : app_hooks.cpp * Project : 0 A.D. * Description : hooks to allow customization / app-specific behavior. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "app_hooks.h" diff --git a/source/lib/app_hooks.h b/source/lib/app_hooks.h index e00704d8fb..64681a18c8 100644 --- a/source/lib/app_hooks.h +++ b/source/lib/app_hooks.h @@ -3,22 +3,10 @@ * File : app_hooks.h * Project : 0 A.D. * Description : hooks to allow customization / app-specific behavior. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt /* @@ -84,8 +72,8 @@ extern const wchar_t*, translate, (const wchar_t* text), (text), return) */ -#ifndef APP_HOOKS_H__ -#define APP_HOOKS_H__ +#ifndef INCLUDED_APP_HOOKS +#define INCLUDED_APP_HOOKS // trampolines for user code to call the hooks. they encapsulate // the details of how exactly to do this. @@ -203,4 +191,4 @@ extern bool app_hook_was_redefined(size_t offset_in_struct); // name is identifier of the function pointer within AppHooks to test. #define AH_IS_DEFINED(name) app_hook_was_redefined(offsetof(AppHooks, name)) -#endif // #ifndef APP_HOOKS_H__ +#endif // #ifndef INCLUDED_APP_HOOKS diff --git a/source/lib/byte_order.cpp b/source/lib/byte_order.cpp index d6212b9163..300f9c2e91 100644 --- a/source/lib/byte_order.cpp +++ b/source/lib/byte_order.cpp @@ -3,22 +3,10 @@ * File : byte_order.cpp * Project : 0 A.D. * Description : byte order (endianness) support routines. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "byte_order.h" diff --git a/source/lib/byte_order.h b/source/lib/byte_order.h index 51700e17f0..99ff4fcfd8 100644 --- a/source/lib/byte_order.h +++ b/source/lib/byte_order.h @@ -3,22 +3,10 @@ * File : byte_order.h * Project : 0 A.D. * Description : byte order (endianness) support routines. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_BYTE_ORDER #define INCLUDED_BYTE_ORDER diff --git a/source/lib/cache_adt.h b/source/lib/cache_adt.h index 097a11d4c3..b82e279357 100644 --- a/source/lib/cache_adt.h +++ b/source/lib/cache_adt.h @@ -3,25 +3,13 @@ * File : cache_adt.h * Project : 0 A.D. * Description : Customizable cache data structure. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef CACHE_ADT_H__ -#define CACHE_ADT_H__ +#ifndef INCLUDED_CACHE_ADT +#define INCLUDED_CACHE_ADT #include @@ -729,4 +717,4 @@ private: Manager mgr; }; -#endif // #ifndef CACHE_ADT_H__ +#endif // #ifndef INCLUDED_CACHE_ADT diff --git a/source/lib/config.h b/source/lib/config.h index a40c355f0d..cf34465007 100644 --- a/source/lib/config.h +++ b/source/lib/config.h @@ -3,25 +3,13 @@ * File : config.h * Project : 0 A.D. * Description : compile-time configuration and capability detection. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef CONFIG_H_INCLUDED -#define CONFIG_H_INCLUDED +#ifndef INCLUDED_CONFIG +#define INCLUDED_CONFIG // the config/have macros are always defined; their values (1 or 0) are // tested with #if instead of #ifdef. @@ -422,4 +410,4 @@ # define USE_IA32_FLOAT_TO_INT 0 #endif -#endif // #ifndef CONFIG_H_INCLUDED +#endif // #ifndef INCLUDED_CONFIG diff --git a/source/lib/debug.cpp b/source/lib/debug.cpp index 6ee734ad19..ce35638bb2 100644 --- a/source/lib/debug.cpp +++ b/source/lib/debug.cpp @@ -3,22 +3,10 @@ * File : debug.cpp * Project : 0 A.D. * Description : platform-independent debug support code. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "debug.h" diff --git a/source/lib/debug.h b/source/lib/debug.h index c329401509..4a577b0f1c 100644 --- a/source/lib/debug.h +++ b/source/lib/debug.h @@ -3,25 +3,13 @@ * File : debug.h * Project : 0 A.D. * Description : platform-independent debug support code. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef DEBUG_H_INCLUDED -#define DEBUG_H_INCLUDED +#ifndef INCLUDED_DEBUG +#define INCLUDED_DEBUG #include "lib.h" // STMT #if OS_WIN @@ -697,4 +685,4 @@ extern const wchar_t* debug_error_message_build( **/ extern void debug_shutdown(); -#endif // #ifndef DEBUG_H_INCLUDED +#endif // #ifndef INCLUDED_DEBUG diff --git a/source/lib/debug_stl.cpp b/source/lib/debug_stl.cpp index 9355ae1795..078e9fac91 100644 --- a/source/lib/debug_stl.cpp +++ b/source/lib/debug_stl.cpp @@ -3,22 +3,10 @@ * File : debug_stl.cpp * Project : 0 A.D. * Description : portable debugging helper functions specific to the STL. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "debug_stl.h" diff --git a/source/lib/debug_stl.h b/source/lib/debug_stl.h index f81a630330..3f8affbe6e 100644 --- a/source/lib/debug_stl.h +++ b/source/lib/debug_stl.h @@ -3,25 +3,13 @@ * File : debug_stl.h * Project : 0 A.D. * Description : portable debugging helper functions specific to the STL. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef DEBUG_STL_H_INCLUDED -#define DEBUG_STL_H_INCLUDED +#ifndef INCLUDED_DEBUG_STL +#define INCLUDED_DEBUG_STL namespace ERR @@ -78,4 +66,4 @@ const size_t DEBUG_STL_MAX_ITERATOR_SIZE = 64; extern LibError debug_stl_get_container_info(const char* type_name, const u8* p, size_t size, size_t el_size, size_t* el_count, DebugIterator* el_iterator, void* it_mem); -#endif // #ifndef DEBUG_STL_H_INCLUDED +#endif // #ifndef INCLUDED_DEBUG_STL diff --git a/source/lib/external_libraries/sdl.h b/source/lib/external_libraries/sdl.h index f3ac7162fa..ae2b52d806 100644 --- a/source/lib/external_libraries/sdl.h +++ b/source/lib/external_libraries/sdl.h @@ -3,25 +3,13 @@ * File : sdl.h * Project : 0 A.D. * Description : SDL header; uses emulator on Windows, otherwise libsdl. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef LIB_SDL_H__ -#define LIB_SDL_H__ +#ifndef INCLUDED_SDL +#define INCLUDED_SDL #include "sdl_fwd.h" @@ -45,4 +33,4 @@ struct SDL_Event_ SDL_Event ev; }; -#endif // LIB_SDL_H__ +#endif // INCLUDED_SDL diff --git a/source/lib/external_libraries/sdl_fwd.h b/source/lib/external_libraries/sdl_fwd.h index e4b34aee6c..48c1e2daac 100644 --- a/source/lib/external_libraries/sdl_fwd.h +++ b/source/lib/external_libraries/sdl_fwd.h @@ -1,5 +1,5 @@ -#ifndef SDL_FWD_H__ -#define SDL_FWD_H__ +#ifndef INCLUDED_SDL_FWD +#define INCLUDED_SDL_FWD // 2006-08-26 SDL is dragged into 6 of our 7 static library components. // it must be specified in each of their "extern_libs" so that the @@ -12,4 +12,4 @@ // forward-declared and used for pointers. struct SDL_Event_; -#endif // #ifndef SDL_FWD_H__ +#endif // #ifndef INCLUDED_SDL_FWD diff --git a/source/lib/external_libraries/wxwidgets.h b/source/lib/external_libraries/wxwidgets.h index 3e86094a65..b65639ed2b 100644 --- a/source/lib/external_libraries/wxwidgets.h +++ b/source/lib/external_libraries/wxwidgets.h @@ -3,22 +3,10 @@ * File : wxwidgets.h * Project : 0 A.D. * Description : pulls in wxWidgets headers, with compatibility fixes - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2007 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WXWIDGETS #define INCLUDED_WXWIDGETS diff --git a/source/lib/glext_funcs.h b/source/lib/glext_funcs.h index faa9cbcc8a..e8bc82ac58 100644 --- a/source/lib/glext_funcs.h +++ b/source/lib/glext_funcs.h @@ -3,22 +3,10 @@ * File : glext_funcs.h * Project : 0 A.D. * Description : OpenGL extension function declarations (X macros). - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include #if OS_WIN diff --git a/source/lib/input.cpp b/source/lib/input.cpp index 57a9a7d56d..87f8de78b7 100644 --- a/source/lib/input.cpp +++ b/source/lib/input.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : SDL input redirector; dispatches to multiple handlers and * : allows record/playback of evs. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "input.h" diff --git a/source/lib/input.h b/source/lib/input.h index 3e337362bf..c8be8512ad 100644 --- a/source/lib/input.h +++ b/source/lib/input.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : SDL input redirector; dispatches to multiple handlers and * : allows record/playback of events. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef INPUT_H__ -#define INPUT_H__ +#ifndef INCLUDED_INPUT +#define INCLUDED_INPUT #include "lib/external_libraries/sdl_fwd.h" @@ -55,4 +43,4 @@ extern LibError in_record(const char* fn); extern LibError in_playback(const char* fn); extern void in_stop(void); -#endif // #ifndef INPUT_H__ +#endif // #ifndef INCLUDED_INPUT diff --git a/source/lib/lf_alloc.cpp b/source/lib/lf_alloc.cpp index 90f7ada5e5..accb5fbce7 100644 --- a/source/lib/lf_alloc.cpp +++ b/source/lib/lf_alloc.cpp @@ -3,22 +3,10 @@ * File : lf_alloc.cpp * Project : 0 A.D. * Description : lock-free memory allocation. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" diff --git a/source/lib/lib.cpp b/source/lib/lib.cpp index 503f7da272..11ee8242e5 100644 --- a/source/lib/lib.cpp +++ b/source/lib/lib.cpp @@ -3,22 +3,10 @@ * File : lib.cpp * Project : 0 A.D. * Description : various utility functions. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "lib.h" diff --git a/source/lib/lib.h b/source/lib/lib.h index 6c3a28eaef..f9c9add331 100644 --- a/source/lib/lib.h +++ b/source/lib/lib.h @@ -3,22 +3,10 @@ * File : lib.h * Project : 0 A.D. * Description : various utility functions. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt /** @@ -53,8 +41,8 @@ scope **/ -#ifndef LIB_H__ -#define LIB_H__ +#ifndef INCLUDED_LIB +#define INCLUDED_LIB #include #include // fabsf @@ -575,4 +563,4 @@ extern void moduleInit_assertCanShutdown(ModuleInitState init_state); extern void moduleInit_markInitialized(ModuleInitState* init_state); extern void moduleInit_markShutdown(ModuleInitState* init_state); -#endif // #ifndef LIB_H__ +#endif // #ifndef INCLUDED_LIB diff --git a/source/lib/lib_errors.cpp b/source/lib/lib_errors.cpp index 769117745e..e19dd34293 100644 --- a/source/lib/lib_errors.cpp +++ b/source/lib/lib_errors.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : error handling system: defines error codes, associates * : them with descriptive text, simplifies error notification. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt // note: this is called lib_errors.cpp because we have another // errors.cpp; the MS linker isn't smart enough to deal with diff --git a/source/lib/lib_errors.h b/source/lib/lib_errors.h index f366267e29..cb2a218165 100644 --- a/source/lib/lib_errors.h +++ b/source/lib/lib_errors.h @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : error handling system: defines error codes, associates * : them with descriptive text, simplifies error notification. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt /** @@ -146,8 +134,8 @@ Notes: of the same name but in different paths. **/ -#ifndef ERRORS_H__ -#define ERRORS_H__ +#ifndef INCLUDED_LIB_ERRORS +#define INCLUDED_LIB_ERRORS // note: this loses compiler type safety (being able to prevent // return 1 when a LibError is the return value), but allows splitting @@ -455,4 +443,4 @@ const LibError _29 = -100129; } // namespace ERR -#endif // #ifndef ERRORS_H__ +#endif // #ifndef INCLUDED_LIB_ERRORS diff --git a/source/lib/lockfree.cpp b/source/lib/lockfree.cpp index 1c253e17ff..ab544505a4 100644 --- a/source/lib/lockfree.cpp +++ b/source/lib/lockfree.cpp @@ -3,22 +3,10 @@ * File : lockfree.cpp * Project : 0 A.D. * Description : lock-free synchronized data structures. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "lockfree.h" diff --git a/source/lib/lockfree.h b/source/lib/lockfree.h index fb364e18e7..90e299aae8 100644 --- a/source/lib/lockfree.h +++ b/source/lib/lockfree.h @@ -3,25 +3,13 @@ * File : lockfree.h * Project : 0 A.D. * Description : lock-free synchronized data structures. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef LOCKFREE_H__ -#define LOCKFREE_H__ +#ifndef INCLUDED_LOCKFREE +#define INCLUDED_LOCKFREE #include "posix/posix_types.h" // uintptr_t @@ -163,4 +151,4 @@ extern void* lfh_insert(LFHash* hash, uintptr_t key, size_t additional_bytes, in extern LibError lfh_erase(LFHash* hash, uintptr_t key); -#endif // #ifndef LOCKFREE_H__ +#endif // #ifndef INCLUDED_LOCKFREE diff --git a/source/lib/mmgr.cpp b/source/lib/mmgr.cpp index 526c21aec6..5a50fa7178 100644 --- a/source/lib/mmgr.cpp +++ b/source/lib/mmgr.cpp @@ -3,22 +3,10 @@ * File : mmgr.cpp * Project : 0 A.D. * Description : memory manager and tracker. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" diff --git a/source/lib/mmgr.h b/source/lib/mmgr.h index 2b2f97f0f6..24cd860285 100644 --- a/source/lib/mmgr.h +++ b/source/lib/mmgr.h @@ -3,22 +3,10 @@ * File : mmgr.h * Project : 0 A.D. * Description : memory manager and tracker. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt /* @@ -102,8 +90,8 @@ good luck! */ -#ifndef MMGR_H__ -#define MMGR_H__ +#ifndef INCLUDED_MMGR +#define INCLUDED_MMGR namespace ERR { @@ -214,7 +202,7 @@ extern void operator delete[](void* p, const char* file, int line, const char* f #endif // #if CONFIG_USE_MMGR -#endif // #ifdef MMGR_H__ +#endif // #ifdef INCLUDED_MMGR // diff --git a/source/lib/ogl.cpp b/source/lib/ogl.cpp index dc6b0fd788..f0e2506a13 100644 --- a/source/lib/ogl.cpp +++ b/source/lib/ogl.cpp @@ -3,22 +3,10 @@ * File : ogl.cpp * Project : 0 A.D. * Description : OpenGL helper functions. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "ogl.h" diff --git a/source/lib/ogl.h b/source/lib/ogl.h index 95afd7a9d2..11aba1f754 100644 --- a/source/lib/ogl.h +++ b/source/lib/ogl.h @@ -3,22 +3,10 @@ * File : ogl.h * Project : 0 A.D. * Description : OpenGL helper functions. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_OGL #define INCLUDED_OGL diff --git a/source/lib/path_util.cpp b/source/lib/path_util.cpp index 309f289b7f..46abaf44f1 100644 --- a/source/lib/path_util.cpp +++ b/source/lib/path_util.cpp @@ -3,22 +3,10 @@ * File : path_util.cpp * Project : 0 A.D. * Description : helper functions for path strings. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "path_util.h" diff --git a/source/lib/path_util.h b/source/lib/path_util.h index 497ce508de..9a1d883d96 100644 --- a/source/lib/path_util.h +++ b/source/lib/path_util.h @@ -3,22 +3,10 @@ * File : path_util.h * Project : 0 A.D. * Description : helper functions for path strings. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt // notes: // - this module is split out of lib/res/file so that it can be used from @@ -30,8 +18,8 @@ // native and portable and VFS paths. // when reading, both '/' and SYS_DIR_SEP are accepted; '/' is written. -#ifndef PATH_UTIL_H__ -#define PATH_UTIL_H__ +#ifndef INCLUDED_PATH_UTIL +#define INCLUDED_PATH_UTIL #include "posix/posix_types.h" // PATH_MAX @@ -241,4 +229,4 @@ extern void path_package_copy(PathPackage* pp_dst, const PathPackage* pp_src); **/ extern LibError path_package_append_file(PathPackage* pp, const char* path); -#endif // #ifndef PATH_UTIL_H__ +#endif // #ifndef INCLUDED_PATH_UTIL diff --git a/source/lib/posix/posix.h b/source/lib/posix/posix.h index cd21c4046e..882dea859d 100644 --- a/source/lib/posix/posix.h +++ b/source/lib/posix/posix.h @@ -3,22 +3,10 @@ * File : posix.h * Project : 0 A.D. * Description : definitions for a subset of POSIX. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt /* diff --git a/source/lib/posix/posix_types.h b/source/lib/posix/posix_types.h index 67a3c45c99..db20cde614 100644 --- a/source/lib/posix/posix_types.h +++ b/source/lib/posix/posix_types.h @@ -3,22 +3,10 @@ * File : posix_types.h * Project : 0 A.D. * Description : lightweight header that defines POSIX types. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt // this header defines e.g. ssize_t and int8_t without pulling in all // POSIX declarations. diff --git a/source/lib/precompiled.h b/source/lib/precompiled.h index 050dad82ee..d10de18677 100644 --- a/source/lib/precompiled.h +++ b/source/lib/precompiled.h @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : precompiled header. must be the first non-comment part * : of every source file (VC6/7 requirement). - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt // if the compiler supports PCH (i.e. HAVE_PCH is defined), this // tries to include all headers that may be needed. otherwise, all source diff --git a/source/lib/res/file/archive.cpp b/source/lib/res/file/archive.cpp index b91b65d91d..862ed2cf0c 100644 --- a/source/lib/res/file/archive.cpp +++ b/source/lib/res/file/archive.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : provide access to archive "resources". allows * : opening, reading from, and creating them. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "archive.h" diff --git a/source/lib/res/file/archive.h b/source/lib/res/file/archive.h index b8a1471294..16da5fcdf8 100644 --- a/source/lib/res/file/archive.h +++ b/source/lib/res/file/archive.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : provide access to archive "resources". allows * : opening, reading from, and creating them. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef ARCHIVE_H__ -#define ARCHIVE_H__ +#ifndef INCLUDED_ARCHIVE +#define INCLUDED_ARCHIVE #include "lib/res/handle.h" #include "file.h" // FileCB for afile_enum @@ -223,4 +211,4 @@ struct Archive; extern LibError archive_allocate_entries(Archive* a, size_t num_entries); extern LibError archive_add_file(Archive* a, const ArchiveEntry* ent); -#endif // #ifndef ARCHIVE_H__ +#endif // #ifndef INCLUDED_ARCHIVE diff --git a/source/lib/res/file/archive_builder.cpp b/source/lib/res/file/archive_builder.cpp index 5635bb2929..98264f0163 100644 --- a/source/lib/res/file/archive_builder.cpp +++ b/source/lib/res/file/archive_builder.cpp @@ -3,22 +3,10 @@ * File : archive_builder.cpp * Project : 0 A.D. * Description : - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "archive_builder.h" diff --git a/source/lib/res/file/archive_builder.h b/source/lib/res/file/archive_builder.h index e6333aaf16..8b72163ab4 100644 --- a/source/lib/res/file/archive_builder.h +++ b/source/lib/res/file/archive_builder.h @@ -3,25 +3,13 @@ * File : archive_builder.h * Project : 0 A.D. * Description : - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef ARCHIVE_BUILDER_H__ -#define ARCHIVE_BUILDER_H__ +#ifndef INCLUDED_ARCHIVE_BUILDER +#define INCLUDED_ARCHIVE_BUILDER // array of pointers to VFS filenames (including path), terminated by a // NULL entry. @@ -52,4 +40,4 @@ extern void archive_build_cancel(ArchiveBuildState* ab); extern LibError archive_build(const char* P_archive_filename, Filenames V_fns); -#endif // #ifndef ARCHIVE_BUILDER_H__ +#endif // #ifndef INCLUDED_ARCHIVE_BUILDER diff --git a/source/lib/res/file/compression.cpp b/source/lib/res/file/compression.cpp index 7b2cd6c0d9..4c0026d0b1 100644 --- a/source/lib/res/file/compression.cpp +++ b/source/lib/res/file/compression.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : interface for compressing/decompressing data streams. * : currently implements "deflate" (RFC1951). - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "compression.h" diff --git a/source/lib/res/file/compression.h b/source/lib/res/file/compression.h index 3d373e7ee5..4e27ab0ff0 100644 --- a/source/lib/res/file/compression.h +++ b/source/lib/res/file/compression.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : interface for compressing/decompressing data streams. * : currently implements "deflate" (RFC1951). - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef COMPRESSION_H__ -#define COMPRESSION_H__ +#ifndef INCLUDED_COMPRESSION +#define INCLUDED_COMPRESSION namespace ERR @@ -94,4 +82,4 @@ extern LibError comp_reset(uintptr_t ctx); // free this context and all associated memory. extern void comp_free(uintptr_t ctx); -#endif // #ifndef COMPRESSION_H__ +#endif // #ifndef INCLUDED_COMPRESSION diff --git a/source/lib/res/file/file.cpp b/source/lib/res/file/file.cpp index 1527add8ac..7c0e1f40e6 100644 --- a/source/lib/res/file/file.cpp +++ b/source/lib/res/file/file.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : file layer on top of POSIX. avoids the need for * : absolute paths. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "file.h" diff --git a/source/lib/res/file/file.h b/source/lib/res/file/file.h index fd8ec098e9..51b6ba524e 100644 --- a/source/lib/res/file/file.h +++ b/source/lib/res/file/file.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : file layer on top of POSIX. avoids the need for * : absolute paths and provides fast I/O. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef FILE_H -#define FILE_H +#ifndef INCLUDED_FILE +#define INCLUDED_FILE #include "lib/posix/posix_filesystem.h" // struct stat @@ -366,4 +354,4 @@ extern LibError file_unmap(File* f); extern LibError file_shutdown(); -#endif // #ifndef FILE_H +#endif // #ifndef INCLUDED_FILE diff --git a/source/lib/res/file/file_cache.cpp b/source/lib/res/file/file_cache.cpp index 57630ea054..7d064a982d 100644 --- a/source/lib/res/file/file_cache.cpp +++ b/source/lib/res/file/file_cache.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : cache for entire files and I/O blocks. also allocates * : file buffers, allowing zero-copy I/O. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "file_cache.h" diff --git a/source/lib/res/file/file_cache.h b/source/lib/res/file/file_cache.h index 18f3431bb2..2341db1b88 100644 --- a/source/lib/res/file/file_cache.h +++ b/source/lib/res/file/file_cache.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : cache for entire files and I/O blocks. also allocates * : file buffers, allowing zero-copy I/O. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef FILE_CACHE_H__ -#define FILE_CACHE_H__ +#ifndef INCLUDED_FILE_CACHE +#define INCLUDED_FILE_CACHE #include "file.h" // FileIOBuf @@ -116,4 +104,4 @@ extern void* file_cache_allocator_alloc(size_t size); extern void file_cache_allocator_free(u8* p, size_t size); extern void file_cache_allocator_reset(); -#endif // #ifndef FILE_CACHE_H__ +#endif // #ifndef INCLUDED_FILE_CACHE diff --git a/source/lib/res/file/file_internal.h b/source/lib/res/file/file_internal.h index eaa0fb3b5d..1cd0ae9695 100644 --- a/source/lib/res/file/file_internal.h +++ b/source/lib/res/file/file_internal.h @@ -3,22 +3,10 @@ * File : file_internal.h * Project : 0 A.D. * Description : master (private) header for all file code. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "lib/path_util.h" #include "path.h" diff --git a/source/lib/res/file/file_io.cpp b/source/lib/res/file/file_io.cpp index 2f523c51f2..e13e479009 100644 --- a/source/lib/res/file/file_io.cpp +++ b/source/lib/res/file/file_io.cpp @@ -3,22 +3,10 @@ * File : file_io.cpp * Project : 0 A.D. * Description : provide fast I/O via POSIX aio and splitting into blocks. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "file_io.h" diff --git a/source/lib/res/file/file_io.h b/source/lib/res/file/file_io.h index 152065f98a..effe1cffb4 100644 --- a/source/lib/res/file/file_io.h +++ b/source/lib/res/file/file_io.h @@ -3,25 +3,13 @@ * File : file_io.h * Project : 0 A.D. * Description : provide fast I/O via POSIX aio and splitting into blocks. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef FILE_IO_H__ -#define FILE_IO_H__ +#ifndef INCLUDED_FILE_IO +#define INCLUDED_FILE_IO struct FileProvider_VTbl; struct File; @@ -158,4 +146,4 @@ extern ssize_t file_read_from_cache(const char* atom_fn, off_t ofs, size_t size, extern LibError file_io_get_buf(FileIOBuf* pbuf, size_t size, const char* atom_fn, uint file_flags, FileIOCB cb); -#endif // #ifndef FILE_IO_H__ +#endif // #ifndef INCLUDED_FILE_IO diff --git a/source/lib/res/file/file_stats.cpp b/source/lib/res/file/file_stats.cpp index a95e20b381..4f66855529 100644 --- a/source/lib/res/file/file_stats.cpp +++ b/source/lib/res/file/file_stats.cpp @@ -3,22 +3,10 @@ * File : file_stats.cpp * Project : 0 A.D. * Description : gathers statistics from all file modules. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "file_stats.h" diff --git a/source/lib/res/file/file_stats.h b/source/lib/res/file/file_stats.h index db83d8a061..586aa71b46 100644 --- a/source/lib/res/file/file_stats.h +++ b/source/lib/res/file/file_stats.h @@ -3,25 +3,13 @@ * File : file_stats.h * Project : 0 A.D. * Description : gathers statistics from all file modules. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef FILE_STATS_H__ -#define FILE_STATS_H__ +#ifndef INCLUDED_FILE_STATS +#define INCLUDED_FILE_STATS #define FILE_STATS_ENABLED 1 @@ -91,4 +79,4 @@ extern void file_stats_dump(); #endif -#endif // #ifndef FILE_STATS_H__ +#endif // #ifndef INCLUDED_FILE_STATS diff --git a/source/lib/res/file/path.cpp b/source/lib/res/file/path.cpp index 5aa6998256..58828ae4d3 100644 --- a/source/lib/res/file/path.cpp +++ b/source/lib/res/file/path.cpp @@ -3,22 +3,10 @@ * File : path.cpp * Project : 0 A.D. * Description : helper functions for VFS paths. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "path.h" diff --git a/source/lib/res/file/path.h b/source/lib/res/file/path.h index dc469d315f..4df20153e9 100644 --- a/source/lib/res/file/path.h +++ b/source/lib/res/file/path.h @@ -3,25 +3,13 @@ * File : path.h * Project : 0 A.D. * Description : helper functions for VFS paths. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef VFS_PATH_H__ -#define VFS_PATH_H__ +#ifndef INCLUDED_PATH +#define INCLUDED_PATH #include "lib/lib.h" @@ -74,4 +62,4 @@ extern void path_reset_root_dir(); extern void path_init(); extern void path_shutdown(); -#endif // #ifndef VFS_PATH_H__ +#endif // #ifndef INCLUDED_PATH diff --git a/source/lib/res/file/trace.cpp b/source/lib/res/file/trace.cpp index 616f83a61d..7d1a8e0e36 100644 --- a/source/lib/res/file/trace.cpp +++ b/source/lib/res/file/trace.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : allows recording and 'playing back' a sequence of * : I/Os - useful for benchmarking and archive builder. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "trace.h" @@ -484,3 +472,4 @@ LibError trace_run(const char* trace_filename, uint flags) return INFO::OK; } + diff --git a/source/lib/res/file/trace.h b/source/lib/res/file/trace.h index 2bb6661508..0e39f2ac15 100644 --- a/source/lib/res/file/trace.h +++ b/source/lib/res/file/trace.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : allows recording and 'playing back' a sequence of * : I/Os - useful for benchmarking and archive builder. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef TRACE_H__ -#define TRACE_H__ +#ifndef INCLUDED_TRACE +#define INCLUDED_TRACE namespace ERR { @@ -100,4 +88,4 @@ enum TraceRunFlags extern LibError trace_run(const char* trace_filename, uint flags = 0); -#endif // #ifndef TRACE_H__ +#endif // #ifndef INCLUDED_TRACE diff --git a/source/lib/res/file/vfs.cpp b/source/lib/res/file/vfs.cpp index 28949a1606..c6482d61a7 100644 --- a/source/lib/res/file/vfs.cpp +++ b/source/lib/res/file/vfs.cpp @@ -3,22 +3,10 @@ * File : vfs.cpp * Project : 0 A.D. * Description : Handle-based wrapper on top of the vfs_mount API. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "vfs.h" diff --git a/source/lib/res/file/vfs.h b/source/lib/res/file/vfs.h index a65b4fda36..daf924bca4 100644 --- a/source/lib/res/file/vfs.h +++ b/source/lib/res/file/vfs.h @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : Virtual File System API - allows transparent access to * : files in archives and modding via multiple mount points. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt /* @@ -193,8 +181,8 @@ Decompression is free because it is done in parallel with IOs. */ -#ifndef __VFS_H__ -#define __VFS_H__ +#ifndef INCLUDED_VFS +#define INCLUDED_VFS #include "../handle.h" // Handle def #include "lib/posix/posix_filesystem.h" // struct stat @@ -467,4 +455,4 @@ extern LibError vfs_reload(const char* fn); // this must be called from the main thread? (wdir_watch problem) extern LibError vfs_reload_changed_files(void); -#endif // #ifndef __VFS_H__ +#endif // #ifndef INCLUDED_VFS diff --git a/source/lib/res/file/vfs_mount.cpp b/source/lib/res/file/vfs_mount.cpp index 338bea498e..5028d71cf2 100644 --- a/source/lib/res/file/vfs_mount.cpp +++ b/source/lib/res/file/vfs_mount.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : mounts files and archives into VFS; provides x_* API * : that dispatches to file or archive implementation. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "vfs_mount.h" diff --git a/source/lib/res/file/vfs_mount.h b/source/lib/res/file/vfs_mount.h index 1db5112af0..9f4c713eed 100644 --- a/source/lib/res/file/vfs_mount.h +++ b/source/lib/res/file/vfs_mount.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : mounts files and archives into VFS; provides x_* API * : that dispatches to file or archive implementation. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef VFS_MOUNT_H__ -#define VFS_MOUNT_H__ +#ifndef INCLUDED_VFS_MOUNT +#define INCLUDED_VFS_MOUNT struct Mount; // must come before vfs_tree.h @@ -125,4 +113,4 @@ extern LibError mount_rebuild(); // used when receiving paths from external code. extern LibError mount_make_vfs_path(const char* P_path, char* V_path); -#endif // #ifndef VFS_MOUNT_H__ +#endif // #ifndef INCLUDED_VFS_MOUNT diff --git a/source/lib/res/file/vfs_optimizer.cpp b/source/lib/res/file/vfs_optimizer.cpp index f366e102f4..ab700c5b82 100644 --- a/source/lib/res/file/vfs_optimizer.cpp +++ b/source/lib/res/file/vfs_optimizer.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : automatically bundles files into archives in order of * : access to optimize I/O. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "vfs_optimizer.h" diff --git a/source/lib/res/file/vfs_optimizer.h b/source/lib/res/file/vfs_optimizer.h index 01a4d6d352..619e078743 100644 --- a/source/lib/res/file/vfs_optimizer.h +++ b/source/lib/res/file/vfs_optimizer.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : automatically bundles files into archives in order of * : access to optimize I/O. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef VFS_OPTIMIZER_H__ -#define VFS_OPTIMIZER_H__ +#ifndef INCLUDED_VFS_OPTIMIZER +#define INCLUDED_VFS_OPTIMIZER extern LibError vfs_opt_rebuild_main_archive(const char* trace_filename, const char* archive_fn_fmt); @@ -35,4 +23,4 @@ extern int vfs_opt_auto_build(const char* trace_filename, extern void vfs_opt_notify_loose_file(const char* atom_fn); extern void vfs_opt_notify_non_loose_file(const char* atom_fn); -#endif // #ifndef VFS_OPTIMIZER_H__ +#endif // #ifndef INCLUDED_VFS_OPTIMIZER diff --git a/source/lib/res/file/vfs_redirector.cpp b/source/lib/res/file/vfs_redirector.cpp index 616010d143..d30e733234 100644 --- a/source/lib/res/file/vfs_redirector.cpp +++ b/source/lib/res/file/vfs_redirector.cpp @@ -3,22 +3,10 @@ * File : vfs_redirector.cpp * Project : 0 A.D. * Description : - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "vfs_redirector.h" diff --git a/source/lib/res/file/vfs_redirector.h b/source/lib/res/file/vfs_redirector.h index 68877ba023..79fbc66ae7 100644 --- a/source/lib/res/file/vfs_redirector.h +++ b/source/lib/res/file/vfs_redirector.h @@ -3,25 +3,13 @@ * File : vfs_redirector.h * Project : 0 A.D. * Description : - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef VFS_REDIRECTOR_H__ -#define VFS_REDIRECTOR_H__ +#ifndef INCLUDED_VFS_REDIRECTOR +#define INCLUDED_VFS_REDIRECTOR #include "file.h" struct FileIo; @@ -81,4 +69,4 @@ extern ssize_t xfile_io(File* f, off_t ofs, size_t size, FileIOBuf* pbuf, FileI extern LibError xfile_map(File* f, void*& p, size_t& size); extern LibError xfile_unmap(File* f); -#endif // #ifndef VFS_REDIRECTOR_H__ +#endif // #ifndef INCLUDED_VFS_REDIRECTOR diff --git a/source/lib/res/file/vfs_tree.cpp b/source/lib/res/file/vfs_tree.cpp index 6a63734986..cc75eb8db3 100644 --- a/source/lib/res/file/vfs_tree.cpp +++ b/source/lib/res/file/vfs_tree.cpp @@ -3,22 +3,10 @@ * File : vfs_tree.cpp * Project : 0 A.D. * Description : the actual 'filesystem' and its tree of directories. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "vfs_tree.h" diff --git a/source/lib/res/file/vfs_tree.h b/source/lib/res/file/vfs_tree.h index 2a1a51cd72..d54be07846 100644 --- a/source/lib/res/file/vfs_tree.h +++ b/source/lib/res/file/vfs_tree.h @@ -3,25 +3,13 @@ * File : vfs_tree.h * Project : 0 A.D. * Description : the actual 'filesystem' and its tree of directories. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef VFS_TREE_H__ -#define VFS_TREE_H__ +#ifndef INCLUDED_VFS_TREE +#define INCLUDED_VFS_TREE class TFile; // must come before vfs_mount.h class TDir; @@ -133,4 +121,4 @@ extern RealDir* tree_get_real_dir(TDir* td); extern void tree_lock(); extern void tree_unlock(); -#endif // #ifndef VFS_TREE_H__ +#endif // #ifndef INCLUDED_VFS_TREE diff --git a/source/lib/res/file/zip.cpp b/source/lib/res/file/zip.cpp index fde03f0de6..0238fb6ccb 100644 --- a/source/lib/res/file/zip.cpp +++ b/source/lib/res/file/zip.cpp @@ -3,22 +3,10 @@ * File : zip.cpp * Project : 0 A.D. * Description : archive backend for Zip files. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "zip.h" diff --git a/source/lib/res/file/zip.h b/source/lib/res/file/zip.h index 21c9f079c1..44d3e72d0c 100644 --- a/source/lib/res/file/zip.h +++ b/source/lib/res/file/zip.h @@ -3,25 +3,13 @@ * File : zip.h * Project : 0 A.D. * Description : archive backend for Zip files. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef ZIP_H__ -#define ZIP_H__ +#ifndef INCLUDED_ZIP +#define INCLUDED_ZIP struct File; struct Archive; @@ -76,4 +64,4 @@ extern LibError zip_archive_finish(ZipArchive* za); extern time_t time_t_from_FAT(u32 fat_timedate); extern u32 FAT_from_time_t(time_t time); -#endif // #ifndef ZIP_H__ +#endif // #ifndef INCLUDED_ZIP diff --git a/source/lib/res/graphics/cursor.cpp b/source/lib/res/graphics/cursor.cpp index 0c52b9fab5..08d304704d 100644 --- a/source/lib/res/graphics/cursor.cpp +++ b/source/lib/res/graphics/cursor.cpp @@ -3,22 +3,10 @@ * File : cursor.cpp * Project : 0 A.D. * Description : mouse cursors (either via OpenGL texture or hardware) - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "cursor.h" diff --git a/source/lib/res/graphics/cursor.h b/source/lib/res/graphics/cursor.h index c9b80b31e9..e387253ed4 100644 --- a/source/lib/res/graphics/cursor.h +++ b/source/lib/res/graphics/cursor.h @@ -3,25 +3,13 @@ * File : cursor.h * Project : 0 A.D. * Description : mouse cursors (either via OpenGL texture or hardware) - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef CURSOR_H__ -#define CURSOR_H__ +#ifndef INCLUDED_GRAPHICS_CURSOR +#define INCLUDED_GRAPHICS_CURSOR // draw the specified cursor at the given pixel coordinates // (origin is top-left to match the windowing system). @@ -32,4 +20,4 @@ extern LibError cursor_draw(const char* name, int x, int y); // internal use only: extern int g_yres; -#endif // #ifndef CURSOR_H__ +#endif // #ifndef INCLUDED_GRAPHICS_CURSOR diff --git a/source/lib/res/graphics/ogl_shader.cpp b/source/lib/res/graphics/ogl_shader.cpp index 0052d8b9f3..53d48874f4 100644 --- a/source/lib/res/graphics/ogl_shader.cpp +++ b/source/lib/res/graphics/ogl_shader.cpp @@ -3,8 +3,6 @@ * File : ogl_shader.cpp * Project : 0 A.D. * Description : load and link together shaders; provides hotload support. - * - * @author Nicolai Haehnle * ========================================================================= */ diff --git a/source/lib/res/graphics/ogl_shader.h b/source/lib/res/graphics/ogl_shader.h index f15799c8b6..fd881aea06 100644 --- a/source/lib/res/graphics/ogl_shader.h +++ b/source/lib/res/graphics/ogl_shader.h @@ -3,13 +3,11 @@ * File : ogl_shader.h * Project : 0 A.D. * Description : load and link together shaders; provides hotload support. - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef OGL_SHADER_H__ -#define OGL_SHADER_H__ +#ifndef INCLUDED_OGL_SHADER +#define INCLUDED_OGL_SHADER #include "lib/res/handle.h" @@ -68,4 +66,4 @@ GLint ogl_program_get_uniform_location(Handle h, const char* name); // Query vertex attribute information GLint ogl_program_get_attrib_location(Handle h, const char* name); -#endif // OGL_SHADER_H__ +#endif // INCLUDED_OGL_SHADER diff --git a/source/lib/res/graphics/ogl_tex.cpp b/source/lib/res/graphics/ogl_tex.cpp index a6e0f9faae..2ccf1326c2 100644 --- a/source/lib/res/graphics/ogl_tex.cpp +++ b/source/lib/res/graphics/ogl_tex.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : wrapper for all OpenGL texturing calls. * : provides caching, hotloading and lifetime management. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "ogl_tex.h" diff --git a/source/lib/res/graphics/ogl_tex.h b/source/lib/res/graphics/ogl_tex.h index 30fc236e12..808c9d7d7a 100644 --- a/source/lib/res/graphics/ogl_tex.h +++ b/source/lib/res/graphics/ogl_tex.h @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : wrapper for all OpenGL texturing calls. * : provides caching, hotloading and lifetime management. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt /* @@ -140,8 +128,8 @@ the next function to fail, but real apps should check and report errors. */ -#ifndef OGL_TEX_H__ -#define OGL_TEX_H__ +#ifndef INCLUDED_OGL_TEX +#define INCLUDED_OGL_TEX #include "lib/res/handle.h" #include "lib/ogl.h" @@ -423,4 +411,4 @@ extern LibError ogl_tex_transform(Handle ht, uint flags); */ extern LibError ogl_tex_transform_to(Handle ht, uint new_flags); -#endif // #ifndef OGL_TEX_H__ +#endif // #ifndef INCLUDED_OGL_TEX diff --git a/source/lib/res/graphics/tex.cpp b/source/lib/res/graphics/tex.cpp index e1b72d34ee..365f1c959e 100644 --- a/source/lib/res/graphics/tex.cpp +++ b/source/lib/res/graphics/tex.cpp @@ -3,22 +3,10 @@ * File : tex.cpp * Project : 0 A.D. * Description : support routines for 2d texture access/writing. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "tex.h" diff --git a/source/lib/res/graphics/tex.h b/source/lib/res/graphics/tex.h index c5422ccc31..0ea46452f1 100644 --- a/source/lib/res/graphics/tex.h +++ b/source/lib/res/graphics/tex.h @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : read/write 2d texture files; allows conversion between * : pixel formats and automatic orientation correction. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt /** @@ -97,8 +85,8 @@ library and IO layer. Read and write are zero-copy. **/ -#ifndef TEX_H__ -#define TEX_H__ +#ifndef INCLUDED_TEX +#define INCLUDED_TEX #include "lib/res/handle.h" @@ -438,4 +426,4 @@ extern size_t tex_hdr_size(const char* fn); **/ extern LibError tex_write(Tex* t, const char* fn); -#endif // TEX_H__ +#endif // INCLUDED_TEX diff --git a/source/lib/res/graphics/tex_bmp.cpp b/source/lib/res/graphics/tex_bmp.cpp index e78d3d5c3e..c1c4591c06 100644 --- a/source/lib/res/graphics/tex_bmp.cpp +++ b/source/lib/res/graphics/tex_bmp.cpp @@ -3,22 +3,10 @@ * File : tex_bmp.cpp * Project : 0 A.D. * Description : Windows BMP codec - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" diff --git a/source/lib/res/graphics/tex_codec.cpp b/source/lib/res/graphics/tex_codec.cpp index 474c0e652a..66c07e8eba 100644 --- a/source/lib/res/graphics/tex_codec.cpp +++ b/source/lib/res/graphics/tex_codec.cpp @@ -3,22 +3,10 @@ * File : tex_codec.cpp * Project : 0 A.D. * Description : support routines for texture codecs - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "tex_codec.h" diff --git a/source/lib/res/graphics/tex_codec.h b/source/lib/res/graphics/tex_codec.h index bb8e41a037..c73cacbb97 100644 --- a/source/lib/res/graphics/tex_codec.h +++ b/source/lib/res/graphics/tex_codec.h @@ -3,25 +3,13 @@ * File : tex_codec.cpp * Project : 0 A.D. * Description : support routines and interface for texture codecs. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef TEX_CODEC_H__ -#define TEX_CODEC_H__ +#ifndef INCLUDED_TEX_CODEC +#define INCLUDED_TEX_CODEC #include "tex.h" #include "tex_internal.h" // for codec's convenience @@ -244,4 +232,4 @@ extern LibError tex_codec_alloc_rows(const u8* data, size_t h, size_t pitch, **/ extern LibError tex_codec_write(Tex* t, uint transforms, const void* hdr, size_t hdr_size, DynArray* da); -#endif // #ifndef TEX_CODEC_H__ +#endif // #ifndef INCLUDED_TEX_CODEC diff --git a/source/lib/res/graphics/tex_dds.cpp b/source/lib/res/graphics/tex_dds.cpp index 920c693804..c6b9265b88 100644 --- a/source/lib/res/graphics/tex_dds.cpp +++ b/source/lib/res/graphics/tex_dds.cpp @@ -3,22 +3,10 @@ * File : tex_dds.cpp * Project : 0 A.D. * Description : DDS (DirectDraw Surface) codec. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" diff --git a/source/lib/res/graphics/tex_internal.h b/source/lib/res/graphics/tex_internal.h index bb0c9752cd..dd76c40c57 100644 --- a/source/lib/res/graphics/tex_internal.h +++ b/source/lib/res/graphics/tex_internal.h @@ -3,25 +3,13 @@ * File : tex_internal.h * Project : 0 A.D. * Description : private texture loader helper functions - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2006 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef TEX_INTERNAL_H__ -#define TEX_INTERNAL_H__ +#ifndef INCLUDED_TEX_INTERNAL +#define INCLUDED_TEX_INTERNAL #include "lib/res/res.h" // error codes and mem.h #include "lib/allocators.h" // DynArray @@ -82,4 +70,4 @@ extern LibError tex_decode(const u8* data, size_t data_size, MEM_DTOR dtor, Tex* **/ extern LibError tex_encode(Tex* t, const char* fn, DynArray* da); -#endif // #ifndef TEX_INTERNAL_H__ +#endif // #ifndef INCLUDED_TEX_INTERNAL diff --git a/source/lib/res/graphics/tex_jpg.cpp b/source/lib/res/graphics/tex_jpg.cpp index 58d9a6744f..9178cebefa 100644 --- a/source/lib/res/graphics/tex_jpg.cpp +++ b/source/lib/res/graphics/tex_jpg.cpp @@ -3,22 +3,10 @@ * File : tex_jpg.cpp * Project : 0 A.D. * Description : JPEG codec using IJG jpeglib. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" diff --git a/source/lib/res/graphics/tex_png.cpp b/source/lib/res/graphics/tex_png.cpp index 771c8df205..68981b7ff6 100644 --- a/source/lib/res/graphics/tex_png.cpp +++ b/source/lib/res/graphics/tex_png.cpp @@ -3,22 +3,10 @@ * File : tex_png.cpp * Project : 0 A.D. * Description : PNG codec using libpng. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" diff --git a/source/lib/res/graphics/tex_tga.cpp b/source/lib/res/graphics/tex_tga.cpp index 4c75204a58..f6cc7a72e9 100644 --- a/source/lib/res/graphics/tex_tga.cpp +++ b/source/lib/res/graphics/tex_tga.cpp @@ -3,22 +3,10 @@ * File : tex_tga.cpp * Project : 0 A.D. * Description : TGA codec. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" diff --git a/source/lib/res/graphics/unifont.cpp b/source/lib/res/graphics/unifont.cpp index da8f249b96..21a50dc7cb 100644 --- a/source/lib/res/graphics/unifont.cpp +++ b/source/lib/res/graphics/unifont.cpp @@ -3,8 +3,6 @@ * File : unifont.cpp * Project : 0 A.D. * Description : Unicode OpenGL texture font. - * - * @author Philip Taylor (philip@zaynar.demon.co.uk) * ========================================================================= */ diff --git a/source/lib/res/graphics/unifont.h b/source/lib/res/graphics/unifont.h index 94ab93e8e1..d108c60474 100644 --- a/source/lib/res/graphics/unifont.h +++ b/source/lib/res/graphics/unifont.h @@ -3,13 +3,11 @@ * File : unifont.h * Project : 0 A.D. * Description : Unicode OpenGL texture font. - * - * @author Philip Taylor (philip@zaynar.demon.co.uk) * ========================================================================= */ -#ifndef __UNIFONT_H__ -#define __UNIFONT_H__ +#ifndef INCLUDED_UNIFONT +#define INCLUDED_UNIFONT #include // va_list @@ -56,4 +54,4 @@ int unifont_character_width(const Handle h, wchar_t c); // Return spacing in pixels from one line of text to the next int unifont_linespacing(const Handle h); -#endif // __UNIFONT_H__ +#endif // INCLUDED_UNIFONT diff --git a/source/lib/res/h_mgr.cpp b/source/lib/res/h_mgr.cpp index 453c6a1f7f..eb0c0043be 100644 --- a/source/lib/res/h_mgr.cpp +++ b/source/lib/res/h_mgr.cpp @@ -3,22 +3,10 @@ * File : h_mgr.cpp * Project : 0 A.D. * Description : handle manager for resources. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "h_mgr.h" diff --git a/source/lib/res/h_mgr.h b/source/lib/res/h_mgr.h index 4c2d1f17fb..6b8d09bbb8 100644 --- a/source/lib/res/h_mgr.h +++ b/source/lib/res/h_mgr.h @@ -3,22 +3,10 @@ * File : h_mgr.h * Project : 0 A.D. * Description : handle manager for resources. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt /* @@ -234,8 +222,8 @@ we could switch H_DEREF to throwing an exception on error. */ -#ifndef H_MGR_H__ -#define H_MGR_H__ +#ifndef INCLUDED_H_MGR +#define INCLUDED_H_MGR // do not include from public header files! // handle.h declares type Handle, and avoids making @@ -463,4 +451,4 @@ extern int h_get_refcnt(Handle h); extern void h_mgr_shutdown(void); -#endif // #ifndef H_MGR_H__ +#endif // #ifndef INCLUDED_H_MGR diff --git a/source/lib/res/mem.cpp b/source/lib/res/mem.cpp index 7a80eaa026..b36c51b451 100644 --- a/source/lib/res/mem.cpp +++ b/source/lib/res/mem.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : wrapper that treats memory as a "resource", i.e. * : guarantees its lifetime and automatic release. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "mem.h" diff --git a/source/lib/res/mem.h b/source/lib/res/mem.h index b6991fd738..d81d11f1a6 100644 --- a/source/lib/res/mem.h +++ b/source/lib/res/mem.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : wrapper that treats memory as a "resource", i.e. * : guarantees its lifetime and automatic release. -* -* @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* -* Copyright (c) 2003 Jan Wassenberg -* -* Redistribution and/or modification are also permitted under the -* terms of the GNU General Public License as published by the -* Free Software Foundation (version 2 or later, at your option). -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ +// license: GPL; see lib/license.txt -#ifndef MEM_H__ -#define MEM_H__ +#ifndef INCLUDED_MEM +#define INCLUDED_MEM #include "handle.h" @@ -59,4 +47,4 @@ extern void mem_shutdown(void); -#endif // #ifndef MEM_H__ +#endif // #ifndef INCLUDED_MEM diff --git a/source/lib/res/res.cpp b/source/lib/res/res.cpp index 2cac8909b6..b64732fb34 100644 --- a/source/lib/res/res.cpp +++ b/source/lib/res/res.cpp @@ -3,22 +3,10 @@ * File : res.cpp * Project : 0 A.D. * Description : - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "res.h" diff --git a/source/lib/res/sound/snd_mgr.cpp b/source/lib/res/sound/snd_mgr.cpp index 4ae9ec5a8a..e8f6f16814 100644 --- a/source/lib/res/sound/snd_mgr.cpp +++ b/source/lib/res/sound/snd_mgr.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : OpenAL sound engine. handles sound I/O, buffer * : suballocation and voice management/prioritization. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= - */ + */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "snd_mgr.h" diff --git a/source/lib/res/sound/snd_mgr.h b/source/lib/res/sound/snd_mgr.h index ca01b1c8d4..31b8154250 100644 --- a/source/lib/res/sound/snd_mgr.h +++ b/source/lib/res/sound/snd_mgr.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : OpenAL sound engine. handles sound I/O, buffer * : suballocation and voice management/prioritization. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef SND_MGR_H__ -#define SND_MGR_H__ +#ifndef INCLUDED_SND_MGR +#define INCLUDED_SND_MGR #include "lib/res/handle.h" @@ -372,4 +360,4 @@ extern bool is_playing(Handle hvs); **/ extern void snd_shutdown(); -#endif // #ifndef SND_MGR_H__ +#endif // #ifndef INCLUDED_SND_MGR diff --git a/source/lib/self_test.cpp b/source/lib/self_test.cpp index cebc849567..005908b566 100644 --- a/source/lib/self_test.cpp +++ b/source/lib/self_test.cpp @@ -3,22 +3,10 @@ * File : self_test.cpp * Project : 0 A.D. * Description : helpers for built-in self tests - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" diff --git a/source/lib/self_test.h b/source/lib/self_test.h index d72b7154ed..7da8da0aab 100644 --- a/source/lib/self_test.h +++ b/source/lib/self_test.h @@ -3,22 +3,10 @@ * File : self_test.h * Project : 0 A.D. * Description : helpers for built-in self tests - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt /* @@ -103,8 +91,8 @@ For further details, see below. */ -#ifndef SELF_TEST_H__ -#define SELF_TEST_H__ +#ifndef INCLUDED_SELF_TEST +#define INCLUDED_SELF_TEST /* @@ -227,4 +215,4 @@ std::vector ts_make_vector(T* start, size_t size_bytes) } #define TS_ASSERT_VECTOR_EQUALS_ARRAY(vec1, array) TS_ASSERT_EQUALS(vec1, ts_make_vector((array), sizeof(array))) -#endif // #ifndef SELF_TEST_H__ +#endif // #ifndef INCLUDED_SELF_TEST diff --git a/source/lib/string_s.cpp b/source/lib/string_s.cpp index 88a12b7928..a1b1e4533f 100644 --- a/source/lib/string_s.cpp +++ b/source/lib/string_s.cpp @@ -3,22 +3,10 @@ * File : string_s.cpp * Project : 0 A.D. * Description : implementation of proposed CRT safe string functions - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "string_s.h" diff --git a/source/lib/string_s.h b/source/lib/string_s.h index 9d2f07df40..1da496c74d 100644 --- a/source/lib/string_s.h +++ b/source/lib/string_s.h @@ -3,25 +3,13 @@ * File : string_s.h * Project : 0 A.D. * Description : implementation of proposed CRT safe string functions - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef STRING_S_H__ -#define STRING_S_H__ +#ifndef INCLUDED_STRING_S +#define INCLUDED_STRING_S #include "posix/posix_types.h" // size_t #include "config.h" @@ -84,4 +72,4 @@ extern int wcscat_s(wchar_t* dst, size_t max_dst_chars, const wchar_t* src); #endif // #if !HAVE_SECURE_CRT -#endif // #ifndef STRING_S_H__ +#endif // #ifndef INCLUDED_STRING_S diff --git a/source/lib/sysdep/cpu.cpp b/source/lib/sysdep/cpu.cpp index 275c94ac95..9a489b9854 100644 --- a/source/lib/sysdep/cpu.cpp +++ b/source/lib/sysdep/cpu.cpp @@ -3,22 +3,10 @@ * File : cpu.cpp * Project : 0 A.D. * Description : CPU and memory detection. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "cpu.h" diff --git a/source/lib/sysdep/cpu.h b/source/lib/sysdep/cpu.h index e45df08f50..fa9167e41c 100644 --- a/source/lib/sysdep/cpu.h +++ b/source/lib/sysdep/cpu.h @@ -3,22 +3,10 @@ * File : cpu.h * Project : 0 A.D. * Description : CPU and memory detection. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_CPU #define INCLUDED_CPU diff --git a/source/lib/sysdep/dir_watch.h b/source/lib/sysdep/dir_watch.h index 27fadbf08b..60e4ecdd7e 100644 --- a/source/lib/sysdep/dir_watch.h +++ b/source/lib/sysdep/dir_watch.h @@ -3,25 +3,13 @@ * File : dir_watch.h * Project : 0 A.D. * Description : portable directory change notification API. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef DIR_WATCH_H__ -#define DIR_WATCH_H__ +#ifndef INCLUDED_DIR_WATCH +#define INCLUDED_DIR_WATCH // path: portable and relative, must add current directory and convert to native // better to use a cached string from rel_chdir - secure @@ -31,4 +19,4 @@ extern LibError dir_cancel_watch(intptr_t watch); extern LibError dir_get_changed_file(char* fn); -#endif // #ifndef DIR_WATCH_H__ +#endif // #ifndef INCLUDED_DIR_WATCH diff --git a/source/lib/sysdep/gfx.cpp b/source/lib/sysdep/gfx.cpp index 4f0f95d116..e87a9b7f4a 100644 --- a/source/lib/sysdep/gfx.cpp +++ b/source/lib/sysdep/gfx.cpp @@ -3,22 +3,10 @@ * File : gfx.cpp * Project : 0 A.D. * Description : graphics card detection. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "gfx.h" diff --git a/source/lib/sysdep/gfx.h b/source/lib/sysdep/gfx.h index 45f9942668..35b2156801 100644 --- a/source/lib/sysdep/gfx.h +++ b/source/lib/sysdep/gfx.h @@ -3,25 +3,13 @@ * File : gfx.h * Project : 0 A.D. * Description : graphics card detection. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef GFX_H__ -#define GFX_H__ +#ifndef INCLUDED_GFX +#define INCLUDED_GFX const size_t GFX_CARD_LEN = 128; /** @@ -79,4 +67,4 @@ extern LibError gfx_get_video_mode(int* xres, int* yres, int* bpp, int* freq); **/ extern LibError gfx_get_monitor_size(int& width_mm, int& height_mm); -#endif // #ifndef GFX_H__ +#endif // #ifndef INCLUDED_GFX diff --git a/source/lib/sysdep/ia32/ia32.cpp b/source/lib/sysdep/ia32/ia32.cpp index 02718dd446..3be9d9f65d 100644 --- a/source/lib/sysdep/ia32/ia32.cpp +++ b/source/lib/sysdep/ia32/ia32.cpp @@ -3,22 +3,10 @@ * File : ia32.cpp * Project : 0 A.D. * Description : C++ and inline asm implementations for IA-32. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "ia32.h" diff --git a/source/lib/sysdep/ia32/ia32.h b/source/lib/sysdep/ia32/ia32.h index cb78be1a62..b665d26725 100644 --- a/source/lib/sysdep/ia32/ia32.h +++ b/source/lib/sysdep/ia32/ia32.h @@ -3,22 +3,10 @@ * File : ia32.h * Project : 0 A.D. * Description : C++ and inline asm implementations for IA-32. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2007 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_IA32 #define INCLUDED_IA32 diff --git a/source/lib/sysdep/ia32/ia32_asm.asm b/source/lib/sysdep/ia32/ia32_asm.asm index 651c32a043..c8a4d5d37a 100644 --- a/source/lib/sysdep/ia32/ia32_asm.asm +++ b/source/lib/sysdep/ia32/ia32_asm.asm @@ -3,19 +3,9 @@ ; Project : 0 A.D. ; Description : optimized assembly code for IA-32. not provided as ; : inline assembly because that's compiler-specific. -; -; @author Jan.Wassenberg@stud.uni-karlsruhe.de ; ========================================================================= -; Copyright (c) 2004-2005 Jan Wassenberg -; -; Redistribution and/or modification are also permitted under the -; terms of the GNU General Public License as published by th;e -; Free Software Foundation (version 2 or later, at your option). -; -; This program is distributed in the hope that it will be useful, but -; WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +; license: GPL; see lib/license.txt %include "ia32.inc" diff --git a/source/lib/sysdep/ia32/ia32_memcpy.asm b/source/lib/sysdep/ia32/ia32_memcpy.asm index 95a7b88fdf..c8271d07d6 100644 --- a/source/lib/sysdep/ia32/ia32_memcpy.asm +++ b/source/lib/sysdep/ia32/ia32_memcpy.asm @@ -2,19 +2,9 @@ ; File : ia32_memcpy.asm ; Project : 0 A.D. ; Description : highly optimized memory copy. -; -; @author Jan.Wassenberg@stud.uni-karlsruhe.de ; ========================================================================= -; Copyright (c) 2004-2005 Jan Wassenberg -; -; Redistribution and/or modification are also permitted under the -; terms of the GNU General Public License as published by th;e -; Free Software Foundation (version 2 or later, at your option). -; -; This program is distributed in the hope that it will be useful, but -; WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +; license: GPL; see lib/license.txt %include "ia32.inc" diff --git a/source/lib/sysdep/snd.cpp b/source/lib/sysdep/snd.cpp index 820f8b756b..f274ce9f68 100644 --- a/source/lib/sysdep/snd.cpp +++ b/source/lib/sysdep/snd.cpp @@ -3,22 +3,10 @@ * File : snd.cpp * Project : 0 A.D. * Description : sound card detection. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "snd.h" diff --git a/source/lib/sysdep/snd.h b/source/lib/sysdep/snd.h index b6acc146be..41cce2e1fa 100644 --- a/source/lib/sysdep/snd.h +++ b/source/lib/sysdep/snd.h @@ -3,25 +3,13 @@ * File : snd.h * Project : 0 A.D. * Description : sound card detection. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef SND_H__ -#define SND_H__ +#ifndef INCLUDED_SND +#define INCLUDED_SND const size_t SND_CARD_LEN = 128; /** @@ -40,4 +28,4 @@ extern char snd_drv_ver[SND_DRV_VER_LEN]; **/ extern void snd_detect(void); -#endif // #ifndef SND_H__ +#endif // #ifndef INCLUDED_SND diff --git a/source/lib/sysdep/sysdep.cpp b/source/lib/sysdep/sysdep.cpp index 36e004b760..334769e170 100644 --- a/source/lib/sysdep/sysdep.cpp +++ b/source/lib/sysdep/sysdep.cpp @@ -3,23 +3,12 @@ * File : sysdep.cpp * Project : 0 A.D. * Description : various system-specific function implementations - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "sysdep.h" + diff --git a/source/lib/sysdep/sysdep.h b/source/lib/sysdep/sysdep.h index cd3b7acb88..c0a259190e 100644 --- a/source/lib/sysdep/sysdep.h +++ b/source/lib/sysdep/sysdep.h @@ -3,22 +3,10 @@ * File : sysdep.h * Project : 0 A.D. * Description : various system-specific function implementations - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2007 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_SYSDEP #define INCLUDED_SYSDEP diff --git a/source/lib/sysdep/unix/udbg.h b/source/lib/sysdep/unix/udbg.h index 429df5fe39..55fe3efa94 100644 --- a/source/lib/sysdep/unix/udbg.h +++ b/source/lib/sysdep/unix/udbg.h @@ -1,7 +1,7 @@ // sysdep/unix/udbg.h: included from sysdep/debug.h and sysdep/unix/debug.cpp -#ifndef UDBG_H__ -#define UDBG_H__ +#ifndef INCLUDED_UDBG +#define INCLUDED_UDBG #define debug_break unix_debug_break @@ -9,4 +9,4 @@ extern void unix_debug_break(void); extern void udbg_launch_debugger(); -#endif // #ifndef UDBG_H__ +#endif // #ifndef INCLUDED_UDBG diff --git a/source/lib/sysdep/unix/x.cpp b/source/lib/sysdep/unix/x.cpp index 3f36fad6a9..221e142365 100644 --- a/source/lib/sysdep/unix/x.cpp +++ b/source/lib/sysdep/unix/x.cpp @@ -1,19 +1,6 @@ // X Window System-specific code -// Copyright (c) 2004 Jan Wassenberg -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// Contact info: -// Jan.Wassenberg@stud.uni-karlsruhe.de -// http://www.stud.uni-karlsruhe.de/~urkt/ + +// license: GPL; see lib/license.txt #include "precompiled.h" diff --git a/source/lib/sysdep/win/delay_load.cpp b/source/lib/sysdep/win/delay_load.cpp index 422becc8f5..14ea546b16 100644 --- a/source/lib/sysdep/win/delay_load.cpp +++ b/source/lib/sysdep/win/delay_load.cpp @@ -3,22 +3,10 @@ * File : delay_load.cpp * Project : 0 A.D. * Description : allow delay-loading DLLs. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt // modified from VC7 DelayHlp.cpp and DelayImp.h @@ -637,3 +625,4 @@ EXTERN_C PfnDliHook __pfnDliFailureHook2 = 0; + diff --git a/source/lib/sysdep/win/delay_load.h b/source/lib/sysdep/win/delay_load.h index e4d7e8c6d5..adcf7fc5e0 100644 --- a/source/lib/sysdep/win/delay_load.h +++ b/source/lib/sysdep/win/delay_load.h @@ -3,22 +3,10 @@ * File : delay_load.h * Project : 0 A.D. * Description : allow delay-loading DLLs. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt struct DllLoadNotify; diff --git a/source/lib/sysdep/win/dll_ver.cpp b/source/lib/sysdep/win/dll_ver.cpp index e066a60f62..be46989358 100644 --- a/source/lib/sysdep/win/dll_ver.cpp +++ b/source/lib/sysdep/win/dll_ver.cpp @@ -3,22 +3,10 @@ * File : dll_ver.cpp * Project : 0 A.D. * Description : return DLL version information. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "dll_ver.h" diff --git a/source/lib/sysdep/win/dll_ver.h b/source/lib/sysdep/win/dll_ver.h index f95e4b4fe1..bed4c9b47a 100644 --- a/source/lib/sysdep/win/dll_ver.h +++ b/source/lib/sysdep/win/dll_ver.h @@ -3,25 +3,13 @@ * File : dll_ver.h * Project : 0 A.D. * Description : return DLL version information. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef DLL_VER_H__ -#define DLL_VER_H__ +#ifndef INCLUDED_DLL_VER +#define INCLUDED_DLL_VER // note: this module is not re-entrant or thread-safe! @@ -35,4 +23,4 @@ extern void dll_list_init(char* buf, size_t chars); // we add the .dll extension if necessary. extern LibError dll_list_add(const char* name); -#endif // #ifndef DLL_VER_H__ +#endif // #ifndef INCLUDED_DLL_VER diff --git a/source/lib/sysdep/win/wcpu.cpp b/source/lib/sysdep/win/wcpu.cpp index 0bebd928fa..24657d51fd 100644 --- a/source/lib/sysdep/win/wcpu.cpp +++ b/source/lib/sysdep/win/wcpu.cpp @@ -3,22 +3,10 @@ * File : wcpu.cpp * Project : 0 A.D. * Description : Windows-specific CPU related code - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "wcpu.h" diff --git a/source/lib/sysdep/win/wdbg.cpp b/source/lib/sysdep/win/wdbg.cpp index eb83a72504..4d36d23fe6 100644 --- a/source/lib/sysdep/win/wdbg.cpp +++ b/source/lib/sysdep/win/wdbg.cpp @@ -3,22 +3,10 @@ * File : wdbg.cpp * Project : 0 A.D. * Description : Win32 debug support code and exception handler. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "wdbg.h" @@ -812,3 +800,4 @@ bool debug_is_stack_ptr(void* p) } + diff --git a/source/lib/sysdep/win/wdbg.h b/source/lib/sysdep/win/wdbg.h index 703b0a3726..146ef47829 100644 --- a/source/lib/sysdep/win/wdbg.h +++ b/source/lib/sysdep/win/wdbg.h @@ -3,22 +3,10 @@ * File : wdbg.h * Project : 0 A.D. * Description : Win32 debug support code and exception handler. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WDBG #define INCLUDED_WDBG diff --git a/source/lib/sysdep/win/wdbg_sym.cpp b/source/lib/sysdep/win/wdbg_sym.cpp index 8bf8711e10..1dc8690cf1 100644 --- a/source/lib/sysdep/win/wdbg_sym.cpp +++ b/source/lib/sysdep/win/wdbg_sym.cpp @@ -3,22 +3,10 @@ * File : wdbg_sym.cpp * Project : 0 A.D. * Description : Win32 stack trace and symbol engine. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "wdbg.h" diff --git a/source/lib/sysdep/win/wdir_watch.cpp b/source/lib/sysdep/win/wdir_watch.cpp index d4bf648b08..da24475382 100644 --- a/source/lib/sysdep/win/wdir_watch.cpp +++ b/source/lib/sysdep/win/wdir_watch.cpp @@ -3,22 +3,10 @@ * File : wdir_watch.cpp * Project : 0 A.D. * Description : Win32 directory change notification - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "lib/sysdep/dir_watch.h" diff --git a/source/lib/sysdep/win/wgfx.cpp b/source/lib/sysdep/win/wgfx.cpp index ace345c6ae..24b21f2e8b 100644 --- a/source/lib/sysdep/win/wgfx.cpp +++ b/source/lib/sysdep/win/wgfx.cpp @@ -3,22 +3,10 @@ * File : wgfx.cpp * Project : 0 A.D. * Description : graphics card detection on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "lib/sysdep/gfx.h" diff --git a/source/lib/sysdep/win/wgl.h b/source/lib/sysdep/win/wgl.h index 301e24fd2f..d2b2bcb13d 100644 --- a/source/lib/sysdep/win/wgl.h +++ b/source/lib/sysdep/win/wgl.h @@ -3,22 +3,10 @@ * File : wgl.cpp * Project : 0 A.D. * Description : Windows definitions required for GL/gl.h - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002-2003 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt // RAGE! Win32 OpenGL headers are full of crap we have to emulate // (must not include windows.h) diff --git a/source/lib/sysdep/win/win_internal.h b/source/lib/sysdep/win/win_internal.h index c1c5a47834..8e0a3336bd 100644 --- a/source/lib/sysdep/win/win_internal.h +++ b/source/lib/sysdep/win/win_internal.h @@ -3,22 +3,10 @@ * File : win_internal.h * Project : 0 A.D. * Description : include , with compatibility fixes afterwards - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2002-2007 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WIN #define INCLUDED_WIN diff --git a/source/lib/sysdep/win/winit.cpp b/source/lib/sysdep/win/winit.cpp index 9a57a6da4a..83f831fab1 100644 --- a/source/lib/sysdep/win/winit.cpp +++ b/source/lib/sysdep/win/winit.cpp @@ -3,22 +3,10 @@ * File : winit.cpp * Project : 0 A.D. * Description : windows-specific module init and shutdown mechanism - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2007 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "winit.h" diff --git a/source/lib/sysdep/win/winit.h b/source/lib/sysdep/win/winit.h index 3fac2e6a99..fbef79b9af 100644 --- a/source/lib/sysdep/win/winit.h +++ b/source/lib/sysdep/win/winit.h @@ -3,22 +3,10 @@ * File : winit.h * Project : 0 A.D. * Description : windows-specific module init and shutdown mechanism - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2007 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WINIT #define INCLUDED_WINIT diff --git a/source/lib/sysdep/win/wposix/waio.cpp b/source/lib/sysdep/win/wposix/waio.cpp index c57c4a156b..04d52eb774 100644 --- a/source/lib/sysdep/win/wposix/waio.cpp +++ b/source/lib/sysdep/win/wposix/waio.cpp @@ -3,22 +3,10 @@ * File : waio.cpp * Project : 0 A.D. * Description : emulate POSIX asynchronous I/O on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "waio.h" diff --git a/source/lib/sysdep/win/wposix/waio.h b/source/lib/sysdep/win/wposix/waio.h index b99789f326..49805f2d9e 100644 --- a/source/lib/sysdep/win/wposix/waio.h +++ b/source/lib/sysdep/win/wposix/waio.h @@ -3,22 +3,10 @@ * File : waio.h * Project : 0 A.D. * Description : emulate POSIX asynchronous I/O on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WAIO #define INCLUDED_WAIO diff --git a/source/lib/sysdep/win/wposix/wposix.cpp b/source/lib/sysdep/win/wposix/wposix.cpp index 16733782bc..718e14b010 100644 --- a/source/lib/sysdep/win/wposix/wposix.cpp +++ b/source/lib/sysdep/win/wposix/wposix.cpp @@ -3,22 +3,10 @@ * File : wposix.cpp * Project : 0 A.D. * Description : emulate a subset of POSIX on Win32. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "wposix.h" diff --git a/source/lib/sysdep/win/wposix/wposix.h b/source/lib/sysdep/win/wposix/wposix.h index 6f3674b7d9..6dc8aff49c 100644 --- a/source/lib/sysdep/win/wposix/wposix.h +++ b/source/lib/sysdep/win/wposix/wposix.h @@ -3,22 +3,10 @@ * File : wposix.h * Project : 0 A.D. * Description : emulate a subset of POSIX on Win32. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WPOSIX #define INCLUDED_WPOSIX diff --git a/source/lib/sysdep/win/wposix/wposix_types.h b/source/lib/sysdep/win/wposix/wposix_types.h index d22cea4aaf..4037407222 100644 --- a/source/lib/sysdep/win/wposix/wposix_types.h +++ b/source/lib/sysdep/win/wposix/wposix_types.h @@ -3,22 +3,10 @@ * File : wposix_types.h * Project : 0 A.D. * Description : type definitions needed for wposix. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WPOSIX_TYPES #define INCLUDED_WPOSIX_TYPES diff --git a/source/lib/sysdep/win/wposix/wpthread.cpp b/source/lib/sysdep/win/wposix/wpthread.cpp index 68e74e3534..ac01bfae06 100644 --- a/source/lib/sysdep/win/wposix/wpthread.cpp +++ b/source/lib/sysdep/win/wposix/wpthread.cpp @@ -3,22 +3,10 @@ * File : wpthread.cpp * Project : 0 A.D. * Description : emulate pthreads on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "wpthread.h" diff --git a/source/lib/sysdep/win/wposix/wpthread.h b/source/lib/sysdep/win/wposix/wpthread.h index 98e76e4d7d..aa8cc5d26f 100644 --- a/source/lib/sysdep/win/wposix/wpthread.h +++ b/source/lib/sysdep/win/wposix/wpthread.h @@ -3,22 +3,10 @@ * File : wpthread.h * Project : 0 A.D. * Description : emulate pthreads on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WPTHREAD #define INCLUDED_WPTHREAD diff --git a/source/lib/sysdep/win/wposix/wsock.cpp b/source/lib/sysdep/win/wposix/wsock.cpp index 584a0dd8c9..3ab417d604 100644 --- a/source/lib/sysdep/win/wposix/wsock.cpp +++ b/source/lib/sysdep/win/wposix/wsock.cpp @@ -3,22 +3,10 @@ * File : wsock.cpp * Project : 0 A.D. * Description : emulate Berkeley sockets on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "wsock.h" diff --git a/source/lib/sysdep/win/wposix/wsock.h b/source/lib/sysdep/win/wposix/wsock.h index bd9cfe614d..fc15ecbd74 100644 --- a/source/lib/sysdep/win/wposix/wsock.h +++ b/source/lib/sysdep/win/wposix/wsock.h @@ -3,22 +3,10 @@ * File : wsock.h * Project : 0 A.D. * Description : emulate Berkeley sockets on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WSOCK #define INCLUDED_WSOCK diff --git a/source/lib/sysdep/win/wposix/wtime.cpp b/source/lib/sysdep/win/wposix/wtime.cpp index 17053c8b3e..7c56d9d9aa 100644 --- a/source/lib/sysdep/win/wposix/wtime.cpp +++ b/source/lib/sysdep/win/wposix/wtime.cpp @@ -3,22 +3,10 @@ * File : wtime.cpp * Project : 0 A.D. * Description : emulate POSIX high resolution timer on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "wtime.h" diff --git a/source/lib/sysdep/win/wposix/wtime.h b/source/lib/sysdep/win/wposix/wtime.h index 11b96376f1..994da7bf01 100644 --- a/source/lib/sysdep/win/wposix/wtime.h +++ b/source/lib/sysdep/win/wposix/wtime.h @@ -3,25 +3,13 @@ * File : wtime.h * Project : 0 A.D. * Description : emulate POSIX high resolution timer on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef WTIME_H__ -#define WTIME_H__ +#ifndef INCLUDED_WTIME +#define INCLUDED_WTIME // advertise support for the timer routines we emulate; used by timer.cpp. // #undef to avoid macro redefinition warning. @@ -77,4 +65,4 @@ extern int nanosleep(const struct timespec* rqtp, struct timespec* rmtp); extern int clock_gettime(clockid_t clock, struct timespec* ts); extern int clock_getres(clockid_t clock, struct timespec* res); -#endif // #ifndef WTIME_H__ +#endif // #ifndef INCLUDED_WTIME diff --git a/source/lib/sysdep/win/wsdl.cpp b/source/lib/sysdep/win/wsdl.cpp index 615cd1dab3..6ffd4c30c0 100644 --- a/source/lib/sysdep/win/wsdl.cpp +++ b/source/lib/sysdep/win/wsdl.cpp @@ -3,22 +3,10 @@ * File : wsdl.cpp * Project : 0 A.D. * Description : emulate SDL on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "lib/external_libraries/sdl.h" diff --git a/source/lib/sysdep/win/wsdl.h b/source/lib/sysdep/win/wsdl.h index 26ae79e258..61ce4d57ce 100644 --- a/source/lib/sysdep/win/wsdl.h +++ b/source/lib/sysdep/win/wsdl.h @@ -3,25 +3,13 @@ * File : wsdl.h * Project : 0 A.D. * Description : emulate SDL on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef WSDL_H__ -#define WSDL_H__ +#ifndef INCLUDED_WSDL +#define INCLUDED_WSDL #include "SDL/SDL_keysym.h" @@ -299,4 +287,4 @@ extern Uint8 SDL_GetMouseState(int* x, int* y); extern Uint8 SDL_GetAppState(); -#endif // #ifndef WSDL_H__ +#endif // #ifndef INCLUDED_WSDL diff --git a/source/lib/sysdep/win/wsnd.cpp b/source/lib/sysdep/win/wsnd.cpp index d72fefca6e..add644547d 100644 --- a/source/lib/sysdep/win/wsnd.cpp +++ b/source/lib/sysdep/win/wsnd.cpp @@ -3,22 +3,10 @@ * File : wsdl.cpp * Project : 0 A.D. * Description : sound card detection on Windows. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2004 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "lib/sysdep/snd.h" diff --git a/source/lib/sysdep/win/wstartup.cpp b/source/lib/sysdep/win/wstartup.cpp index 4d11c98fe3..89b1bd2beb 100644 --- a/source/lib/sysdep/win/wstartup.cpp +++ b/source/lib/sysdep/win/wstartup.cpp @@ -3,22 +3,10 @@ * File : wstartup.cpp * Project : 0 A.D. * Description : windows-specific entry point and startup code - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2007 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "wstartup.h" diff --git a/source/lib/sysdep/win/wstartup.h b/source/lib/sysdep/win/wstartup.h index f62d21d319..2a07db301e 100644 --- a/source/lib/sysdep/win/wstartup.h +++ b/source/lib/sysdep/win/wstartup.h @@ -3,22 +3,10 @@ * File : wstartup.h * Project : 0 A.D. * Description : windows-specific entry point and startup code - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2007 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WSTARTUP #define INCLUDED_WSTARTUP diff --git a/source/lib/sysdep/win/wsysdep.cpp b/source/lib/sysdep/win/wsysdep.cpp index ccfdeed8fc..c470064ce4 100644 --- a/source/lib/sysdep/win/wsysdep.cpp +++ b/source/lib/sysdep/win/wsysdep.cpp @@ -3,22 +3,10 @@ * File : wsysdep.cpp * Project : 0 A.D. * Description : Windows backend of the sysdep interface - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "lib/sysdep/sysdep.h" @@ -619,3 +607,4 @@ LibError sys_pick_directory(char* path, size_t buf_size) return LibError_from_win32(ok); } + diff --git a/source/lib/sysdep/win/wutil.cpp b/source/lib/sysdep/win/wutil.cpp index d3ba43beff..ccfe09b035 100644 --- a/source/lib/sysdep/win/wutil.cpp +++ b/source/lib/sysdep/win/wutil.cpp @@ -3,22 +3,10 @@ * File : wutil.cpp * Project : 0 A.D. * Description : various Windows-specific utilities - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2007 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "wutil.h" diff --git a/source/lib/sysdep/win/wutil.h b/source/lib/sysdep/win/wutil.h index 086e757190..34d05d3665 100644 --- a/source/lib/sysdep/win/wutil.h +++ b/source/lib/sysdep/win/wutil.h @@ -3,22 +3,10 @@ * File : wutil.h * Project : 0 A.D. * Description : various Windows-specific utilities - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2007 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_WUTIL #define INCLUDED_WUTIL diff --git a/source/lib/timer.cpp b/source/lib/timer.cpp index c1dcc08d59..1d5d13b361 100644 --- a/source/lib/timer.cpp +++ b/source/lib/timer.cpp @@ -4,22 +4,10 @@ * Project : 0 A.D. * Description : platform-independent high resolution timer and * : FPS measuring code. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #include "precompiled.h" #include "timer.h" diff --git a/source/lib/timer.h b/source/lib/timer.h index 124e4b1592..0c17e775fd 100644 --- a/source/lib/timer.h +++ b/source/lib/timer.h @@ -4,25 +4,13 @@ * Project : 0 A.D. * Description : platform-independent high resolution timer and * : FPS measuring code. - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt -#ifndef TIMER_H -#define TIMER_H +#ifndef INCLUDED_TIMER +#define INCLUDED_TIMER #include @@ -276,4 +264,4 @@ Example usage: */ #define TIMER_ACCRUE(client) ScopeTimerAccrue<> UID__(client) -#endif // #ifndef TIMER_H +#endif // #ifndef INCLUDED_TIMER diff --git a/source/lib/types.h b/source/lib/types.h index 1690ce7ea2..4133ef5039 100644 --- a/source/lib/types.h +++ b/source/lib/types.h @@ -3,22 +3,10 @@ * File : types.h * Project : 0 A.D. * Description : convenient type aliases (shorter than stdint.h's uintN_t) - * - * @author Jan.Wassenberg@stud.uni-karlsruhe.de * ========================================================================= */ -/* - * Copyright (c) 2003-2005 Jan Wassenberg - * - * Redistribution and/or modification are also permitted under the - * terms of the GNU General Public License as published by the - * Free Software Foundation (version 2 or later, at your option). - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ +// license: GPL; see lib/license.txt #ifndef INCLUDED_TYPES #define INCLUDED_TYPES diff --git a/source/maths/Bound.cpp b/source/maths/Bound.cpp index 3604dc5603..cdb79ab15c 100644 --- a/source/maths/Bound.cpp +++ b/source/maths/Bound.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: Bound.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : Bound.cpp + * Project : 0 A.D. + * Description : Axis-aligned bounding box + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/maths/Bound.h b/source/maths/Bound.h index 02b0869820..952c863b72 100644 --- a/source/maths/Bound.h +++ b/source/maths/Bound.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: Bound.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : Bound.h + * Project : 0 A.D. + * Description : Axis-aligned bounding box + * ========================================================================= + */ -#ifndef _BOUND_H -#define _BOUND_H +#ifndef INCLUDED_BOUND +#define INCLUDED_BOUND // necessary includes #include "Vector3D.h" diff --git a/source/maths/Brush.cpp b/source/maths/Brush.cpp index 01db0d0420..b577020e40 100644 --- a/source/maths/Brush.cpp +++ b/source/maths/Brush.cpp @@ -3,8 +3,6 @@ * File : Brush.h * Project : Pyrogenesis * Description : Implementation of CBrush, a class representing a convex object - * - * @author Nicolai Haehnle * ========================================================================= */ @@ -322,3 +320,4 @@ void CBrush::Render() const debug_assert(firstInFace == no_vertex); } + diff --git a/source/maths/Brush.h b/source/maths/Brush.h index 522b1f05d0..b240e525e2 100644 --- a/source/maths/Brush.h +++ b/source/maths/Brush.h @@ -3,8 +3,6 @@ * File : Brush.h * Project : Pyrogenesis * Description : CBrush, a class representing a convex object - * - * @author Nicolai Haehnle * ========================================================================= */ diff --git a/source/maths/MathUtil.h b/source/maths/MathUtil.h index a39eabdf9a..3de9f81a29 100644 --- a/source/maths/MathUtil.h +++ b/source/maths/MathUtil.h @@ -1,5 +1,5 @@ -#ifndef MATH_UTIL_H -#define MATH_UTIL_H +#ifndef INCLUDED_MATHUTIL +#define INCLUDED_MATHUTIL #ifndef PI #define PI 3.14159265358979323846f diff --git a/source/maths/Matrix3D.cpp b/source/maths/Matrix3D.cpp index 0147f8ef5b..0595e5f522 100644 --- a/source/maths/Matrix3D.cpp +++ b/source/maths/Matrix3D.cpp @@ -1,13 +1,11 @@ -//*********************************************************** -// -// Name: Matrix3D.Cpp -// Last Update: 31/1/02 -// Author: Poya Manouchehri -// -// Description: A Matrix class used for holding and -// manipulating transformation info. -// -//*********************************************************** +/** + * ========================================================================= + * File : Matrix3D.cpp + * Project : 0 A.D. + * Description : A Matrix class used for holding and manipulating + * transformation info. + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/maths/Matrix3D.h b/source/maths/Matrix3D.h index 5af25a2c1f..d2cd871c30 100644 --- a/source/maths/Matrix3D.h +++ b/source/maths/Matrix3D.h @@ -1,5 +1,14 @@ -#ifndef __MATRIX3D_H -#define __MATRIX3D_H +/** + * ========================================================================= + * File : Matrix3D.h + * Project : 0 A.D. + * Description : A Matrix class used for holding and manipulating + * transformation info. + * ========================================================================= + */ + +#ifndef INCLUDED_MATRIX3D +#define INCLUDED_MATRIX3D class CVector3D; class CVector4D; diff --git a/source/maths/NUSpline.h b/source/maths/NUSpline.h index 325845347c..ae39f7aed5 100644 --- a/source/maths/NUSpline.h +++ b/source/maths/NUSpline.h @@ -2,8 +2,8 @@ //Borrowed from Game Programming Gems4. (Slightly changed to better suit our purposes //(and compatability). Any references to external material can be found there -#ifndef NUSPLINE_H -#define NUSPLINE_H +#ifndef INCLUDED_NUSPLINE +#define INCLUDED_NUSPLINE #define MAX_SPLINE_NODES 40 #include @@ -64,4 +64,4 @@ public: void Constrain(); }; -#endif // NUSPLINE_H +#endif // INCLUDED_NUSPLINE diff --git a/source/maths/Noise.cpp b/source/maths/Noise.cpp index 6ce73ec2fc..c58f93bf0d 100644 --- a/source/maths/Noise.cpp +++ b/source/maths/Noise.cpp @@ -1,3 +1,15 @@ +/** + * ========================================================================= + * File : Noise.cpp + * Project : 0 A.D. + * Description : 2D and 3D seamless Perlin noise + * ========================================================================= + */ + +// Based on http://www.cs.cmu.edu/~mzucker/code/perlin-noise-math-faq.html +// and http://mrl.nyu.edu/~perlin/paper445.pdf. +// Not optimized for speed yet. + #include "precompiled.h" #include "Noise.h" #include @@ -158,3 +170,4 @@ float Noise3D::operator()(float x, float y, float z) return (c0 + ez*(c1-c0)) * .5 + .5; } + diff --git a/source/maths/Noise.h b/source/maths/Noise.h index 0a02722d17..01a3bdae0d 100644 --- a/source/maths/Noise.h +++ b/source/maths/Noise.h @@ -1,18 +1,17 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: Noise.h -// Author: Matei Zaharia -// Contact: matei@wildfiregames.com -// -// Description: 2D and 3D seamless Perlin noise classes. Not optimized for speed yet. -// +/** + * ========================================================================= + * File : Noise.h + * Project : 0 A.D. + * Description : 2D and 3D seamless Perlin noise + * ========================================================================= + */ + // Based on http://www.cs.cmu.edu/~mzucker/code/perlin-noise-math-faq.html // and http://mrl.nyu.edu/~perlin/paper445.pdf. -// -/////////////////////////////////////////////////////////////////////////////// +// Not optimized for speed yet. -#ifndef NOISE_H -#define NOISE_H +#ifndef INCLUDED_NOISE +#define INCLUDED_NOISE #include "Vector2D.h" #include "Vector3D.h" diff --git a/source/maths/Plane.cpp b/source/maths/Plane.cpp index 7fc63f6225..ecb97630a5 100644 --- a/source/maths/Plane.cpp +++ b/source/maths/Plane.cpp @@ -1,15 +1,13 @@ -//*********************************************************** -// -// Name: Plane.Cpp -// Last Update: 17/2/02 -// Author: Poya Manouchehri -// -// Description: A Plane in R3 and several utility methods. -// Note that the format used for the plane -// equation is Ax + By + Cz + D = 0, where -// is the normal vector. -// -//*********************************************************** +/** + * ========================================================================= + * File : Plane.cpp + * Project : 0 A.D. + * Description : A Plane in R3 and several utility methods. + * ========================================================================= + */ + +// Note that the format used for the plane equation is +// Ax + By + Cz + D = 0, where is the normal vector. #include "precompiled.h" diff --git a/source/maths/Plane.h b/source/maths/Plane.h index 328d4fb1b2..ba2829d6d3 100644 --- a/source/maths/Plane.h +++ b/source/maths/Plane.h @@ -1,18 +1,16 @@ -//*********************************************************** -// -// Name: Plane.h -// Last Update: 17/2/02 -// Author: Poya Manouchehri -// -// Description: A Plane in R3 and several utility methods. -// Note that the format used for the plane -// equation is Ax + By + Cz + D = 0, where -// is the normal vector. -// -//*********************************************************** +/** + * ========================================================================= + * File : Plane.h + * Project : 0 A.D. + * Description : A Plane in R3 and several utility methods. + * ========================================================================= + */ -#ifndef PLANE_H -#define PLANE_H +// Note that the format used for the plane equation is +// Ax + By + Cz + D = 0, where is the normal vector. + +#ifndef INCLUDED_PLANE +#define INCLUDED_PLANE #include "Vector3D.h" diff --git a/source/maths/Quaternion.cpp b/source/maths/Quaternion.cpp index a7f06e23b2..36d2c708be 100644 --- a/source/maths/Quaternion.cpp +++ b/source/maths/Quaternion.cpp @@ -1,10 +1,10 @@ -/************************************************************ - * - * File Name: Quaternion.Cpp - * - * Description: - * - ************************************************************/ +/** + * ========================================================================= + * File : Quaternion.cpp + * Project : 0 A.D. + * Description : + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/maths/Quaternion.h b/source/maths/Quaternion.h index d35d7b6ec0..08275e80b2 100644 --- a/source/maths/Quaternion.h +++ b/source/maths/Quaternion.h @@ -1,13 +1,13 @@ -/************************************************************ - * - * File Name: Quaternion.H - * - * Description: - * - ************************************************************/ +/** + * ========================================================================= + * File : Quaternion.h + * Project : 0 A.D. + * Description : + * ========================================================================= + */ -#ifndef QUATERNION_H -#define QUATERNION_H +#ifndef INCLUDED_QUATERNION +#define INCLUDED_QUATERNION #include "Matrix3D.h" #include "Vector3D.h" diff --git a/source/maths/Vector2D.h b/source/maths/Vector2D.h index 86a438c17d..b2d2fc83ab 100644 --- a/source/maths/Vector2D.h +++ b/source/maths/Vector2D.h @@ -1,15 +1,14 @@ -//*********************************************************** -// -// Name: Vector2D.h -// Author: Matei Zaharia -// -// Description: Provides an interface for a vector in R4 and -// allows vector and scalar operations on it -// -//*********************************************************** +/** + * ========================================================================= + * File : Vector2D.h + * Project : 0 A.D. + * Description : Provides an interface for a vector in R2 and + * allows vector and scalar operations on it + * ========================================================================= + */ -#ifndef VECTOR2D_H -#define VECTOR2D_H +#ifndef INCLUDED_VECTOR2D +#define INCLUDED_VECTOR2D #include diff --git a/source/maths/Vector3D.cpp b/source/maths/Vector3D.cpp index b7ce94d063..1c7cfb2eeb 100644 --- a/source/maths/Vector3D.cpp +++ b/source/maths/Vector3D.cpp @@ -1,13 +1,11 @@ -//*********************************************************** -// -// Name: Vector3D.Cpp -// Last Update: 28/1/02 -// Author: Poya Manouchehri -// -// Description: Provides an interface for a vector in R3 and -// allows vector and scalar operations on it -// -//*********************************************************** +/** + * ========================================================================= + * File : Vector3D.cpp + * Project : 0 A.D. + * Description : Provides an interface for a vector in R3 and + * allows vector and scalar operations on it + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/maths/Vector3D.h b/source/maths/Vector3D.h index 90918cf1fd..962c5ec494 100644 --- a/source/maths/Vector3D.h +++ b/source/maths/Vector3D.h @@ -1,16 +1,14 @@ -//*********************************************************** -// -// Name: Vector3D.H -// Last Update: 28/1/02 -// Author: Poya Manouchehri -// -// Description: Provides an interface for a vector in R3 and -// allows vector and scalar operations on it -// -//*********************************************************** +/** + * ========================================================================= + * File : Vector3D.h + * Project : 0 A.D. + * Description : Provides an interface for a vector in R3 and + * allows vector and scalar operations on it + * ========================================================================= + */ -#ifndef VECTOR3D_H -#define VECTOR3D_H +#ifndef INCLUDED_VECTOR3D +#define INCLUDED_VECTOR3D class CVector3D { diff --git a/source/maths/Vector4D.h b/source/maths/Vector4D.h index 6d3ada0c55..36aa83a533 100644 --- a/source/maths/Vector4D.h +++ b/source/maths/Vector4D.h @@ -1,16 +1,14 @@ -//*********************************************************** -// -// Name: CVector4D.h -// Last Update: 02/11/03 -// Author: Rich Cross -// -// Description: Provides an interface for a vector in R4 and -// allows vector and scalar operations on it -// -//*********************************************************** +/** + * ========================================================================= + * File : Vector4D.h + * Project : 0 A.D. + * Description : Provides an interface for a vector in R4 and + * allows vector and scalar operations on it + * ========================================================================= + */ -#ifndef _VECTOR4D_H -#define _VECTOR4D_H +#ifndef INCLUDED_VECTOR4D +#define INCLUDED_VECTOR4D #include diff --git a/source/maths/scripting/JSInterface_Vector3D.h b/source/maths/scripting/JSInterface_Vector3D.h index 01283f0bee..e338a8f4e6 100644 --- a/source/maths/scripting/JSInterface_Vector3D.h +++ b/source/maths/scripting/JSInterface_Vector3D.h @@ -4,14 +4,12 @@ // A JavaScript class representing a Pyrogenesis CVector3D object. // // Usage: Used when manipulating objects of class 'Vector3D' in JavaScript. -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com #include "scripting/ScriptingHost.h" #include "maths/Vector3D.h" -#ifndef JSI_VECTOR3_INCLUDED -#define JSI_VECTOR3_INCLUDED +#ifndef INCLUDED_JSI_VECTOR3 +#define INCLUDED_JSI_VECTOR3 namespace JSI_Vector3D { @@ -59,3 +57,4 @@ namespace JSI_Vector3D #endif + diff --git a/source/network/AllNetMessages.h b/source/network/AllNetMessages.h index 16ef994a72..46b82ae8a2 100644 --- a/source/network/AllNetMessages.h +++ b/source/network/AllNetMessages.h @@ -1,5 +1,5 @@ -#ifndef _AllNetMessages_H -#define _AllNetMessages_H +#ifndef INCLUDED_ALLNETMESSAGES +#define INCLUDED_ALLNETMESSAGES #include "ps/CStr.h" #include "scripting/JSSerialization.h" diff --git a/source/network/Client.h b/source/network/Client.h index 5af0e35b8f..4b9159588f 100644 --- a/source/network/Client.h +++ b/source/network/Client.h @@ -1,5 +1,5 @@ -#ifndef _Network_NetClient_H -#define _Network_NetClient_H +#ifndef INCLUDED_NETWORK_CLIENT +#define INCLUDED_NETWORK_CLIENT #include "ps/CStr.h" #include "Session.h" @@ -78,4 +78,4 @@ public: extern CNetClient *g_NetClient; -#endif //_Network_NetClient_H +#endif //INCLUDED_NETWORK_CLIENT diff --git a/source/network/JSEvents.h b/source/network/JSEvents.h index 8c29c76108..b1fb25722c 100644 --- a/source/network/JSEvents.h +++ b/source/network/JSEvents.h @@ -1,5 +1,5 @@ -#ifndef _Network_JSEvents_H -#define _Network_JSEvents_H +#ifndef INCLUDED_NETWORK_JSEVENTS +#define INCLUDED_NETWORK_JSEVENTS #include "ServerSession.h" #include "scripting/DOMEvent.h" diff --git a/source/network/NetLog.h b/source/network/NetLog.h index 26a9371daf..b56d7a5db0 100644 --- a/source/network/NetLog.h +++ b/source/network/NetLog.h @@ -1,5 +1,5 @@ -#ifndef _Network_NetLog_H -#define _Network_NetLog_H +#ifndef INCLUDED_NETWORK_NETLOG +#define INCLUDED_NETWORK_NETLOG #include #include "ps/ThreadUtil.h" diff --git a/source/network/NetMessage.h b/source/network/NetMessage.h index 3f97148cf3..945b0cbffa 100644 --- a/source/network/NetMessage.h +++ b/source/network/NetMessage.h @@ -1,5 +1,5 @@ -#ifndef _NetMessage_H -#define _NetMessage_H +#ifndef INCLUDED_NETWORK_NETMESSAGE +#define INCLUDED_NETWORK_NETMESSAGE #include "Serialization.h" #include "SocketBase.h" @@ -94,4 +94,4 @@ struct SNetMessageDeserializerRegistration // This time, the classes are created #include "AllNetMessages.h" -#endif // #ifndef _NetMessage_H +#endif // #ifndef INCLUDED_NETWORK_NETMESSAGE diff --git a/source/network/Network.h b/source/network/Network.h index 8ec19a4d84..87120e7fc0 100644 --- a/source/network/Network.h +++ b/source/network/Network.h @@ -1,7 +1,5 @@ /* Network.h -by Simon Brenner -simon.brenner@home.se OVERVIEW @@ -38,8 +36,8 @@ MORE INFO */ -#ifndef _Network_H -#define _Network_H +#ifndef INCLUDED_NETWORK_NETWORK +#define INCLUDED_NETWORK_NETWORK //-------------------------------------------------------- // Includes / Compiler directives diff --git a/source/network/NetworkInternal.h b/source/network/NetworkInternal.h index e8a5c1578f..7ab8453b4a 100644 --- a/source/network/NetworkInternal.h +++ b/source/network/NetworkInternal.h @@ -1,5 +1,5 @@ -#ifndef _NetworkInternal_H -#define _NetworkInternal_H +#ifndef INCLUDED_NETWORK_NETWORKINTERNAL +#define INCLUDED_NETWORK_NETWORKINTERNAL #include diff --git a/source/network/Serialization.h b/source/network/Serialization.h index 9c814be9a7..012daddd36 100644 --- a/source/network/Serialization.h +++ b/source/network/Serialization.h @@ -1,5 +1,5 @@ -#ifndef _Serialization_H -#define _Serialization_H +#ifndef INCLUDED_NETWORK_SERIALIZATION +#define INCLUDED_NETWORK_SERIALIZATION #include "lib/lib.h" diff --git a/source/network/Server.h b/source/network/Server.h index 08bbb950ed..5f25504b01 100644 --- a/source/network/Server.h +++ b/source/network/Server.h @@ -1,5 +1,5 @@ -#ifndef _Network_NetServer_H -#define _Network_NetServer_H +#ifndef INCLUDED_NETWORK_SERVER +#define INCLUDED_NETWORK_SERVER #include "Session.h" #include "ps/GameAttributes.h" @@ -145,4 +145,4 @@ public: extern CNetServer *g_NetServer; -#endif // _Network_NetServer_H +#endif // INCLUDED_NETWORK_SERVER diff --git a/source/network/ServerSession.h b/source/network/ServerSession.h index 7881d2e272..36e56d792f 100644 --- a/source/network/ServerSession.h +++ b/source/network/ServerSession.h @@ -1,14 +1,12 @@ /* CNetServerSession - the server's representation of a connected client - AUTHOR: Simon Brenner - DESCRIPTION: */ -#ifndef _Network_ServerSession_H -#define _Network_ServerSession_H +#ifndef INCLUDED_NETWORK_SERVERSESSION +#define INCLUDED_NETWORK_SERVERSESSION #include "Session.h" #include "scripting/ScriptableObject.h" diff --git a/source/network/Session.h b/source/network/Session.h index 7d82807544..7b94ea72ed 100644 --- a/source/network/Session.h +++ b/source/network/Session.h @@ -1,5 +1,5 @@ -#ifndef _Network_NetSession_H -#define _Network_NetSession_H +#ifndef INCLUDED_NETWORK_SESSION +#define INCLUDED_NETWORK_SESSION #include "Network.h" #include "SessionManager.h" @@ -68,4 +68,4 @@ public: } }; -#endif //_Network_NetSession_H +#endif //INCLUDED_NETWORK_SESSION diff --git a/source/network/SessionManager.h b/source/network/SessionManager.h index 76b5aec024..2bb7e1b5ef 100644 --- a/source/network/SessionManager.h +++ b/source/network/SessionManager.h @@ -1,5 +1,5 @@ -#ifndef _Network_SessionManager_H -#define _Network_SessionManager_H +#ifndef INCLUDED_NETWORK_SESSIONMANAGER +#define INCLUDED_NETWORK_SESSIONMANAGER #include "ps/ThreadUtil.h" diff --git a/source/network/SocketBase.h b/source/network/SocketBase.h index a80d12a1bf..7bdde18e09 100644 --- a/source/network/SocketBase.h +++ b/source/network/SocketBase.h @@ -1,5 +1,5 @@ -#ifndef _SocketBase_H -#define _SocketBase_H +#ifndef INCLUDED_NETWORK_SOCKETBASE +#define INCLUDED_NETWORK_SOCKETBASE //-------------------------------------------------------- // Includes / Compiler directives diff --git a/source/network/StreamSocket.h b/source/network/StreamSocket.h index 970162e903..f5cea2dd36 100644 --- a/source/network/StreamSocket.h +++ b/source/network/StreamSocket.h @@ -1,5 +1,5 @@ -#ifndef _StreamSocket_H -#define _StreamSocket_H +#ifndef INCLUDED_NETWORK_STREAMSOCKET +#define INCLUDED_NETWORK_STREAMSOCKET #include "ps/Pyrogenesis.h" #include "Network.h" diff --git a/source/network/StringConverters.h b/source/network/StringConverters.h index dd8e4e1630..5946b47cd3 100644 --- a/source/network/StringConverters.h +++ b/source/network/StringConverters.h @@ -1,5 +1,5 @@ -#ifndef _StringConverters_H -#define _StringConverters_H +#ifndef INCLUDED_NETWORK_STRINGCONVERTERS +#define INCLUDED_NETWORK_STRINGCONVERTERS #include "ps/CStr.h" #include "simulation/EntityHandles.h" diff --git a/source/ps/CConsole.cpp b/source/ps/CConsole.cpp index e1c8204753..5a471f0949 100644 --- a/source/ps/CConsole.cpp +++ b/source/ps/CConsole.cpp @@ -1,3 +1,11 @@ +/** + * ========================================================================= + * File : CConsole.cpp + * Project : 0 A.D. + * Description : Implements the in-game console with scripting support. + * ========================================================================= + */ + #include "precompiled.h" #include diff --git a/source/ps/CConsole.h b/source/ps/CConsole.h index 830fa72831..8748a4cd8e 100644 --- a/source/ps/CConsole.h +++ b/source/ps/CConsole.h @@ -1,14 +1,10 @@ -/*************************************************************************************** - AUTHOR: John M. Mena - EMAIL: JohnMMena@hotmail.com - FILE: CConsole.h - CREATED: 12/3/03 - COMPLETED: NULL - - DESCRIPTION: The class CConsole provides an interface to the - scripting abilities of an engine. -****************************************************************************************/ - +/** + * ========================================================================= + * File : CConsole.h + * Project : 0 A.D. + * Description : Implements the in-game console with scripting support. + * ========================================================================= + */ #include #include @@ -19,8 +15,8 @@ #include "lib/input.h" -#ifndef CCONSOLE_H -#define CCONSOLE_H +#ifndef INCLUDED_CCONSOLE +#define INCLUDED_CCONSOLE #define CONSOLE_BUFFER_SIZE 1024 // for text being typed into the console #define CONSOLE_MESSAGE_SIZE 1024 // for messages being printed into the console diff --git a/source/ps/CLogger.h b/source/ps/CLogger.h index 1f2e3b5a64..e0aa25c010 100644 --- a/source/ps/CLogger.h +++ b/source/ps/CLogger.h @@ -1,5 +1,5 @@ -#ifndef _ps_CLogger_H -#define _ps_CLogger_H +#ifndef INCLUDED_CLOGGER +#define INCLUDED_CLOGGER #include #include diff --git a/source/ps/CStr.cpp b/source/ps/CStr.cpp index aad2a67d0b..2d1e79192e 100644 --- a/source/ps/CStr.cpp +++ b/source/ps/CStr.cpp @@ -3,9 +3,6 @@ * Project : engine * Description : Controls compilation of CStr class and * : includes some function implementations. - * - * @author Caecus - * Caecus@0ad.wildfiregames.com **/ #include "precompiled.h" diff --git a/source/ps/CStr.h b/source/ps/CStr.h index 5b460701ac..cbd3cc7d87 100644 --- a/source/ps/CStr.h +++ b/source/ps/CStr.h @@ -3,9 +3,6 @@ * Project : engine * Description : Contains CStr class which is a versatile class for making string use easy. * : The class implements a series of string manipulation/formatting functions. - * - * @author Caecus - * Caecus@0ad.wildfiregames.com **/ /* Examples: @@ -29,8 +26,8 @@ Examples: // 2004-10-31 Philip: Changed to inherit from std::[w]string // 2007-01-26 greybeard(joe@wildfiregames.com): added comments for doc generation -#ifndef CSTR_H_FIRST -#define CSTR_H_FIRST +#ifndef INCLUDED_CSTR +#define INCLUDED_CSTR /** * Whitespace trim identifier for Trim and Pad functions diff --git a/source/ps/ConfigDB.h b/source/ps/ConfigDB.h index b5ce289d20..1727675ec0 100644 --- a/source/ps/ConfigDB.h +++ b/source/ps/ConfigDB.h @@ -2,7 +2,6 @@ CConfigDB - Load, access and store configuration variables TDD : http://forums.wildfiregames.com/0ad/index.php?showtopic=1125 - AUTHOR : Simon Brenner , OVERVIEW: JavaScript: @@ -30,8 +29,8 @@ void SetFile() => g_ConfigDB.SetConfigFile() */ -#ifndef _ps_ConfigDB_H -#define _ps_ConfigDB_H +#ifndef INCLUDED_CONFIGDB +#define INCLUDED_CONFIGDB #include "Pyrogenesis.h" #include "Parser.h" diff --git a/source/ps/DllLoader.h b/source/ps/DllLoader.h index 3c35524d07..cca1a62872 100644 --- a/source/ps/DllLoader.h +++ b/source/ps/DllLoader.h @@ -1,5 +1,5 @@ -#ifndef DLLLOADER_H__ -#define DLLLOADER_H__ +#ifndef INCLUDED_DLLLOADER +#define INCLUDED_DLLLOADER #include "ps/Errors.h" @@ -66,4 +66,4 @@ void DllLoader::LoadSymbol(const char* name, T& fptr) const LoadSymbolInternal(name, (void**)&fptr); } -#endif // DLLLOADER_H__ +#endif // INCLUDED_DLLLOADER diff --git a/source/ps/Errors.h b/source/ps/Errors.h index 564a458c31..30a393ece9 100644 --- a/source/ps/Errors.h +++ b/source/ps/Errors.h @@ -1,5 +1,5 @@ -#ifndef _ERRORS_H_ -#define _ERRORS_H_ +#ifndef INCLUDED_ERRORS +#define INCLUDED_ERRORS #include diff --git a/source/ps/FilePacker.cpp b/source/ps/FilePacker.cpp index 5760ff615f..c427eb5dfc 100644 --- a/source/ps/FilePacker.cpp +++ b/source/ps/FilePacker.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: FilePacker.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : FilePacker.cpp + * Project : 0 A.D. + * Description : Resizable buffer, for writing binary files + * ========================================================================= + */ #include "precompiled.h" @@ -59,3 +59,4 @@ void CFilePacker::PackString(const CStr& str) PackRaw((const char*) str,len); } + diff --git a/source/ps/FilePacker.h b/source/ps/FilePacker.h index 78583eeb2a..dfd1f2e8a1 100644 --- a/source/ps/FilePacker.h +++ b/source/ps/FilePacker.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: FilePacker.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : FilePacker.h + * Project : 0 A.D. + * Description : Resizable buffer, for writing binary files + * ========================================================================= + */ -#ifndef _FILEPACKER_H -#define _FILEPACKER_H +#ifndef INCLUDED_FILEPACKER +#define INCLUDED_FILEPACKER #include #include "CStr.h" diff --git a/source/ps/FileUnpacker.cpp b/source/ps/FileUnpacker.cpp index 1537a8fd95..b3d81f35a9 100644 --- a/source/ps/FileUnpacker.cpp +++ b/source/ps/FileUnpacker.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: FileUnpacker.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : FileUnpacker.cpp + * Project : 0 A.D. + * Description : Buffer and 'stream' for reading binary files + * ========================================================================= + */ #include "precompiled.h" @@ -121,3 +121,4 @@ void CFileUnpacker::UnpackString(CStr& result) throw PSERROR_File_UnexpectedEOF(); } + diff --git a/source/ps/FileUnpacker.h b/source/ps/FileUnpacker.h index 9490f06c29..6d1884bfee 100644 --- a/source/ps/FileUnpacker.h +++ b/source/ps/FileUnpacker.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: FileUnpacker.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : FileUnpacker.h + * Project : 0 A.D. + * Description : Buffer and 'stream' for reading binary files + * ========================================================================= + */ -#ifndef _FILEUNPACKER_H -#define _FILEUNPACKER_H +#ifndef INCLUDED_FILEUNPACKER +#define INCLUDED_FILEUNPACKER #include #include "lib/res/file/file_io.h" diff --git a/source/ps/Font.h b/source/ps/Font.h index 5bf37fe3f9..961f43382b 100644 --- a/source/ps/Font.h +++ b/source/ps/Font.h @@ -1,5 +1,5 @@ -#ifndef _FONT_H -#define _FONT_H +#ifndef INCLUDED_FONT +#define INCLUDED_FONT #include "lib/res/handle.h" @@ -32,4 +32,4 @@ private: }; -#endif // _FONT_H +#endif // INCLUDED_FONT diff --git a/source/ps/Game.h b/source/ps/Game.h index 6602287dd3..dc10938e4f 100644 --- a/source/ps/Game.h +++ b/source/ps/Game.h @@ -4,8 +4,8 @@ * Description : Contains the CGame Class which is a representation of the game itself. * **/ -#ifndef _ps_Game_H -#define _ps_Game_H +#ifndef INCLUDED_GAME +#define INCLUDED_GAME #include "ps/Errors.h" #include diff --git a/source/ps/GameAttributes.h b/source/ps/GameAttributes.h index 009f4a4845..85ea4408a2 100644 --- a/source/ps/GameAttributes.h +++ b/source/ps/GameAttributes.h @@ -1,5 +1,5 @@ -#ifndef ps_GameAttributes_H -#define ps_GameAttributes_H +#ifndef INCLUDED_GAMEATTRIBUTES +#define INCLUDED_GAMEATTRIBUTES #include "Player.h" diff --git a/source/ps/GameRecord.h b/source/ps/GameRecord.h index 620848db63..ab5ab33b01 100644 --- a/source/ps/GameRecord.h +++ b/source/ps/GameRecord.h @@ -1,5 +1,5 @@ -#ifndef _ps_GameRecord_H -#define _ps_GameRecord_H +#ifndef INCLUDED_GAMERECORD +#define INCLUDED_GAMERECORD #include "CStr.h" diff --git a/source/ps/GameSetup/CmdLineArgs.h b/source/ps/GameSetup/CmdLineArgs.h index eee873f693..acfb1c773c 100644 --- a/source/ps/GameSetup/CmdLineArgs.h +++ b/source/ps/GameSetup/CmdLineArgs.h @@ -1,5 +1,5 @@ -#ifndef CMDLINEARGS_H__ -#define CMDLINEARGS_H__ +#ifndef INCLUDED_CMDLINEARGS +#define INCLUDED_CMDLINEARGS #include "ps/CStr.h" @@ -49,4 +49,4 @@ private: CStr m_Arg0; }; -#endif // CMDLINEARGS_H__ +#endif // INCLUDED_CMDLINEARGS diff --git a/source/ps/Hotkey.h b/source/ps/Hotkey.h index 572e6ffda0..72aa55744a 100644 --- a/source/ps/Hotkey.h +++ b/source/ps/Hotkey.h @@ -2,8 +2,6 @@ // // Constant definitions and a couple of exports for the hotkey processor // -// Mark Thompson (mot20@cam.ac.uk / mark@wildfiregames.com) -// // Hotkeys can be mapped onto SDL events (for use internal to the engine), // or used to trigger activation of GUI buttons. // diff --git a/source/ps/Interact.h b/source/ps/Interact.h index fa19a95b49..269e6f1bf6 100644 --- a/source/ps/Interact.h +++ b/source/ps/Interact.h @@ -4,8 +4,6 @@ // and the hotkey message processor. // Does this belong in GUI? -// Mark Thompson (mot20@cam.ac.uk / mark@wildfiregames.com) - #include #include @@ -194,3 +192,4 @@ InReaction InteractInputHandler( const SDL_Event_* ev ); #define g_Mouseover CMouseoverEntities::GetSingleton() #define g_BuildingPlacer CBuildingPlacer::GetSingleton() + diff --git a/source/ps/Loader.cpp b/source/ps/Loader.cpp index a0434de674..32e31bf440 100644 --- a/source/ps/Loader.cpp +++ b/source/ps/Loader.cpp @@ -1,8 +1,5 @@ // FIFO queue of load 'functors' with time limit; enables displaying // load progress without resorting to threads (complicated). -// -// Jan Wassenberg, initial implementation finished 2005-03-21 -// jan@wildfiregames.com #include "precompiled.h" diff --git a/source/ps/Loader.h b/source/ps/Loader.h index c31e1f9710..48b222d0b4 100644 --- a/source/ps/Loader.h +++ b/source/ps/Loader.h @@ -1,11 +1,8 @@ // FIFO queue of load 'functors' with time limit; enables displaying // load progress without resorting to threads (complicated). -// -// Jan Wassenberg, initial implementation finished 2005-03-21 -// jan@wildfiregames.com -#ifndef LOADER_H_INCLUDED -#define LOADER_H_INCLUDED +#ifndef INCLUDED_LOADER +#define INCLUDED_LOADER #include @@ -167,4 +164,4 @@ extern LibError LDR_NonprogressiveLoad(); return progress_percent;\ } -#endif // #ifndef LOADER_H_INCLUDED +#endif // #ifndef INCLUDED_LOADER diff --git a/source/ps/Overlay.cpp b/source/ps/Overlay.cpp index e8f556a090..4bdbabc6e3 100644 --- a/source/ps/Overlay.cpp +++ b/source/ps/Overlay.cpp @@ -1,7 +1,5 @@ /* Overlay.cpp -by Rich Cross -rich@0ad.wildfiregames.com */ #include "precompiled.h" diff --git a/source/ps/Overlay.h b/source/ps/Overlay.h index 3afcc861c6..10cc4af345 100644 --- a/source/ps/Overlay.h +++ b/source/ps/Overlay.h @@ -1,7 +1,5 @@ /* Overlay.h -by Rich Cross, rich@0ad.wildfiregames.com - --Overview-- @@ -9,8 +7,8 @@ by Rich Cross, rich@0ad.wildfiregames.com position, color, texture and borders. */ -#ifndef COVERLAY_H -#define COVERLAY_H +#ifndef INCLUDED_OVERLAY +#define INCLUDED_OVERLAY class CStr8; @@ -48,8 +46,6 @@ class CSize; /** - * @author Gustav Larsson - * * Rectangle class used for screen rectangles. It's very similar to the MS * CRect, but with FLOATS because it's meant to be used with OpenGL which * takes float values. @@ -138,8 +134,6 @@ public: }; /** - * @author Gustav Larsson - * * Made to represent screen positions and delta values. * @see CRect * @see CSize @@ -176,8 +170,6 @@ public: }; /** - * @author Gustav Larsson - * * Made to represent a screen size, should in philosophy * be made of unsigned ints, but for the sake of compatibility * with CRect and CPos it's not. diff --git a/source/ps/Parser.h b/source/ps/Parser.h index e2d82ed32a..b9ff86500a 100644 --- a/source/ps/Parser.h +++ b/source/ps/Parser.h @@ -1,7 +1,5 @@ /* Customizeable Text Parser -by Gee -Gee@pyro.nu --Overview-- @@ -22,8 +20,8 @@ will exist, and it's up to the system to figure out which one acquired. */ -#ifndef __PARSER_H -#define __PARSER_H +#ifndef INCLUDED_PARSER +#define INCLUDED_PARSER #include "Pyrogenesis.h" diff --git a/source/ps/Player.h b/source/ps/Player.h index b9fce4fa70..7909f309f1 100644 --- a/source/ps/Player.h +++ b/source/ps/Player.h @@ -1,5 +1,5 @@ -#ifndef _Player_H -#define _Player_H +#ifndef INCLUDED_PLAYER +#define INCLUDED_PLAYER #include "CStr.h" #include "scripting/SynchedJSObject.h" diff --git a/source/ps/Profile.cpp b/source/ps/Profile.cpp index d5cf343d2d..a296c45485 100644 --- a/source/ps/Profile.cpp +++ b/source/ps/Profile.cpp @@ -3,9 +3,6 @@ * File : Profile.cpp * Project : Pyrogeneses * Description : GPG3-style hierarchical profiler - * - * @author Mark Thompson (mark@wildfiregames.com / mot20@cam.ac.uk) - * @author Nicolai Haehnle * ========================================================================= */ @@ -511,3 +508,4 @@ double CProfileManager::GetFrameTime() return( get_time() - frame_start ); } + diff --git a/source/ps/Profile.h b/source/ps/Profile.h index df100d61a1..d4a9aaa346 100644 --- a/source/ps/Profile.h +++ b/source/ps/Profile.h @@ -3,13 +3,11 @@ * File : Profile.h * Project : Pyrogenesis * Description : GPG3-style hierarchical profiler - * - * @author Mark Thompson (mark@wildfiregames.com / mot20@cam.ac.uk) * ========================================================================= */ -#ifndef PROFILE_H_INCLUDED -#define PROFILE_H_INCLUDED +#ifndef INCLUDED_PROFILE +#define INCLUDED_PROFILE #include #include "Singleton.h" @@ -167,4 +165,4 @@ public: #define PROFILE_START( name ) { CProfileSample __profile( name ) #define PROFILE_END( name ) } -#endif // PROFILE_H_INCLUDED +#endif // INCLUDED_PROFILE diff --git a/source/ps/ProfileViewer.cpp b/source/ps/ProfileViewer.cpp index 6000830185..255ae05705 100644 --- a/source/ps/ProfileViewer.cpp +++ b/source/ps/ProfileViewer.cpp @@ -4,9 +4,6 @@ * Project : Pyrogenesis * Description : Implementation of profile display (containing only display * : routines, the data model(s) are implemented elsewhere). - * - * @author Mark Thompson - * @author Nicolai Haehnle * ========================================================================= */ diff --git a/source/ps/ProfileViewer.h b/source/ps/ProfileViewer.h index ca5dcbac7d..57b62f0814 100644 --- a/source/ps/ProfileViewer.h +++ b/source/ps/ProfileViewer.h @@ -3,14 +3,11 @@ * File : ProfileViewer.h * Project : Pyrogenesis * Description : Viewing profiling information (timing and other statistics) - * - * @author Mark Thompson - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef PROFILE_VIEWER_INCLUDED -#define PROFILE_VIEWER_INCLUDED +#ifndef INCLUDED_PROFILE_VIEWER +#define INCLUDED_PROFILE_VIEWER #include "lib/input.h" #include "ps/CStr.h" diff --git a/source/ps/Pyrogenesis.h b/source/ps/Pyrogenesis.h index f64cd9aeab..263334cd66 100644 --- a/source/ps/Pyrogenesis.h +++ b/source/ps/Pyrogenesis.h @@ -1,13 +1,11 @@ /* Pyrogenesis.h -by Raj Sharma -rsharma@uiuc.edu Standard declarations which are included in all projects. */ -#ifndef PYROGENESIS_H -#define PYROGENESIS_H +#ifndef INCLUDED_PYROGENESIS +#define INCLUDED_PYROGENESIS typedef const char * PS_RESULT; diff --git a/source/ps/Singleton.h b/source/ps/Singleton.h index aa1a2a4c52..86d5a5c405 100644 --- a/source/ps/Singleton.h +++ b/source/ps/Singleton.h @@ -1,23 +1,19 @@ -////////////////////////////////////////////////////////////////////////////// -// AUTHOR: Michael Reiland -// FILENAME: Singleton.h -// PURPOSE: Provides a base template class for Singletons -// -// USEAGE: class myClass : Singleton{}; -// -// INFO: This implementation was originally copied from: -// -// Enginuity, Part II -// Memory Management, Error Logging, and Utility Classes; -// or, How To Forget To Explode Your Underwear -// by Richard "superpig" Fine -// -// hosted at Gamedev.net at -// http://gamedev.net/reference/articles/article1954.asp -// -// MODIFIED: 07.09.2003 mreiland -#ifndef _TEMPLATE_SINGLETON -#define _TEMPLATE_SINGLETON +/** + * ========================================================================= + * File : Singleton.h + * Project : 0 A.D. + * Description : template base class for Singletons + * ========================================================================= + */ + +/* +USAGE: class myClass : Singleton{}; + +Modified from http://gamedev.net/reference/articles/article1954.asp +*/ + +#ifndef INCLUDED_SINGLETON +#define INCLUDED_SINGLETON #include "lib/debug.h" diff --git a/source/ps/ThreadUtil.h b/source/ps/ThreadUtil.h index f76ae98ce9..55961c171b 100644 --- a/source/ps/ThreadUtil.h +++ b/source/ps/ThreadUtil.h @@ -1,7 +1,5 @@ /* ThreadUtil.h - Thread Utility Functions -by Simon Brenner -simon.brenner@home.se --Overview-- diff --git a/source/ps/Vector2D.h b/source/ps/Vector2D.h index c9de62e888..5be6eec91d 100644 --- a/source/ps/Vector2D.h +++ b/source/ps/Vector2D.h @@ -1,11 +1,9 @@ // Vector2D.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // 2-dimensional vector class, primarily for use by simulation code. -#ifndef VECTOR_2D_INCLUDED -#define VECTOR_2D_INCLUDED +#ifndef INCLUDED_VECTOR2D +#define INCLUDED_VECTOR2D #include #include "maths/Vector3D.h" diff --git a/source/ps/World.h b/source/ps/World.h index eaa761e8ea..5a060330ec 100644 --- a/source/ps/World.h +++ b/source/ps/World.h @@ -4,8 +4,8 @@ * Description : Contains the CWorld Class which contains all the entities and represents them at a specific moment in time. * **/ -#ifndef _ps_World_H -#define _ps_World_H +#ifndef INCLUDED_WORLD +#define INCLUDED_WORLD #include "ps/Errors.h" diff --git a/source/ps/XML/XML.h b/source/ps/XML/XML.h index 65e5d9f666..0502007f38 100644 --- a/source/ps/XML/XML.h +++ b/source/ps/XML/XML.h @@ -1,7 +1,5 @@ /* XML.h - Xerces wrappers & convenience functions - - AUTHOR : Simon Brenner , EXAMPLE : Simple usage: @@ -19,8 +17,8 @@ goes for the entity resolver. */ -#ifndef _XercesVFS_H -#define _XercesVFS_H +#ifndef INCLUDED_XML +#define INCLUDED_XML // Temporarily undefine new, because the Xerces headers don't like it #include "lib/nommgr.h" @@ -109,4 +107,4 @@ public: {} }; -#endif // _XercesVFS_H +#endif // INCLUDED_XML diff --git a/source/ps/XML/XMLWriter.h b/source/ps/XML/XMLWriter.h index 12a699a859..7bea5607b7 100644 --- a/source/ps/XML/XMLWriter.h +++ b/source/ps/XML/XMLWriter.h @@ -1,5 +1,5 @@ -#ifndef XMLWRITER_H -#define XMLWRITER_H +#ifndef INCLUDED_XMLWRITER +#define INCLUDED_XMLWRITER /* @@ -136,4 +136,4 @@ private: int m_Type; }; -#endif // XMLWRITER_H +#endif // INCLUDED_XMLWRITER diff --git a/source/ps/XML/XercesErrorHandler.cpp b/source/ps/XML/XercesErrorHandler.cpp index 938ca413ac..32c50c8ef9 100644 --- a/source/ps/XML/XercesErrorHandler.cpp +++ b/source/ps/XML/XercesErrorHandler.cpp @@ -1,7 +1,5 @@ /* Xerces Error Handler for Pyrogenesis (and the GUI) -by Gustav Larsson -gee@pyro.nu */ // --------------------------------------------------------------------------- diff --git a/source/ps/XML/XercesErrorHandler.h b/source/ps/XML/XercesErrorHandler.h index acc5c7c2d4..ccdf83df37 100644 --- a/source/ps/XML/XercesErrorHandler.h +++ b/source/ps/XML/XercesErrorHandler.h @@ -1,7 +1,5 @@ /* Xerces Error Handler for Pyrogenesis (and the GUI) -by Gustav Larsson -gee@pyro.nu --Overview-- @@ -17,16 +15,14 @@ gee@pyro.nu */ -#ifndef XercesErrorHandler_H -#define XercesErrorHandler_H +#ifndef INCLUDED_XERCESERRORHANDLER +#define INCLUDED_XERCESERRORHANDLER #include "XML.h" #include /** - * @author Gustav Larsson - * * Adapter function that catches Xerces Reading Exceptions * and lets us output them in Pyrogenesis CLogFile. * diff --git a/source/ps/XML/XeroXMB.h b/source/ps/XML/XeroXMB.h index 450726c248..0d54239d40 100644 --- a/source/ps/XML/XeroXMB.h +++ b/source/ps/XML/XeroXMB.h @@ -1,7 +1,5 @@ /* Xeromyces - XMB reading library - - Philip Taylor (philip@zaynar.demon.co.uk / @wildfiregames.com) */ /* @@ -80,8 +78,8 @@ XMB_Text { */ -#ifndef _XEROXMB_H_ -#define _XEROXMB_H_ +#ifndef INCLUDED_XEROXMB +#define INCLUDED_XEROXMB // Define to use a std::map for name lookups rather than a linear search. // (The map is usually slower.) @@ -224,4 +222,4 @@ private: const char* m_LastPointer; }; -#endif // _XEROXMB_H_ +#endif // INCLUDED_XEROXMB diff --git a/source/ps/XML/Xeromyces.h b/source/ps/XML/Xeromyces.h index 603b07e04d..52d712bb59 100644 --- a/source/ps/XML/Xeromyces.h +++ b/source/ps/XML/Xeromyces.h @@ -2,12 +2,10 @@ Xeromyces file-loading interface. Automatically creates and caches relatively efficient binary representations of XML files. - - - Philip Taylor (philip@zaynar.demon.co.uk / @wildfiregames.com) */ -#ifndef _XEROMYCES_H_ -#define _XEROMYCES_H_ +#ifndef INCLUDED_XEROMYCES +#define INCLUDED_XEROMYCES #include "ps/Errors.h" ERROR_GROUP(Xeromyces); @@ -68,4 +66,4 @@ private: && (attribute = _XERO_CHILDREN.Item(_XERO_I), 1); \ ++_XERO_I) -#endif // _XEROMYCES_H_ +#endif // INCLUDED_XEROMYCES diff --git a/source/ps/scripting/JSCollection.h b/source/ps/scripting/JSCollection.h index 0400b20759..dbc56448d4 100644 --- a/source/ps/scripting/JSCollection.h +++ b/source/ps/scripting/JSCollection.h @@ -7,8 +7,8 @@ #include "simulation/ScriptObject.h" #include "scripting/JSConversions.h" -#ifndef JS_COLLECTION_INCLUDED -#define JS_COLLECTION_INCLUDED +#ifndef INCLUDED_JSCOLLECTION +#define INCLUDED_JSCOLLECTION template class CJSCollection { diff --git a/source/ps/scripting/JSInterface_Console.cpp b/source/ps/scripting/JSInterface_Console.cpp index 242d90ca1a..662339d8ec 100644 --- a/source/ps/scripting/JSInterface_Console.cpp +++ b/source/ps/scripting/JSInterface_Console.cpp @@ -1,7 +1,5 @@ // JavaScript interface to native code selection and group objects -// Mark Thompson (mot20@cam.ac.uk / mark@wildfiregames.com) - #include "precompiled.h" #include "JSInterface_Console.h" #include "ps/CConsole.h" diff --git a/source/ps/scripting/JSInterface_Console.h b/source/ps/scripting/JSInterface_Console.h index fb3dc307f0..ce53dbe217 100644 --- a/source/ps/scripting/JSInterface_Console.h +++ b/source/ps/scripting/JSInterface_Console.h @@ -4,8 +4,8 @@ #include "scripting/ScriptingHost.h" -#ifndef JSI_CONSOLE_INCLUDED -#define JSI_CONSOLE_INCLUDED +#ifndef INCLUDED_JSI_CONSOLE +#define INCLUDED_JSI_CONSOLE namespace JSI_Console { diff --git a/source/ps/scripting/JSInterface_Selection.cpp b/source/ps/scripting/JSInterface_Selection.cpp index 3a430f589b..9511edf4c5 100644 --- a/source/ps/scripting/JSInterface_Selection.cpp +++ b/source/ps/scripting/JSInterface_Selection.cpp @@ -1,7 +1,5 @@ // JavaScript interface to native code selection and group objects -// Mark Thompson (mot20@cam.ac.uk / mark@wildfiregames.com) - #include "precompiled.h" #include "JSInterface_Selection.h" #include "ps/scripting/JSCollection.h" @@ -97,3 +95,4 @@ JSBool JSI_Selection::setGroups( JSContext* cx, JSObject* UNUSED(obj), return( JS_TRUE ); } + diff --git a/source/ps/scripting/JSInterface_Selection.h b/source/ps/scripting/JSInterface_Selection.h index 82d61f028c..49e5512112 100644 --- a/source/ps/scripting/JSInterface_Selection.h +++ b/source/ps/scripting/JSInterface_Selection.h @@ -5,8 +5,8 @@ #include "scripting/ScriptingHost.h" -#ifndef JSI_SELECTION_INCLUDED -#define JSI_SELECTION_INCLUDED +#ifndef INCLUDED_JSI_SELECTION +#define INCLUDED_JSI_SELECTION namespace JSI_Selection { diff --git a/source/ps/scripting/JSInterface_VFS.h b/source/ps/scripting/JSInterface_VFS.h index 55fbe59be8..9c2ac759ca 100644 --- a/source/ps/scripting/JSInterface_VFS.h +++ b/source/ps/scripting/JSInterface_VFS.h @@ -2,8 +2,8 @@ // // The JavaScript wrapper around useful snippets of the VFS -#ifndef JSI_VFS_INCLUDED -#define JSI_VFS_INCLUDED +#ifndef INCLUDED_JSI_VFS +#define INCLUDED_JSI_VFS #include "scripting/ScriptingHost.h" diff --git a/source/ps/scripting/JSMap.h b/source/ps/scripting/JSMap.h index a7cfaedb34..cd9cd75418 100644 --- a/source/ps/scripting/JSMap.h +++ b/source/ps/scripting/JSMap.h @@ -1,5 +1,5 @@ -#ifndef _ps_scripting_JSMap_H -#define _ps_scripting_JSMap_H +#ifndef INCLUDED_JSMAP +#define INCLUDED_JSMAP /* A simple read-only JS wrapper for map types (STL associative containers). @@ -95,4 +95,4 @@ JSClass CJSMap::JSI_class = NULL, NULL, NULL, NULL }; -#endif // _ps_scripting_JSMap_H +#endif // INCLUDED_JSMAP diff --git a/source/ps/utf16string.h b/source/ps/utf16string.h index 0284243c2b..091ef61de6 100644 --- a/source/ps/utf16string.h +++ b/source/ps/utf16string.h @@ -2,8 +2,8 @@ A basic_string derivative that works with uint16_t as its underlying char type. */ -#ifndef utf16string_H -#define utf16string_H +#ifndef INCLUDED_UTF16STRING +#define INCLUDED_UTF16STRING // On Linux, wchar_t is 32-bit, so define a new version of it. // We now use this code on Windows as well, because wchar_t is a diff --git a/source/renderer/AlphaMapCalculator.cpp b/source/renderer/AlphaMapCalculator.cpp index 38c3c47892..1371a60b82 100644 --- a/source/renderer/AlphaMapCalculator.cpp +++ b/source/renderer/AlphaMapCalculator.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: AlphaMapCalculator.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : AlphaMapCalculator.cp + * Project : 0 A.D. + * Description : Determine which alpha blend map fits a given shape. + * ========================================================================= + */ #include "precompiled.h" diff --git a/source/renderer/AlphaMapCalculator.h b/source/renderer/AlphaMapCalculator.h index ce3e4a2482..6283ff7196 100644 --- a/source/renderer/AlphaMapCalculator.h +++ b/source/renderer/AlphaMapCalculator.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: AlphaMapCalculator.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : AlphaMapCalculator.h + * Project : 0 A.D. + * Description : Determine which alpha blend map fits a given shape. + * ========================================================================= + */ -#ifndef _ALPHAMAPCALCULATOR_H -#define _ALPHAMAPCALCULATOR_H +#ifndef INCLUDED_ALPHAMAPCALCULATOR +#define INCLUDED_ALPHAMAPCALCULATOR #include #include "BlendShapes.h" diff --git a/source/renderer/BlendShapes.h b/source/renderer/BlendShapes.h index b5f6daa686..b9c7ccac28 100644 --- a/source/renderer/BlendShapes.h +++ b/source/renderer/BlendShapes.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: BlendShapes.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : BlendShapes.h + * Project : 0 A.D. + * Description : + * ========================================================================= + */ -#ifndef _BLENDSHAPES_H -#define _BLENDSHAPES_H +#ifndef INCLUDED_BLENDSHAPES +#define INCLUDED_BLENDSHAPES struct BlendShape4 { diff --git a/source/renderer/FixedFunctionModelRenderer.cpp b/source/renderer/FixedFunctionModelRenderer.cpp index 118d0717ff..6da16f007e 100644 --- a/source/renderer/FixedFunctionModelRenderer.cpp +++ b/source/renderer/FixedFunctionModelRenderer.cpp @@ -3,8 +3,6 @@ * File : FixedFunctionModelRenderer.cpp * Project : Pyrogenesis * Description : Implementation of FixedFunctionModelRenderer - * - * @author Nicolai Haehnle * ========================================================================= */ @@ -282,3 +280,4 @@ void FixedFunctionModelRenderer::RenderModel(uint streamflags, CModel* model, vo g_Renderer.m_Stats.m_ModelTris += numFaces; } + diff --git a/source/renderer/FixedFunctionModelRenderer.h b/source/renderer/FixedFunctionModelRenderer.h index baaa236c3b..e93cbe2f9e 100644 --- a/source/renderer/FixedFunctionModelRenderer.h +++ b/source/renderer/FixedFunctionModelRenderer.h @@ -4,13 +4,11 @@ * Project : Pyrogenesis * Description : ModelVertexRenderer that uses only fixed function pipeline * : to render animated models. - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef FIXEDFUNCTIONMODELRENDERER_H -#define FIXEDFUNCTIONMODELRENDERER_H +#ifndef INCLUDED_FIXEDFUNCTIONMODELRENDERER +#define INCLUDED_FIXEDFUNCTIONMODELRENDERER #include "renderer/ModelVertexRenderer.h" @@ -47,4 +45,4 @@ private: }; -#endif // FIXEDFUNCTIONMODELRENDERER_H +#endif // INCLUDED_FIXEDFUNCTIONMODELRENDERER diff --git a/source/renderer/HWLightingModelRenderer.cpp b/source/renderer/HWLightingModelRenderer.cpp index 073ee27207..9ec82af6bf 100644 --- a/source/renderer/HWLightingModelRenderer.cpp +++ b/source/renderer/HWLightingModelRenderer.cpp @@ -3,8 +3,6 @@ * File : HWLightingModelRenderer.cpp * Project : Pyrogenesis * Description : Implementation of HWLightingModelRenderer - * - * @author Nicolai Haehnle * ========================================================================= */ @@ -317,3 +315,4 @@ void HWLightingModelRenderer::RenderModel(uint streamflags, CModel* model, void* g_Renderer.m_Stats.m_ModelTris += numFaces; } + diff --git a/source/renderer/HWLightingModelRenderer.h b/source/renderer/HWLightingModelRenderer.h index dbe4548d6b..a0b3e2135f 100644 --- a/source/renderer/HWLightingModelRenderer.h +++ b/source/renderer/HWLightingModelRenderer.h @@ -4,13 +4,11 @@ * Project : Pyrogenesis * Description : ModelVertexRenderer that transforms models on the CPU * : but performs lighting in a vertex shader. - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef HWLIGHTINGMODELRENDERER_H -#define HWLIGHTINGMODELRENDERER_H +#ifndef INCLUDED_HWLIGHTINGMODELRENDERER +#define INCLUDED_HWLIGHTINGMODELRENDERER #include "renderer/ModelVertexRenderer.h" @@ -62,4 +60,4 @@ private: }; -#endif // HWLIGHTINGMODELRENDERER_H +#endif // INCLUDED_HWLIGHTINGMODELRENDERER diff --git a/source/renderer/InstancingModelRenderer.cpp b/source/renderer/InstancingModelRenderer.cpp index bf00ba2762..0dbd1648e5 100644 --- a/source/renderer/InstancingModelRenderer.cpp +++ b/source/renderer/InstancingModelRenderer.cpp @@ -3,8 +3,6 @@ * File : InstancingModelRenderer.cpp * Project : Pyrogenesis * Description : Implementation of InstancingModelRenderer - * - * @author Nicolai Haehnle * ========================================================================= */ @@ -272,3 +270,4 @@ void InstancingModelRenderer::RenderModel(uint streamflags, CModel* model, void* g_Renderer.m_Stats.m_ModelTris += numFaces; } + diff --git a/source/renderer/InstancingModelRenderer.h b/source/renderer/InstancingModelRenderer.h index c02d5c1f33..b323e473db 100644 --- a/source/renderer/InstancingModelRenderer.h +++ b/source/renderer/InstancingModelRenderer.h @@ -4,13 +4,11 @@ * Project : Pyrogenesis * Description : Special ModelVertexRender that only works for non-animated * : models, but is very fast for instanced models. - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef INSTANCINGMODELRENDERER_H -#define INSTANCINGMODELRENDERER_H +#ifndef INCLUDED_INSTANCINGMODELRENDERER +#define INCLUDED_INSTANCINGMODELRENDERER #include "renderer/ModelVertexRenderer.h" @@ -62,4 +60,4 @@ private: }; -#endif // INSTANCINGMODELRENDERER_H +#endif // INCLUDED_INSTANCINGMODELRENDERER diff --git a/source/renderer/ModelRenderer.cpp b/source/renderer/ModelRenderer.cpp index 56be41f9d3..51c9cd362f 100644 --- a/source/renderer/ModelRenderer.cpp +++ b/source/renderer/ModelRenderer.cpp @@ -3,8 +3,6 @@ * File : ModelRenderer.cpp * Project : Pyrogenesis * Description : Implementation of ModelRenderer and BatchModelRenderer - * - * @author Nicolai Haehnle * ========================================================================= */ @@ -465,3 +463,4 @@ void BatchModelRendererInternals::RenderAllModels( } } + diff --git a/source/renderer/ModelRenderer.h b/source/renderer/ModelRenderer.h index a30430dfa7..03e76e1d2a 100644 --- a/source/renderer/ModelRenderer.h +++ b/source/renderer/ModelRenderer.h @@ -5,13 +5,11 @@ * Description : Home to the ModelRenderer class, an abstract base class * : that manages a per-frame list of submitted models, * : as well as simple helper classes. - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef MODELRENDERER_H -#define MODELRENDERER_H +#ifndef INCLUDED_MODELRENDERER +#define INCLUDED_MODELRENDERER #include @@ -266,4 +264,4 @@ private: }; -#endif // MODELRENDERER_H +#endif // INCLUDED_MODELRENDERER diff --git a/source/renderer/ModelVertexRenderer.h b/source/renderer/ModelVertexRenderer.h index 0951843197..306c0367dd 100644 --- a/source/renderer/ModelVertexRenderer.h +++ b/source/renderer/ModelVertexRenderer.h @@ -4,13 +4,11 @@ * Project : Pyrogenesis * Description : Definition of ModelVertexRenderer, the abstract base class * : for model vertex transformation implementations. - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef MODELVERTEXRENDERER_H -#define MODELVERTEXRENDERER_H +#ifndef INCLUDED_MODELVERTEXRENDERER +#define INCLUDED_MODELVERTEXRENDERER #include "graphics/MeshManager.h" @@ -165,4 +163,4 @@ public: }; -#endif // MODELVERTEXRENDERER_H +#endif // INCLUDED_MODELVERTEXRENDERER diff --git a/source/renderer/PatchRData.h b/source/renderer/PatchRData.h index 94b7d81cdd..084eec0d5d 100644 --- a/source/renderer/PatchRData.h +++ b/source/renderer/PatchRData.h @@ -1,5 +1,5 @@ -#ifndef _PATCHRDATA_H -#define _PATCHRDATA_H +#ifndef INCLUDED_PATCHRDATA +#define INCLUDED_PATCHRDATA #include #include "graphics/SColor.h" diff --git a/source/renderer/PlayerRenderer.cpp b/source/renderer/PlayerRenderer.cpp index e2582b66ef..2365b2675a 100644 --- a/source/renderer/PlayerRenderer.cpp +++ b/source/renderer/PlayerRenderer.cpp @@ -3,9 +3,6 @@ * File : PlayerRenderer.cpp * Project : Pyrogenesis * Description : Implementation of player colour RenderModifiers. - * - * @author John M. Mena - * @author Nicolai Haehnle * ========================================================================= */ @@ -402,3 +399,4 @@ void LitPlayerColorRender::PrepareModel(uint pass, CModel* model) } + diff --git a/source/renderer/PlayerRenderer.h b/source/renderer/PlayerRenderer.h index 63bc37b6fb..b2312c9b52 100644 --- a/source/renderer/PlayerRenderer.h +++ b/source/renderer/PlayerRenderer.h @@ -4,14 +4,11 @@ * Project : Pyrogenesis * Description : RenderModifier for player color rendering, to be used * : with e.g. FixedFunctionModelRenderer - * - * @author John M. Mena - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef __PLAYERRENDERER_H -#define __PLAYERRENDERER_H +#ifndef INCLUDED_PLAYERRENDERER +#define INCLUDED_PLAYERRENDERER #include "RenderModifiers.h" diff --git a/source/renderer/RenderModifiers.cpp b/source/renderer/RenderModifiers.cpp index 5ef5221f73..73246101f2 100644 --- a/source/renderer/RenderModifiers.cpp +++ b/source/renderer/RenderModifiers.cpp @@ -3,8 +3,6 @@ * File : RenderModifiers.cpp * Project : Pyrogenesis * Description : Implementation of common RenderModifiers - * - * @author Nicolai Haehnle * ========================================================================= */ diff --git a/source/renderer/RenderModifiers.h b/source/renderer/RenderModifiers.h index f878ea362b..eaf859cc77 100644 --- a/source/renderer/RenderModifiers.h +++ b/source/renderer/RenderModifiers.h @@ -5,13 +5,11 @@ * Description : RenderModifiers can affect the fragment stage behaviour * : of some ModelRenderers. This file defines some common * : RenderModifiers in addition to the base class. - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef RENDERMODIFIERS_H -#define RENDERMODIFIERS_H +#ifndef INCLUDED_RENDERMODIFIERS +#define INCLUDED_RENDERMODIFIERS #include "ModelRenderer.h" @@ -220,4 +218,4 @@ public: void PrepareModel(uint pass, CModel* model); }; -#endif // RENDERMODIFIERS_H +#endif // INCLUDED_RENDERMODIFIERS diff --git a/source/renderer/RenderPathVertexShader.h b/source/renderer/RenderPathVertexShader.h index 3a068ab3de..ffae5b270f 100644 --- a/source/renderer/RenderPathVertexShader.h +++ b/source/renderer/RenderPathVertexShader.h @@ -1,5 +1,5 @@ -#ifndef __RENDERPATHVERTEXSHADER_H__ -#define __RENDERPATHVERTEXSHADER_H__ +#ifndef INCLUDED_RENDERPATHVERTEXSHADER +#define INCLUDED_RENDERPATHVERTEXSHADER #include "graphics/LightEnv.h" @@ -113,4 +113,4 @@ public: VS_PosToUV1 m_InstancingP_PosToUV1; }; -#endif // __RENDERPATHVERTEXSHADER_H__ +#endif // INCLUDED_RENDERPATHVERTEXSHADER diff --git a/source/renderer/Renderer.cpp b/source/renderer/Renderer.cpp index 81c1600c97..cd5b33d015 100644 --- a/source/renderer/Renderer.cpp +++ b/source/renderer/Renderer.cpp @@ -1,16 +1,11 @@ - -/////////////////////////////////////////////////////////////////////////////// -// -// Name: Renderer.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -// Description: OpenGL renderer class; a higher level interface -// on top of OpenGL to handle rendering the basic visual games -// types - terrain, models, sprites, particles etc -// -/////////////////////////////////////////////////////////////////////////////// - +/** + * ========================================================================= + * File : Renderer.cpp + * Project : 0 A.D. + * Description : higher level interface on top of OpenGL to render basic + * objects: terrain, models, sprites, particles etc. + * ========================================================================= + */ #include "precompiled.h" @@ -1757,3 +1752,4 @@ void CRenderer::ScriptingInit() CJSObject::ScriptingInit("Renderer"); } + diff --git a/source/renderer/Renderer.h b/source/renderer/Renderer.h index f78c736e84..df627dfd65 100644 --- a/source/renderer/Renderer.h +++ b/source/renderer/Renderer.h @@ -1,17 +1,14 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: Renderer.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -// Description: OpenGL renderer class; a higher level interface -// on top of OpenGL to handle rendering the basic visual games -// types - terrain, models, sprites, particles etc -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : Renderer.h + * Project : 0 A.D. + * Description : higher level interface on top of OpenGL to render basic + * objects: terrain, models, sprites, particles etc. + * ========================================================================= + */ -#ifndef RENDERER_H -#define RENDERER_H +#ifndef INCLUDED_RENDERER +#define INCLUDED_RENDERER #include "graphics/Camera.h" #include "lib/ogl.h" diff --git a/source/renderer/Scene.cpp b/source/renderer/Scene.cpp index 0a3ad15a7a..35af3c731a 100644 --- a/source/renderer/Scene.cpp +++ b/source/renderer/Scene.cpp @@ -6,8 +6,6 @@ * : classes. * * @note This file would fit just as well into the graphics/ subdirectory. - * - * @author Nicolai Haehnle **/ #include "precompiled.h" @@ -31,3 +29,4 @@ void SceneCollector::SubmitRecursive(CModel* model) } } + diff --git a/source/renderer/Scene.h b/source/renderer/Scene.h index 144e743751..37efc2a8ce 100644 --- a/source/renderer/Scene.h +++ b/source/renderer/Scene.h @@ -6,12 +6,10 @@ * : in that scene. * * @note This file would fit just as well into the graphics/ subdirectory. - * - * @author Nicolai Haehnle **/ -#ifndef RENDERER_SCENE_H -#define RENDERER_SCENE_H +#ifndef INCLUDED_SCENE +#define INCLUDED_SCENE class CFrustum; class CModel; @@ -66,4 +64,4 @@ public: }; -#endif // RENDERER_SCENE_H +#endif // INCLUDED_SCENE diff --git a/source/renderer/ShadowMap.cpp b/source/renderer/ShadowMap.cpp index 320984ee9c..0d354e9ef8 100644 --- a/source/renderer/ShadowMap.cpp +++ b/source/renderer/ShadowMap.cpp @@ -3,8 +3,6 @@ * File : ShadowMap.cpp * Project : Pyrogenesis * Description : Shadow mapping related texture and matrix management - * - * @author Nicolai Haehnle * ========================================================================= */ diff --git a/source/renderer/ShadowMap.h b/source/renderer/ShadowMap.h index ad0d72a5f8..517f145606 100644 --- a/source/renderer/ShadowMap.h +++ b/source/renderer/ShadowMap.h @@ -3,13 +3,11 @@ * File : ShadowMap.h * Project : Pyrogenesis * Description : Shadow mapping related texture and matrix management - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef SHADOWMAP_H -#define SHADOWMAP_H +#ifndef INCLUDED_SHADOWMAP +#define INCLUDED_SHADOWMAP #include "lib/ogl.h" @@ -137,4 +135,4 @@ private: ShadowMapInternals* m; }; -#endif // SHADOWMAP_H +#endif // INCLUDED_SHADOWMAP diff --git a/source/renderer/SkyManager.cpp b/source/renderer/SkyManager.cpp index 0cb8855879..4a472f74f3 100644 --- a/source/renderer/SkyManager.cpp +++ b/source/renderer/SkyManager.cpp @@ -3,8 +3,6 @@ * File : SkyManager.cpp * Project : Pyrogenesis * Description : Sky settings, texture management and rendering. - * - * @author Matei Zaharia * ========================================================================= */ diff --git a/source/renderer/SkyManager.h b/source/renderer/SkyManager.h index 9dd908523d..f5701f5ef7 100644 --- a/source/renderer/SkyManager.h +++ b/source/renderer/SkyManager.h @@ -3,13 +3,11 @@ * File : SkyManager.h * Project : Pyrogenesis * Description : Sky settings and texture management - * - * @author Matei Zaharia * ========================================================================= */ -#ifndef SKYMANAGER_H -#define SKYMANAGER_H +#ifndef INCLUDED_SKYMANAGER +#define INCLUDED_SKYMANAGER #include "ps/Overlay.h" @@ -86,4 +84,4 @@ private: }; -#endif // SKYMANAGER_H +#endif // INCLUDED_SKYMANAGER diff --git a/source/renderer/TerrainOverlay.h b/source/renderer/TerrainOverlay.h index 9a25fd47f1..d06e187f88 100644 --- a/source/renderer/TerrainOverlay.h +++ b/source/renderer/TerrainOverlay.h @@ -7,8 +7,8 @@ * ========================================================================= */ -#ifndef __TERRAINOVERLAY_H__ -#define __TERRAINOVERLAY_H__ +#ifndef INCLUDED_TERRAINOVERLAY +#define INCLUDED_TERRAINOVERLAY #include "ps/Overlay.h" // for CColor @@ -147,4 +147,4 @@ public: ExampleTerrainOverlay test; // or allocate it dynamically somewhere */ -#endif // __TERRAINOVERLAY_H__ +#endif // INCLUDED_TERRAINOVERLAY diff --git a/source/renderer/TerrainRenderer.cpp b/source/renderer/TerrainRenderer.cpp index cd6fdcadaa..fc24b02dfd 100644 --- a/source/renderer/TerrainRenderer.cpp +++ b/source/renderer/TerrainRenderer.cpp @@ -4,8 +4,6 @@ * Project : Pyrogenesis * Description : Terrain rendering (everything related to patches and * : water) is encapsulated in TerrainRenderer - * - * @author Nicolai Haehnle * ========================================================================= */ @@ -635,3 +633,4 @@ void TerrainRenderer::RenderWater() glDisable(GL_TEXTURE_2D); } + diff --git a/source/renderer/TerrainRenderer.h b/source/renderer/TerrainRenderer.h index ec8508409b..f0ee0c4895 100644 --- a/source/renderer/TerrainRenderer.h +++ b/source/renderer/TerrainRenderer.h @@ -4,13 +4,11 @@ * Project : Pyrogenesis * Description : Terrain rendering (everything related to patches and * : water) is encapsulated in TerrainRenderer - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef TERRAINRENDERER_H -#define TERRAINRENDERER_H +#ifndef INCLUDED_TERRAINRENDERER +#define INCLUDED_TERRAINRENDERER class CPatch; class ShadowMap; @@ -105,4 +103,4 @@ private: TerrainRendererInternals* m; }; -#endif // TERRAINRENDERER_H +#endif // INCLUDED_TERRAINRENDERER diff --git a/source/renderer/TransparencyRenderer.cpp b/source/renderer/TransparencyRenderer.cpp index a484ce09f2..7450b7e069 100644 --- a/source/renderer/TransparencyRenderer.cpp +++ b/source/renderer/TransparencyRenderer.cpp @@ -5,9 +5,6 @@ * Description : ModelRenderer implementation that sorts models and/or * : polygons based on distance from viewer, for transparency * : rendering. - * - * @author Rich Cross - * @author Nicolai Haehnle * ========================================================================= */ diff --git a/source/renderer/TransparencyRenderer.h b/source/renderer/TransparencyRenderer.h index ef7cd86598..686e9bdced 100644 --- a/source/renderer/TransparencyRenderer.h +++ b/source/renderer/TransparencyRenderer.h @@ -5,14 +5,11 @@ * Description : ModelRenderer implementation that sorts models and/or * : polygons based on distance from viewer, for transparency * : rendering. - * - * @author Rich Cross - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef __TRANSPARENCYRENDERER_H -#define __TRANSPARENCYRENDERER_H +#ifndef INCLUDED_TRANSPARENCYRENDERER +#define INCLUDED_TRANSPARENCYRENDERER #include "renderer/ModelRenderer.h" #include "renderer/ModelVertexRenderer.h" diff --git a/source/renderer/VertexArray.h b/source/renderer/VertexArray.h index f4ef37b770..0130181c89 100644 --- a/source/renderer/VertexArray.h +++ b/source/renderer/VertexArray.h @@ -1,5 +1,5 @@ -#ifndef __VERTEXARRAY_H__ -#define __VERTEXARRAY_H__ +#ifndef INCLUDED_VERTEXARRAY +#define INCLUDED_VERTEXARRAY #include "renderer/VertexBuffer.h" @@ -175,4 +175,4 @@ private: }; -#endif // __VERTEXARRAY_H__ +#endif // INCLUDED_VERTEXARRAY diff --git a/source/renderer/VertexBuffer.cpp b/source/renderer/VertexBuffer.cpp index 991d17a9e0..1ef909ac57 100644 --- a/source/renderer/VertexBuffer.cpp +++ b/source/renderer/VertexBuffer.cpp @@ -1,10 +1,10 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: VertexBuffer.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : VertexBuffer.cpp + * Project : 0 A.D. + * Description : encapsulation of VBOs with batching and sharing + * ========================================================================= + */ #include "precompiled.h" #include "ps/Errors.h" diff --git a/source/renderer/VertexBuffer.h b/source/renderer/VertexBuffer.h index 9e2829145c..53bb5e28bf 100644 --- a/source/renderer/VertexBuffer.h +++ b/source/renderer/VertexBuffer.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: VertexBuffer.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : VertexBuffer.h + * Project : 0 A.D. + * Description : encapsulation of VBOs with batching and sharing + * ========================================================================= + */ -#ifndef _VERTEXBUFFER_H -#define _VERTEXBUFFER_H +#ifndef INCLUDED_VERTEXBUFFER +#define INCLUDED_VERTEXBUFFER #include "lib/lib.h" #include "lib/res/graphics/ogl_tex.h" diff --git a/source/renderer/VertexBufferManager.cpp b/source/renderer/VertexBufferManager.cpp index d81a865189..4e958c6034 100644 --- a/source/renderer/VertexBufferManager.cpp +++ b/source/renderer/VertexBufferManager.cpp @@ -1,10 +1,11 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: VertexBufferManager.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : VertexBufferManager.cpp + * Project : 0 A.D. + * Description : Allocate and destroy CVertexBuffers + * ========================================================================= + */ + #include "precompiled.h" #include "lib/ogl.h" diff --git a/source/renderer/VertexBufferManager.h b/source/renderer/VertexBufferManager.h index 6147c9aea4..64f0542e2d 100644 --- a/source/renderer/VertexBufferManager.h +++ b/source/renderer/VertexBufferManager.h @@ -1,13 +1,13 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Name: VertexBufferManager.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// -/////////////////////////////////////////////////////////////////////////////// +/** + * ========================================================================= + * File : VertexBufferManager.h + * Project : 0 A.D. + * Description : Allocate and destroy CVertexBuffers + * ========================================================================= + */ -#ifndef _VERTEXBUFFERMANAGER_H -#define _VERTEXBUFFERMANAGER_H +#ifndef INCLUDED_VERTEXBUFFERMANAGER +#define INCLUDED_VERTEXBUFFERMANAGER #include "VertexBuffer.h" diff --git a/source/renderer/WaterManager.cpp b/source/renderer/WaterManager.cpp index 7427f039c5..0dfa267805 100644 --- a/source/renderer/WaterManager.cpp +++ b/source/renderer/WaterManager.cpp @@ -3,8 +3,6 @@ * File : WaterManager.cpp * Project : Pyrogenesis * Description : Water settings (speed, height) and texture management - * - * @author Nicolai Haehnle * ========================================================================= */ diff --git a/source/renderer/WaterManager.h b/source/renderer/WaterManager.h index 479b299bd5..dabb86a676 100644 --- a/source/renderer/WaterManager.h +++ b/source/renderer/WaterManager.h @@ -3,13 +3,11 @@ * File : WaterManager.h * Project : Pyrogenesis * Description : Water settings (speed, height) and texture management - * - * @author Nicolai Haehnle * ========================================================================= */ -#ifndef WATERMANAGER_H -#define WATERMANAGER_H +#ifndef INCLUDED_WATERMANAGER +#define INCLUDED_WATERMANAGER #include "ps/Overlay.h" #include "maths/Matrix3D.h" @@ -91,4 +89,4 @@ private: }; -#endif // WATERMANAGER_H +#endif // INCLUDED_WATERMANAGER diff --git a/source/scripting/DOMEvent.h b/source/scripting/DOMEvent.h index 08b7dc3c96..80485c3cd6 100644 --- a/source/scripting/DOMEvent.h +++ b/source/scripting/DOMEvent.h @@ -1,6 +1,4 @@ // DOM-style event object -// -// Mark Thompson (mot20@cam.ac.uk / mark@wildfiregames.com) // Note: Cancellable [UK]? Cancelable [US]? DOM says one l, OED says 2. // JS interface uses 1. @@ -8,8 +6,8 @@ // Entity and e.g. projectile classes derive from this and use it for // sending/receiving events. -#ifndef DOMEVENT_INCLUDED -#define DOMEVENT_INCLUDED +#ifndef INCLUDED_DOMEVENT +#define INCLUDED_DOMEVENT #include "ScriptableObject.h" #include "EventTypes.h" // for EVENT_LAST @@ -134,3 +132,4 @@ public: #endif + diff --git a/source/scripting/EventTypes.h b/source/scripting/EventTypes.h index 532ce206ff..7abe2ae620 100644 --- a/source/scripting/EventTypes.h +++ b/source/scripting/EventTypes.h @@ -4,8 +4,8 @@ // DOMEvent currently uses a preallocated array of EVENT_LAST elements, // so these must be consecutive integers starting with 0. -#ifndef EVENTTYPES_H__ -#define EVENTTYPES_H__ +#ifndef INCLUDED_EVENTTYPES +#define INCLUDED_EVENTTYPES enum EEventType { @@ -58,5 +58,6 @@ static const wchar_t* const EventNames[EVENT_LAST] = /* EVENT_IDLE */ L"onIdle", /* When this unit becomes idle, do something */ }; -#endif // #ifndef EVENTTYPES_H__ +#endif // #ifndef INCLUDED_EVENTTYPES + diff --git a/source/scripting/GameEvents.h b/source/scripting/GameEvents.h index 9b3ed98c1a..0ba368222b 100644 --- a/source/scripting/GameEvents.h +++ b/source/scripting/GameEvents.h @@ -4,8 +4,8 @@ // The CScriptEvent-derived events are declared here as well, // with their type set to one of EventTypes.h's EEventType. -#ifndef GAME_EVENTS_INCLUDED -#define GAME_EVENTS_INCLUDED +#ifndef INCLUDED_GAMEEVENTS +#define INCLUDED_GAMEEVENTS #include "DOMEvent.h" #include "EventTypes.h" diff --git a/source/scripting/JSConversions.h b/source/scripting/JSConversions.h index f9986491fc..0ea4fd9ce7 100644 --- a/source/scripting/JSConversions.h +++ b/source/scripting/JSConversions.h @@ -1,8 +1,7 @@ // A general system of converting between native objects and their JavaScript representations -// Mark Thompson (mark@wildfiregames.com / mot20@cam.ac.uk) -#ifndef JSCONVERSIONS_INCLUDED -#define JSCONVERSIONS_INCLUDED +#ifndef INCLUDED_JSCONVERSIONS +#define INCLUDED_JSCONVERSIONS #include "scripting/ScriptingHost.h" diff --git a/source/scripting/JSSerialization.h b/source/scripting/JSSerialization.h index 00ef766f87..669072dc1c 100644 --- a/source/scripting/JSSerialization.h +++ b/source/scripting/JSSerialization.h @@ -1,6 +1,5 @@ // Functions for (de)serialization of jsvals -// -// Mark Thompson (mark@wildfiregames.com / mot20@cam.ac.uk) + // WIP, not yet functional #include "network/Serialization.h" diff --git a/source/scripting/ScriptCustomTypes.h b/source/scripting/ScriptCustomTypes.h index da744420b6..eec1bf65f5 100644 --- a/source/scripting/ScriptCustomTypes.h +++ b/source/scripting/ScriptCustomTypes.h @@ -1,7 +1,7 @@ #include "scripting/ScriptableObject.h" -#ifndef _SCRIPTCUSTOMTYPES_H_ -#define _SCRIPTCUSTOMTYPES_H_ +#ifndef INCLUDED_SCRIPTCUSTOMTYPES +#define INCLUDED_SCRIPTCUSTOMTYPES // Custom object types diff --git a/source/scripting/ScriptGlue.h b/source/scripting/ScriptGlue.h index b80d459d45..71095c5acb 100644 --- a/source/scripting/ScriptGlue.h +++ b/source/scripting/ScriptGlue.h @@ -1,6 +1,6 @@ -#ifndef _SCRIPTGLUE_H_ -#define _SCRIPTGLUE_H_ +#ifndef INCLUDED_SCRIPTGLUE +#define INCLUDED_SCRIPTGLUE #include "ScriptingHost.h" @@ -20,4 +20,4 @@ extern void EndGame(); extern int GetVRAMInfo(int&, int&); #endif -#endif // #ifndef _SCRIPTGLUE_H_ +#endif // #ifndef INCLUDED_SCRIPTGLUE diff --git a/source/scripting/ScriptableComplex.h b/source/scripting/ScriptableComplex.h index 864380e539..986956c0c9 100644 --- a/source/scripting/ScriptableComplex.h +++ b/source/scripting/ScriptableComplex.h @@ -14,8 +14,8 @@ before, 30+ files had to be recompiled because they #included Entity.h which #includes ScriptableComplex.h. */ -#ifndef SCRIPTABLE_COMPLEX_INCLUDED -#define SCRIPTABLE_COMPLEX_INCLUDED +#ifndef INCLUDED_SCRIPTABLECOMPLEX +#define INCLUDED_SCRIPTABLECOMPLEX #include "scripting/ScriptingHost.h" #include "simulation/ScriptObject.h" diff --git a/source/scripting/ScriptableObject.h b/source/scripting/ScriptableObject.h index bb5f9ebb17..7903cdbbcf 100644 --- a/source/scripting/ScriptableObject.h +++ b/source/scripting/ScriptableObject.h @@ -2,14 +2,12 @@ // // A quick way to add (mostly) sensibly-behaving JavaScript interfaces to native classes. // -// Mark Thompson (mark@wildfiregames.com / mot20@cam.ac.uk) -// #include "scripting/ScriptingHost.h" #include "JSConversions.h" -#ifndef SCRIPTABLE_INCLUDED -#define SCRIPTABLE_INCLUDED +#ifndef INCLUDED_SCRIPTABLEOBJECT +#define INCLUDED_SCRIPTABLEOBJECT #define ALLOW_NONSHARED_NATIVES @@ -442,3 +440,4 @@ template typename CJSObject::PropertyTab #endif + diff --git a/source/scripting/ScriptingHost.h b/source/scripting/ScriptingHost.h index d971c7360f..27c647ba00 100644 --- a/source/scripting/ScriptingHost.h +++ b/source/scripting/ScriptingHost.h @@ -1,6 +1,6 @@ -#ifndef _SCRIPTINGHOST_H_ -#define _SCRIPTINGHOST_H_ +#ifndef INCLUDED_SCRIPTINGHOST +#define INCLUDED_SCRIPTINGHOST #include "ps/Errors.h" diff --git a/source/scripting/SynchedJSObject.h b/source/scripting/SynchedJSObject.h index 63f9002a50..8cea7e85b0 100644 --- a/source/scripting/SynchedJSObject.h +++ b/source/scripting/SynchedJSObject.h @@ -1,8 +1,6 @@ /* CSynchedJSObject - AUTHOR: Simon Brenner - DESCRIPTION: A helper class for CJSObject that enables a callback to be called whenever an attribute of the class changes and enables all (synched) @@ -32,8 +30,8 @@ */ -#ifndef _SynchedJSObject_H -#define _SynchedJSObject_H +#ifndef INCLUDED_SYNCHEDJSOBJECT +#define INCLUDED_SYNCHEDJSOBJECT #include "ps/CStr.h" #include "ScriptableObject.h" diff --git a/source/simulation/AStarEngine.h b/source/simulation/AStarEngine.h index 922b6f4071..4638f70936 100644 --- a/source/simulation/AStarEngine.h +++ b/source/simulation/AStarEngine.h @@ -1,5 +1,5 @@ -#ifndef __ASTAR_ENGINE_H__ -#define __ASTAR_ENGINE_H__ +#ifndef INCLUDED_ASTARENGINE +#define INCLUDED_ASTARENGINE #include "ps/Vector2D.h" #include "ps/Player.h" diff --git a/source/simulation/Aura.h b/source/simulation/Aura.h index f53afba623..d12e2ef0d6 100644 --- a/source/simulation/Aura.h +++ b/source/simulation/Aura.h @@ -1,5 +1,5 @@ -#ifndef __AURA_H__ -#define __AURA_H__ +#ifndef INCLUDED_AURA +#define INCLUDED_AURA #include "EntityHandles.h" #include "maths/Vector4D.h" diff --git a/source/simulation/BoundingObjects.h b/source/simulation/BoundingObjects.h index 1979429e40..9c7b023a09 100644 --- a/source/simulation/BoundingObjects.h +++ b/source/simulation/BoundingObjects.h @@ -1,13 +1,11 @@ // BoundingObjects.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // Bounding circle and object-aligned bounding box. 2D, for simulation code. // // Note: object-aligned bounding boxes are often referred to as oriented bounding boxes (OBBs) -#ifndef BOUNDING_OBJECTS_INCLUDED -#define BOUNDING_OBJECTS_INCLUDED +#ifndef INCLUDED_BOUNDINGOBJECTS +#define INCLUDED_BOUNDINGOBJECTS #include "ps/Vector2D.h" diff --git a/source/simulation/Collision.h b/source/simulation/Collision.h index 582d4ef31d..0464ab5827 100644 --- a/source/simulation/Collision.h +++ b/source/simulation/Collision.h @@ -1,6 +1,4 @@ // Collision.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // Collision detection functions // @@ -12,8 +10,8 @@ // // Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com -#ifndef COLLISION_INCLUDED -#define COLLISION_INCLUDED +#ifndef INCLUDED_COLLISION +#define INCLUDED_COLLISION #include "BoundingObjects.h" diff --git a/source/simulation/Entity.h b/source/simulation/Entity.h index 69e00672b4..a47fca7c64 100644 --- a/source/simulation/Entity.h +++ b/source/simulation/Entity.h @@ -1,7 +1,5 @@ // Entity.h // -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com -// // Entity class. // // Usage: Do not attempt to instantiate this class directly. (See EntityManager.h) @@ -23,8 +21,8 @@ // Also remember to update the collision object if you alter the position directly. // -#ifndef ENTITY_INCLUDED -#define ENTITY_INCLUDED +#ifndef INCLUDED_ENTITY +#define INCLUDED_ENTITY #include #include "scripting/ScriptableComplex.h" diff --git a/source/simulation/EntityFormation.h b/source/simulation/EntityFormation.h index a39ab1c8b1..8d7c4ef227 100644 --- a/source/simulation/EntityFormation.h +++ b/source/simulation/EntityFormation.h @@ -1,11 +1,9 @@ -//Andrew aka pyrolink -//ajdecker1022@msn.com //Instances of this class contain the actual information about in-game formations. //It is based off of Formation.cpp and uses it as a reference as to what can and cannot //be done in this formation. This is represented as m_base. -#ifndef ENTITYFORMATION_INCLUDED -#define ENTITYFORMATION_INCLUDED +#ifndef INCLUDED_ENTITYFORMATION +#define INCLUDED_ENTITYFORMATION #include "ps/Vector2D.h" diff --git a/source/simulation/EntityHandles.h b/source/simulation/EntityHandles.h index fbba56ddf9..1a2fe9e7f8 100644 --- a/source/simulation/EntityHandles.h +++ b/source/simulation/EntityHandles.h @@ -1,6 +1,4 @@ // EntityHandles.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // Entity smart pointer definitions. // @@ -17,8 +15,8 @@ // CEntity pointers will be faster for passing to the graphics subsytem, etc. where they won't be stored. // And yes, most of this /is/ obvious. But it should be said anyway. -#ifndef ENTITY_HANDLE_INCLUDED -#define ENTITY_HANDLE_INCLUDED +#ifndef INCLUDED_ENTITYHANDLES +#define INCLUDED_ENTITYHANDLES #define INVALID_HANDLE 65535 // The maximum numerical value of an entity handle sent over the network diff --git a/source/simulation/EntityManager.h b/source/simulation/EntityManager.h index 647e76ad9a..15ba5d4d14 100644 --- a/source/simulation/EntityManager.h +++ b/source/simulation/EntityManager.h @@ -1,6 +1,4 @@ // EntityManager.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // Maintains entity id->object mappings. Does most of the work involved in creating an entity. // @@ -15,8 +13,8 @@ // // Those last two functions - caller has responsibility for deleting the collection when you're done with it. -#ifndef ENTITY_MANAGER_INCLUDED -#define ENTITY_MANAGER_INCLUDED +#ifndef INCLUDED_ENTITYMANAGER +#define INCLUDED_ENTITYMANAGER #include diff --git a/source/simulation/EntityOrders.h b/source/simulation/EntityOrders.h index 328f321f37..477125d7f0 100644 --- a/source/simulation/EntityOrders.h +++ b/source/simulation/EntityOrders.h @@ -1,6 +1,4 @@ // EntityOrders.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // Entity orders structure. // @@ -32,8 +30,8 @@ // Entities which exhaust all orders from their queue go to idle status; there is no specific order // type for this status. -#ifndef ENTITY_ORDER_INCLUDED -#define ENTITY_ORDER_INCLUDED +#ifndef INCLUDED_ENTITYORDERS +#define INCLUDED_ENTITYORDERS #define ORDER_MAX_DATA 2 diff --git a/source/simulation/EntitySupport.h b/source/simulation/EntitySupport.h index 3649190303..1c24c22db1 100644 --- a/source/simulation/EntitySupport.h +++ b/source/simulation/EntitySupport.h @@ -1,7 +1,7 @@ // Supporting data types for CEntity and related -#ifndef ENTITY_SUPPORT_INCLUDED -#define ENTITY_SUPPORT_INCLUDED +#ifndef INCLUDED_ENTITYSUPPORT +#define INCLUDED_ENTITYSUPPORT #include "ps/CStr.h" diff --git a/source/simulation/EntityTemplate.h b/source/simulation/EntityTemplate.h index f9e9fff365..c41b8c005c 100644 --- a/source/simulation/EntityTemplate.h +++ b/source/simulation/EntityTemplate.h @@ -1,6 +1,4 @@ // EntityTemplate.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // Entity Templates // @@ -14,8 +12,8 @@ // a template in this way. // -#ifndef BASE_ENTITY_INCLUDED -#define BASE_ENTITY_INCLUDED +#ifndef INCLUDED_ENTITYTEMPLATE +#define INCLUDED_ENTITYTEMPLATE #include "ps/CStr.h" diff --git a/source/simulation/EntityTemplateCollection.h b/source/simulation/EntityTemplateCollection.h index 674df7ca0d..16d95c344d 100644 --- a/source/simulation/EntityTemplateCollection.h +++ b/source/simulation/EntityTemplateCollection.h @@ -1,6 +1,4 @@ // EntityTemplateCollection.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // Keeps tabs on the various types of entity that roam the world. // @@ -13,8 +11,8 @@ // name will only be its filename; thus, no two templates should have the same filename, // but subdirectories can be created in entities/ to organize the files nicely. -#ifndef ENTITY_TEMPLATE_COLLECTION_INCLUDED -#define ENTITY_TEMPLATE_COLLECTION_INCLUDED +#ifndef INCLUDED_ENTITYTEMPLATECOLLECTION +#define INCLUDED_ENTITYTEMPLATECOLLECTION #include #include diff --git a/source/simulation/EventHandlers.h b/source/simulation/EventHandlers.h index f73733ac01..38d0bc3833 100644 --- a/source/simulation/EventHandlers.h +++ b/source/simulation/EventHandlers.h @@ -2,8 +2,8 @@ // Using integer tags should be ever-so-slightly faster than the hashmap lookup // Also allows events to be renamed without affecting other code. -#ifndef EVENT_HANDLERS_INCLUDED -#define EVENT_HANDLERS_INCLUDED +#ifndef INCLUDED_EVENTHANDLERS +#define INCLUDED_EVENTHANDLERS #include "scripting/DOMEvent.h" #include "maths/Vector3D.h" diff --git a/source/simulation/Formation.h b/source/simulation/Formation.h index 0d1cdb0def..fd01dc7df4 100644 --- a/source/simulation/Formation.h +++ b/source/simulation/Formation.h @@ -1,9 +1,7 @@ -//Andrew aka pyrolink -//ajdecker1022@msn.com //This class loads all the formation data needs to create an instance of a particular formation. -#ifndef FORMATION_INCLUDED -#define FORMATION_INCLUDED +#ifndef INCLUDED_FORMATION +#define INCLUDED_FORMATION #include #include @@ -81,3 +79,4 @@ private: }; #endif + diff --git a/source/simulation/FormationCollection.h b/source/simulation/FormationCollection.h index 1b47a022a0..3e590f1143 100644 --- a/source/simulation/FormationCollection.h +++ b/source/simulation/FormationCollection.h @@ -1,12 +1,11 @@ //FormationCollection.h -//Andrew aka pyrolink: ajdecker1022@msn.com //Nearly identical to EntityTemplateCollection and associates i.e. EntityTemplate, Entity. //This is the manager of the entity formation "templates" -#ifndef FORMATION_COLLECTION_INCLUDED -#define FORMATION_COLLECTION_INCLUDED +#ifndef INCLUDED_FORMATIONCOLLECTION +#define INCLUDED_FORMATIONCOLLECTION #include #include "ps/CStr.h" diff --git a/source/simulation/FormationManager.h b/source/simulation/FormationManager.h index fbf5394867..b0d6bba9d5 100644 --- a/source/simulation/FormationManager.h +++ b/source/simulation/FormationManager.h @@ -1,9 +1,7 @@ -//Andrew aka pyrolink -//ajdecker1022@msn.com //This keeps track of all the formations exisisting in the game. -#ifndef FORMATIONMANAGER_INCLUDED -#define FORMATIONMANAGER_INCLUDED +#ifndef INCLUDED_FORMATIONMANAGER +#define INCLUDED_FORMATIONMANAGER #include "ps/Singleton.h" #include "scripting/DOMEvent.h" @@ -45,4 +43,4 @@ private: std::vector m_formations; }; -#endif // FORMATIONMANAGER_INCLUDED +#endif // INCLUDED_FORMATIONMANAGER diff --git a/source/simulation/LOSManager.h b/source/simulation/LOSManager.h index ea2cebcb5e..7c0d6f3209 100644 --- a/source/simulation/LOSManager.h +++ b/source/simulation/LOSManager.h @@ -1,6 +1,4 @@ // LOSManager.h -// -// Matei Zaharia matei@sprint.ca / matei@wildfiregames.com // // Maintains and updates line of sight data (including Shroud of Darkness // and Fog of War). @@ -13,8 +11,8 @@ // - GetUnitStatus returns the LOS status of an entity or actor -#ifndef LOS_MANAGER_INCLUDED -#define LOS_MANAGER_INCLUDED +#ifndef INCLUDED_LOSMANAGER +#define INCLUDED_LOSMANAGER class CUnit; class CEntity; diff --git a/source/simulation/PathfindEngine.h b/source/simulation/PathfindEngine.h index 92ab773932..ca566efdf8 100644 --- a/source/simulation/PathfindEngine.h +++ b/source/simulation/PathfindEngine.h @@ -1,6 +1,4 @@ // PathfindEngine.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // The pathfinding engine singleton. // @@ -8,8 +6,8 @@ // // Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com -#ifndef PATHFIND_ENGINE_INCLUDED -#define PATHFIND_ENGINE_INCLUDED +#ifndef INCLUDED_PATHFINDENGINE +#define INCLUDED_PATHFINDENGINE #include "ps/Singleton.h" #include "EntityHandles.h" diff --git a/source/simulation/PathfindSparse.h b/source/simulation/PathfindSparse.h index f7770f2300..79ce68a94e 100644 --- a/source/simulation/PathfindSparse.h +++ b/source/simulation/PathfindSparse.h @@ -1,6 +1,4 @@ // PathfindSparse.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // Sparse pathfinder. // @@ -19,8 +17,8 @@ // // Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com -#ifndef PATHFIND_SPARSE_INCLUDED -#define PATHFIND_SPARSE_INCLUDED +#ifndef INCLUDED_PATHFINDSPARSE +#define INCLUDED_PATHFINDSPARSE #include "EntityHandles.h" #include "ps/Vector2D.h" diff --git a/source/simulation/ProductionQueue.h b/source/simulation/ProductionQueue.h index 3056446247..f7fe0a118a 100644 --- a/source/simulation/ProductionQueue.h +++ b/source/simulation/ProductionQueue.h @@ -1,5 +1,5 @@ -#ifndef __PRODUCTIONQUEUE_H__ -#define __PRODUCTIONQUEUE_H__ +#ifndef INCLUDED_PRODUCTIONQUEUE +#define INCLUDED_PRODUCTIONQUEUE #include "EntityHandles.h" #include "scripting/ScriptableObject.h" diff --git a/source/simulation/Projectile.h b/source/simulation/Projectile.h index 0783f52182..3acf53e336 100644 --- a/source/simulation/Projectile.h +++ b/source/simulation/Projectile.h @@ -1,11 +1,9 @@ // Projectile.h // // Simple class that represents a single projectile in the simulation. -// -// Mark Thompson (mot20@cam.ac.uk / mark@wildfiregames.com) -#ifndef PROJECTILE_INCLUDED -#define PROJECTILE_INCLUDED +#ifndef INCLUDED_PROJECTILE +#define INCLUDED_PROJECTILE #include "maths/Vector3D.h" #include "ps/Vector2D.h" diff --git a/source/simulation/Scheduler.h b/source/simulation/Scheduler.h index c2e12a3f03..7c21459482 100644 --- a/source/simulation/Scheduler.h +++ b/source/simulation/Scheduler.h @@ -1,12 +1,10 @@ // Scheduler.h -// -// Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com // // Message scheduler // -#ifndef SCHEDULER_INCLUDED -#define SCHEDULER_INCLUDED +#ifndef INCLUDED_SCHEDULER +#define INCLUDED_SCHEDULER #include #include diff --git a/source/simulation/ScriptObject.h b/source/simulation/ScriptObject.h index be1a439b5f..221503f7cf 100644 --- a/source/simulation/ScriptObject.h +++ b/source/simulation/ScriptObject.h @@ -1,10 +1,8 @@ // A generic type and some helper functions // for scripts -// Mark Thompson (mark@wildfiregames.com / mot20@cam.ac.uk) - -#ifndef SCRIPTOBJECT_INCLUDED -#define SCRIPTOBJECT_INCLUDED +#ifndef INCLUDED_SCRIPTOBJECT +#define INCLUDED_SCRIPTOBJECT #include "scripting/SpiderMonkey.h" diff --git a/source/simulation/Simulation.h b/source/simulation/Simulation.h index e75e62baa9..a7ce34ca98 100644 --- a/source/simulation/Simulation.h +++ b/source/simulation/Simulation.h @@ -1,5 +1,5 @@ -#ifndef _Simulation_H -#define _Simulation_H +#ifndef INCLUDED_SIMULATION +#define INCLUDED_SIMULATION #include diff --git a/source/simulation/Stance.h b/source/simulation/Stance.h index 51625f2f51..e681cf9a59 100644 --- a/source/simulation/Stance.h +++ b/source/simulation/Stance.h @@ -1,5 +1,5 @@ -#ifndef __STANCE_H__ -#define __STANCE_H__ +#ifndef INCLUDED_STANCE +#define INCLUDED_STANCE #include "ps/Vector2D.h" diff --git a/source/simulation/Technology.h b/source/simulation/Technology.h index 26315e01dd..680603b2f8 100644 --- a/source/simulation/Technology.h +++ b/source/simulation/Technology.h @@ -1,14 +1,11 @@ -// Andrew aka pyrolink -// ajdecker1022@msn.com -// // Holds effects of a technology (research item), as well as its status // (unavailable, researched, in progress, etc). // // There is a separate CTechnology object for each tech for each player, // because the status can be different for different players. -#ifndef TECHNOLOGY_INCLUDED -#define TECHNOLOGY_INCLUDED +#ifndef INCLUDED_TECHNOLOGY +#define INCLUDED_TECHNOLOGY #include #include "scripting/ScriptableComplex.h" diff --git a/source/simulation/TechnologyCollection.h b/source/simulation/TechnologyCollection.h index 5be13ce596..3d8bc8cfd4 100644 --- a/source/simulation/TechnologyCollection.h +++ b/source/simulation/TechnologyCollection.h @@ -1,9 +1,8 @@ -//Andrew aka pyrolink - ajdecker1022@msn.com //Manages the tech templates. More detail: see CFormation and CEntityTemplate (collections) -#ifndef TECHNOLOGY_COLLECTION_INCLUDED -#define TECHNOLOGY_COLLECTION_INCLUDED +#ifndef INCLUDED_TECHNOLOGYCOLLECTION +#define INCLUDED_TECHNOLOGYCOLLECTION #include "ps/CStr.h" #include "ps/Singleton.h" diff --git a/source/simulation/TerritoryManager.h b/source/simulation/TerritoryManager.h index 468893f9d3..516e5a5d25 100644 --- a/source/simulation/TerritoryManager.h +++ b/source/simulation/TerritoryManager.h @@ -1,14 +1,12 @@ // TerritoryManager.h -// -// Matei Zaharia matei@sprint.ca / matei@wildfiregames.com // // Calculates territory boundaries and maintains territory data. // // Usage: -#ifndef TERRITORY_MANAGER_INCLUDED -#define TERRITORY_MANAGER_INCLUDED +#ifndef INCLUDED_TERRITORYMANAGER +#define INCLUDED_TERRITORYMANAGER #include "ps/Vector2D.h" #include "maths/Vector3D.h" diff --git a/source/simulation/TriggerManager.h b/source/simulation/TriggerManager.h index d541a6c2f7..e67249a0c8 100644 --- a/source/simulation/TriggerManager.h +++ b/source/simulation/TriggerManager.h @@ -1,11 +1,9 @@ //======================================================== -//Andrew Decker aka pyrolink -//ajdecker1022@msn.com //Description: Manages loading trigger specs (format in Atlas) and updating trigger objects //======================================================= -#ifndef TRIGGERMANAGER_INCLUDED -#define TRIGGERMANAGER_INCLUDED +#ifndef INCLUDED_TRIGGERMANAGER +#define INCLUDED_TRIGGERMANAGER #include "ps/Singleton.h" #include "scripting/ScriptableObject.h" @@ -220,4 +218,4 @@ private: #define g_TriggerManager CTriggerManager::GetSingleton() -#endif //ifndef TRIGGERMANAGER_INCLUDED +#endif //ifndef INCLUDED_TRIGGERMANAGER diff --git a/source/simulation/TurnManager.h b/source/simulation/TurnManager.h index 4422526b64..f94c96636e 100644 --- a/source/simulation/TurnManager.h +++ b/source/simulation/TurnManager.h @@ -1,5 +1,5 @@ -#ifndef _simulation_TurnManager_H -#define _simulation_TurnManager_H +#ifndef INCLUDED_TURNMANAGER +#define INCLUDED_TURNMANAGER //#include "Network/NetMessage.h" //#include "Network/Network.h" diff --git a/source/sound/CMusicPlayer.h b/source/sound/CMusicPlayer.h index 943b01e767..f5171b64f1 100644 --- a/source/sound/CMusicPlayer.h +++ b/source/sound/CMusicPlayer.h @@ -1,5 +1,5 @@ -#ifndef CMUSICPLAYER_H -#define CMUSICPLAYER_H +#ifndef INCLUDED_CMUSICPLAYER +#define INCLUDED_CMUSICPLAYER #include #include diff --git a/source/sound/CPlayList.h b/source/sound/CPlayList.h index 6b334ac640..03ab0a5fe2 100644 --- a/source/sound/CPlayList.h +++ b/source/sound/CPlayList.h @@ -1,5 +1,5 @@ -#ifndef CPLAYLIST_H -#define CPLAYLIST_H +#ifndef INCLUDED_CPLAYLIST +#define INCLUDED_CPLAYLIST #include #include diff --git a/source/sound/JSI_Sound.h b/source/sound/JSI_Sound.h index cd8803aea1..de07cf9773 100644 --- a/source/sound/JSI_Sound.h +++ b/source/sound/JSI_Sound.h @@ -1,6 +1,4 @@ // JS sound binding -// -// Jan Wassenberg (jan@wildfiregames.com) // interface rationale: // - can't just expose fire and forget playSound to script code: @@ -14,8 +12,8 @@ // - instead, we provide a thin class wrapper (using scriptableobject.h) // on top of the snd API that encapsulates the Handle. -#ifndef JSSOUND_INCLUDED -#define JSSOUND_INCLUDED +#ifndef INCLUDED_JSI_SOUND +#define INCLUDED_JSI_SOUND #include "scripting/ScriptableObject.h" #include "lib/res/handle.h" @@ -63,4 +61,4 @@ private: bool m_SoundDisabled; // see constructor and JSI_Sound::Construct }; -#endif // #ifndef JSSOUND_INCLUDED +#endif // #ifndef INCLUDED_JSI_SOUND diff --git a/source/sound/SoundGroup.cpp b/source/sound/SoundGroup.cpp index 95060e6480..86f3c0b65a 100644 --- a/source/sound/SoundGroup.cpp +++ b/source/sound/SoundGroup.cpp @@ -4,22 +4,20 @@ * Project : 0 A.D. * Description : Loads up a group of sound files with shared properties, * and provides a simple interface for playing them. -* -* Author : Gavin Fowler * ========================================================================= */ /* -* Copyright (c) 2005-2006 Gavin Fowler -* -* Redistribution and/or modification are also permitted under the -* terms of the GNU General Public License as published by the -* Free Software Foundation (version 2 or later, at your option). -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ + * Copyright (c) 2005-2006 Gavin Fowler + * + * Redistribution and/or modification are also permitted under the + * terms of the GNU General Public License as published by the + * Free Software Foundation (version 2 or later, at your option). + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ #include "precompiled.h" diff --git a/source/sound/SoundGroup.h b/source/sound/SoundGroup.h index dd6f4e9fbe..2a3fe35995 100644 --- a/source/sound/SoundGroup.h +++ b/source/sound/SoundGroup.h @@ -4,22 +4,20 @@ * Project : 0 A.D. * Description : Loads up a group of sound files with shared properties, * and provides a simple interface for playing them. -* -* Author : Gavin Fowler * ========================================================================= */ /* -* Copyright (c) 2005-2006 Gavin Fowler -* -* Redistribution and/or modification are also permitted under the -* terms of the GNU General Public License as published by the -* Free Software Foundation (version 2 or later, at your option). -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ + * Copyright (c) 2005-2006 Gavin Fowler + * + * Redistribution and/or modification are also permitted under the + * terms of the GNU General Public License as published by the + * Free Software Foundation (version 2 or later, at your option). + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ /* Example usage: (SEE SOUNDGROUPMGR.H) @@ -46,8 +44,8 @@ Example SoundGroup.xml */ -#ifndef SOUNDGROUP_H_ -#define SOUNDGROUP_H_ +#ifndef INCLUDED_SOUNDGROUP +#define INCLUDED_SOUNDGROUP #include "lib/res/handle.h" #include "ps/CStr.h" @@ -122,4 +120,4 @@ public: }; -#endif //#ifndef SOUNDGROUP_H_ +#endif //#ifndef INCLUDED_SOUNDGROUP diff --git a/source/sound/SoundGroupMgr.cpp b/source/sound/SoundGroupMgr.cpp index 5bfcad1344..8a5a1b0f04 100644 --- a/source/sound/SoundGroupMgr.cpp +++ b/source/sound/SoundGroupMgr.cpp @@ -3,22 +3,20 @@ * File : SoundGroupMgr.h * Project : 0 A.D. * Description : Manages and updates SoundGroups -* -* Author : Gavin Fowler * ========================================================================= */ /* -* Copyright (c) 2005-2006 Gavin Fowler -* -* Redistribution and/or modification are also permitted under the -* terms of the GNU General Public License as published by the -* Free Software Foundation (version 2 or later, at your option). -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ + * Copyright (c) 2005-2006 Gavin Fowler + * + * Redistribution and/or modification are also permitted under the + * terms of the GNU General Public License as published by the + * Free Software Foundation (version 2 or later, at your option). + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ // Example usage: diff --git a/source/sound/SoundGroupMgr.h b/source/sound/SoundGroupMgr.h index ba5c5533c7..f3c0d6439f 100644 --- a/source/sound/SoundGroupMgr.h +++ b/source/sound/SoundGroupMgr.h @@ -3,23 +3,21 @@ * File : SoundGroupMgr.h * Project : 0 A.D. * Description : Manages and updates SoundGroups -* -* Author : Gavin Fowler * ========================================================================= */ /* -* Copyright (c) 2005-2006 Gavin Fowler -* -* Redistribution and/or modification are also permitted under the -* terms of the GNU General Public License as published by the -* Free Software Foundation (version 2 or later, at your option). -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ + * Copyright (c) 2005-2006 Gavin Fowler + * + * Redistribution and/or modification are also permitted under the + * terms of the GNU General Public License as published by the + * Free Software Foundation (version 2 or later, at your option). + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ #include "SoundGroup.h" #include diff --git a/source/tools/ape/ext/MathUtil.h b/source/tools/ape/ext/MathUtil.h index 62224344c5..08b7605a8d 100644 --- a/source/tools/ape/ext/MathUtil.h +++ b/source/tools/ape/ext/MathUtil.h @@ -1,9 +1,6 @@ //*********************************************************** // // Name: MathUtil.H -// Last Update: 28/1/02 -// Author: Poya Manouchehri -// // Description: This file contains some maths related // utility macros and fucntions. // diff --git a/source/tools/ape/ext/Particle.cpp b/source/tools/ape/ext/Particle.cpp index f24aa8c0f5..f900dbae40 100644 --- a/source/tools/ape/ext/Particle.cpp +++ b/source/tools/ape/ext/Particle.cpp @@ -4,12 +4,6 @@ | |=================================================================== | -| Author: Ben Vinegar -| Contact: benvinegar () hotmail ! com -| -| -| Last Modified: 03/08/04 -| | Overview: A single particle, currently only utilized by | CParticleEmitter. Public variables are for performance | reasons. @@ -17,11 +11,6 @@ | | Usage: Instantiate a particle, set public variables, then call | Frame() every frame. -| -| To do: TBA -| -| More Information: TBA -| ==================================================================*/ #include "Particle.h" diff --git a/source/tools/ape/ext/Particle.h b/source/tools/ape/ext/Particle.h index 8e239b2232..df7efc2e09 100644 --- a/source/tools/ape/ext/Particle.h +++ b/source/tools/ape/ext/Particle.h @@ -4,12 +4,6 @@ | |=================================================================== | -| Author: Ben Vinegar -| Contact: benvinegar () hotmail ! com -| -| -| Last Modified: 03/08/04 -| | Overview: A single particle, currently only utilized by | CParticleEmitter. Public variables are for performance | reasons. @@ -17,11 +11,6 @@ | | Usage: Instantiate a particle, set public variables, then call | Frame() every frame. -| -| To do: TBA -| -| More Information: TBA -| ==================================================================*/ #ifndef PARTICLE_H @@ -70,4 +59,4 @@ public: }; -#endif // PARTICLE_H \ No newline at end of file +#endif // PARTICLE_H diff --git a/source/tools/ape/ext/ParticleEmitter.cpp b/source/tools/ape/ext/ParticleEmitter.cpp index 9eac3a2e6f..3aa650331a 100644 --- a/source/tools/ape/ext/ParticleEmitter.cpp +++ b/source/tools/ape/ext/ParticleEmitter.cpp @@ -4,12 +4,6 @@ | |=================================================================== | -| Author: Ben Vinegar -| Contact: benvinegar () hotmail ! com -| -| -| Last Modified: 05/11/04 -| | Overview: Particle emitter class that emits particles from | an origin (or area) with a variety of set colours, | durations, forces and a single common sprite. @@ -19,11 +13,6 @@ | various fields (preferably all, the defaults are rather | boring) and then call Frame() - you guessed it - every | frame. -| -| To do: TBA -| -| More Information: TBA -| ==================================================================*/ #include "ParticleEmitter.h" diff --git a/source/tools/ape/ext/ParticleEmitter.h b/source/tools/ape/ext/ParticleEmitter.h index 1133ccaee3..066ef12bbe 100644 --- a/source/tools/ape/ext/ParticleEmitter.h +++ b/source/tools/ape/ext/ParticleEmitter.h @@ -4,12 +4,6 @@ | |=================================================================== | -| Author: Ben Vinegar -| Contact: benvinegar () hotmail ! com -| -| -| Last Modified: 03/08/04 -| | Overview: Particle emitter class that emits particles from | an origin (or area) with a variety of set colours, | durations, forces and a single common sprite. @@ -19,11 +13,6 @@ | various fields (preferably all, the defaults are rather | boring) and then call Frame() - you guessed it - every | frame. -| -| To do: TBA -| -| More Information: TBA -| ==================================================================*/ #ifndef PARTICLE_EMITTER_H diff --git a/source/tools/ape/ext/ParticleSystem.cpp b/source/tools/ape/ext/ParticleSystem.cpp index ef3c127b7b..363bf334b4 100644 --- a/source/tools/ape/ext/ParticleSystem.cpp +++ b/source/tools/ape/ext/ParticleSystem.cpp @@ -4,20 +4,6 @@ | |=================================================================== | -| Author: Ben Vinegar -| Contact: benvinegar () hotmail ! com -| -| -| Last Modified: 04/23/04 -| -| Overview: TBA -| -| Usage: TBA -| -| To do: TBA -| -| More Information: TBA -| ==================================================================*/ #include "ParticleSystem.h" @@ -77,4 +63,4 @@ CParticleEmitter * CParticleSystem::CreateNewEmitter() m_Emitters.push_back(newEmitter); return newEmitter; -} \ No newline at end of file +} diff --git a/source/tools/ape/ext/ParticleSystem.h b/source/tools/ape/ext/ParticleSystem.h index db504d2214..3cb39a5458 100644 --- a/source/tools/ape/ext/ParticleSystem.h +++ b/source/tools/ape/ext/ParticleSystem.h @@ -4,20 +4,6 @@ | |=================================================================== | -| Author: Ben Vinegar -| Contact: benvinegar () hotmail ! com -| -| -| Last Modified: 04/23/04 -| -| Overview: TBA -| -| Usage: TBA -| -| To do: TBA -| -| More Information: TBA -| ==================================================================*/ #ifndef PARTICLE_SYSTEM_H @@ -42,4 +28,4 @@ private: }; -#endif // PARTICLE_SYSTEM_H \ No newline at end of file +#endif // PARTICLE_SYSTEM_H diff --git a/source/tools/ape/ext/Sprite.cpp b/source/tools/ape/ext/Sprite.cpp index c0f0cee57e..f405b50dca 100644 --- a/source/tools/ape/ext/Sprite.cpp +++ b/source/tools/ape/ext/Sprite.cpp @@ -4,12 +4,6 @@ | |=================================================================== | -| Author: Ben Vinegar -| Contact: benvinegar () hotmail ! com -| -| -| Last Modified: 03/08/04 -| | Overview: Billboarding sprite class - always faces the camera. It | does this by getting the current model view matrix state. | @@ -18,10 +12,6 @@ | sure to pass a loaded (using tex_load()) texture before | calling Render(). | -| To do: TBA -| -| More Information: TBA -| ==================================================================*/ #include "Sprite.h" diff --git a/source/tools/ape/ext/Sprite.h b/source/tools/ape/ext/Sprite.h index c3645a1daa..7747d7b947 100644 --- a/source/tools/ape/ext/Sprite.h +++ b/source/tools/ape/ext/Sprite.h @@ -4,12 +4,6 @@ | |=================================================================== | -| Author: Ben Vinegar -| Contact: benvinegar () hotmail ! com -| -| -| Last Modified: 03/08/04 -| | Overview: Billboarding sprite class - always faces the camera. It | does this by getting the current model view matrix state. | @@ -18,10 +12,6 @@ | sure to pass a loaded (using tex_load()) texture before | calling Render(). | -| To do: TBA -| -| More Information: TBA -| ==================================================================*/ #ifndef SPRITE_H @@ -83,4 +73,4 @@ private: float m_colour[4]; }; -#endif // SPRITE_H \ No newline at end of file +#endif // SPRITE_H diff --git a/source/tools/ape/ext/Types.h b/source/tools/ape/ext/Types.h index abfd6c21cc..1bf2e03266 100644 --- a/source/tools/ape/ext/Types.h +++ b/source/tools/ape/ext/Types.h @@ -1,8 +1,6 @@ //*********************************************************** // // Name: Types.h -// Last Update: 25/1/02 -// Author: Poya Manouchehri // // Description: The basic types used by the engine // @@ -59,4 +57,4 @@ class CVector3D; class CWorld; -#endif \ No newline at end of file +#endif diff --git a/source/tools/ape/ext/Vector3D.cpp b/source/tools/ape/ext/Vector3D.cpp index 96d6b7f970..189de98ad5 100644 --- a/source/tools/ape/ext/Vector3D.cpp +++ b/source/tools/ape/ext/Vector3D.cpp @@ -1,8 +1,6 @@ //*********************************************************** // // Name: Vector3D.Cpp -// Last Update: 28/1/02 -// Author: Poya Manouchehri // // Description: Provides an interface for a vector in R3 and // allows vector and scalar operations on it diff --git a/source/tools/ape/ext/Vector3D.h b/source/tools/ape/ext/Vector3D.h index ed7166992c..65f835e91b 100644 --- a/source/tools/ape/ext/Vector3D.h +++ b/source/tools/ape/ext/Vector3D.h @@ -1,8 +1,6 @@ //*********************************************************** // // Name: Vector3D.H -// Last Update: 28/1/02 -// Author: Poya Manouchehri // // Description: Provides an interface for a vector in R3 and // allows vector and scalar operations on it diff --git a/source/tools/ape/main.cpp b/source/tools/ape/main.cpp index 35a410b154..3fc972b5d1 100644 --- a/source/tools/ape/main.cpp +++ b/source/tools/ape/main.cpp @@ -4,13 +4,6 @@ |============================================================== | | Desc: main.cpp -| -| Author: Ben Vinegar -| Contact benvinegar () hotmail ! com -| -| Last Modified: 3/11/04 -| -| www.wildfiregames.com/0ad =============================================================*/ //-------------------------------------------------------- diff --git a/source/tools/atlas/AtlasObject/AtlasObject.h b/source/tools/atlas/AtlasObject/AtlasObject.h index afbfb9a0b4..68d9a20858 100644 --- a/source/tools/atlas/AtlasObject/AtlasObject.h +++ b/source/tools/atlas/AtlasObject/AtlasObject.h @@ -4,8 +4,8 @@ // Tries to include as few headers as possible, to minimise its impact // on compile times. -#ifndef ATLASOBJECT_H__ -#define ATLASOBJECT_H__ +#ifndef INCLUDED_ATLASOBJECT +#define INCLUDED_ATLASOBJECT #include // for wchar_t @@ -137,4 +137,4 @@ namespace AtlasObject AtObj TrimEmptyChildren(AtObj& obj); } -#endif // ATLASOBJECT_H__ +#endif // INCLUDED_ATLASOBJECT diff --git a/source/tools/atlas/AtlasUI/CustomControls/ColourDialog/ColourDialog.h b/source/tools/atlas/AtlasUI/CustomControls/ColourDialog/ColourDialog.h index ad98830d3b..0b4ec7d4fe 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/ColourDialog/ColourDialog.h +++ b/source/tools/atlas/AtlasUI/CustomControls/ColourDialog/ColourDialog.h @@ -1,5 +1,5 @@ -#ifndef COLOURDIALOG_H__ -#define COLOURDIALOG_H__ +#ifndef INCLUDED_COLOURDIALOG +#define INCLUDED_COLOURDIALOG #include @@ -15,4 +15,4 @@ private: wxString m_ConfigPath; }; -#endif // COLOURDIALOG_H__ +#endif // INCLUDED_COLOURDIALOG diff --git a/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.h b/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.h index 29e26d3ac6..5950b4e949 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.h +++ b/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.h @@ -1,5 +1,5 @@ -#ifndef DRAGGABLELISTCTRL_H__ -#define DRAGGABLELISTCTRL_H__ +#ifndef INCLUDED_DRAGGABLELISTCTRL +#define INCLUDED_DRAGGABLELISTCTRL /* DraggableListCtrl @@ -39,4 +39,4 @@ private: DECLARE_EVENT_TABLE(); }; -#endif // DRAGGABLELISTCTRL_H__ +#endif // INCLUDED_DRAGGABLELISTCTRL diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h index a90a257c0e..4a4de3a62d 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h +++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h @@ -1,5 +1,5 @@ -#ifndef EDITABLELISTCTRL_H__ -#define EDITABLELISTCTRL_H__ +#ifndef INCLUDED_EDITABLELISTCTRL +#define INCLUDED_EDITABLELISTCTRL #include "wx/listctrl.h" @@ -96,4 +96,4 @@ protected: DECLARE_EVENT_TABLE(); }; -#endif // EDITABLELISTCTRL_H__ +#endif // INCLUDED_EDITABLELISTCTRL diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.h b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.h index 19974c1e1b..d911164235 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.h +++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.h @@ -1,5 +1,5 @@ -#ifndef FIELDEDITCTRL_H__ -#define FIELDEDITCTRL_H__ +#ifndef INCLUDED_FIELDEDITCTRL +#define INCLUDED_FIELDEDITCTRL class EditableListCtrl; class AtlasDialog; @@ -78,4 +78,4 @@ private: wxString m_RememberedDir; }; -#endif // FIELDEDITCTRL_H__ +#endif // INCLUDED_FIELDEDITCTRL diff --git a/source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h b/source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h index 113f8ca45c..f361534fec 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h +++ b/source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h @@ -1,5 +1,5 @@ -#ifndef FILEHISTORY_H__ -#define FILEHISTORY_H__ +#ifndef INCLUDED_FILEHISTORY +#define INCLUDED_FILEHISTORY #include "wx/docview.h" @@ -14,4 +14,4 @@ private: wxString m_configSubdir; }; -#endif // FILEHISTORY_H__ +#endif // INCLUDED_FILEHISTORY diff --git a/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp b/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp index aaf0ef5570..95fce32c2b 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp @@ -1,12 +1,9 @@ -#include "stdafx.h" - ///////////////////////////////////////////////////////////////////////////// // Name: wxVirtualDirTreeCtrl.cpp -// Author: XX -// Created: Saturday, March 27, 2004 14:15:56 -// Copyright: XX ///////////////////////////////////////////////////////////////////////////// +#include "stdafx.h" + //#ifdef __GNUG__ // #pragma implementation "wxVirtualDirTreeCtrl.cpp" //#endif @@ -617,3 +614,4 @@ void wxVirtualDirTreeCtrl::OnDirectoryScanEnd(VdtcTreeItemBaseArray &WXUNUSED(it return; } + diff --git a/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h b/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h index c3830c60ef..51b1c3b3d4 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h +++ b/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h @@ -1,12 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wxVirtualDirTreeCtrl.h -// Author: XX -// Created: Saturday, March 27, 2004 14:15:56 -// Copyright: XX ///////////////////////////////////////////////////////////////////////////// -#ifndef __WXVIRTUALDIRTREECTRL_H__ -#define __WXVIRTUALDIRTREECTRL_H__ +#ifndef INCLUDED_VIRTUALDIRTREECTRL +#define INCLUDED_VIRTUALDIRTREECTRL //#ifdef __GNUG__ // #pragma interface "virtualdirtreectrl.cpp" diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h index d690a008b7..a99e5e8115 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h +++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h @@ -1,5 +1,5 @@ -#ifndef ATLASDIALOG_H__ -#define ATLASDIALOG_H__ +#ifndef INCLUDED_ATLASDIALOG +#define INCLUDED_ATLASDIALOG #include "wx/dialog.h" @@ -32,4 +32,4 @@ private: DECLARE_EVENT_TABLE() }; -#endif // ATLASDIALOG_H__ +#endif // INCLUDED_ATLASDIALOG diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h index a5d057df80..b030b919d7 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h +++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h @@ -1,5 +1,5 @@ -#ifndef ATLASWINDOW_H__ -#define ATLASWINDOW_H__ +#ifndef INCLUDED_ATLASWINDOW +#define INCLUDED_ATLASWINDOW #include "General/AtlasWindowCommandProc.h" @@ -78,4 +78,4 @@ private: DECLARE_EVENT_TABLE(); }; -#endif // ATLASWINDOW_H__ +#endif // INCLUDED_ATLASWINDOW diff --git a/source/tools/atlas/AtlasUI/General/AtlasEventLoop.h b/source/tools/atlas/AtlasUI/General/AtlasEventLoop.h index f3b354981a..7766d4bb1e 100644 --- a/source/tools/atlas/AtlasUI/General/AtlasEventLoop.h +++ b/source/tools/atlas/AtlasUI/General/AtlasEventLoop.h @@ -1,5 +1,5 @@ -#ifndef ATLASEVENTLOOP_H__ -#define ATLASEVENTLOOP_H__ +#ifndef INCLUDED_ATLASEVENTLOOP +#define INCLUDED_ATLASEVENTLOOP /* Disabled (and should be removed if it turns out to be unnecessary) - see MessagePasserImpl.cpp for information @@ -26,4 +26,4 @@ public: */ -#endif // ATLASEVENTLOOP_H__ +#endif // INCLUDED_ATLASEVENTLOOP diff --git a/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h b/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h index 4aa2a36d96..87b0fc155c 100644 --- a/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h +++ b/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h @@ -1,5 +1,5 @@ -#ifndef ATLASWINDOWCOMMAND_H__ -#define ATLASWINDOWCOMMAND_H__ +#ifndef INCLUDED_ATLASWINDOWCOMMAND +#define INCLUDED_ATLASWINDOWCOMMAND #include "wx/cmdproc.h" #include "AtlasObject/AtlasObject.h" @@ -59,4 +59,4 @@ public: }; -#endif // ATLASWINDOWCOMMANDPROC_H__ +#endif // INCLUDED_ATLASWINDOWCOMMAND diff --git a/source/tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h b/source/tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h index 215d06d0cc..095c83d002 100644 --- a/source/tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h +++ b/source/tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h @@ -1,5 +1,5 @@ -#ifndef ATLASWINDOWCOMMANDPROC_H__ -#define ATLASWINDOWCOMMANDPROC_H__ +#ifndef INCLUDED_ATLASWINDOWCOMMANDPROC +#define INCLUDED_ATLASWINDOWCOMMANDPROC #include "wx/cmdproc.h" @@ -15,4 +15,4 @@ public: static AtlasWindowCommandProc* GetFromParentFrame(wxWindow* object); }; -#endif // ATLASWINDOWCOMMANDPROC_H__ +#endif // INCLUDED_ATLASWINDOWCOMMANDPROC diff --git a/source/tools/atlas/AtlasUI/General/IAtlasSerialiser.h b/source/tools/atlas/AtlasUI/General/IAtlasSerialiser.h index a7d992aa3a..08d8d09185 100644 --- a/source/tools/atlas/AtlasUI/General/IAtlasSerialiser.h +++ b/source/tools/atlas/AtlasUI/General/IAtlasSerialiser.h @@ -1,5 +1,5 @@ -#ifndef IATLASSERIALISER_H__ -#define IATLASSERIALISER_H__ +#ifndef INCLUDED_IATLASSERIALISER +#define INCLUDED_IATLASSERIALISER #include "AtlasObject/AtlasObject.h" @@ -26,4 +26,4 @@ public: virtual AtObj ExportData() { return FreezeData(); } }; -#endif // IATLASSERIALISER_H__ +#endif // INCLUDED_IATLASSERIALISER diff --git a/source/tools/atlas/AtlasUI/General/Observable.h b/source/tools/atlas/AtlasUI/General/Observable.h index e1990d8e5b..d36679293e 100644 --- a/source/tools/atlas/AtlasUI/General/Observable.h +++ b/source/tools/atlas/AtlasUI/General/Observable.h @@ -1,5 +1,5 @@ -#ifndef OBSERVABLE_H__ -#define OBSERVABLE_H__ +#ifndef INCLUDED_OBSERVABLE +#define INCLUDED_OBSERVABLE /* Wrapper around Boost.Signals to make watching objects for changes more convenient. @@ -96,4 +96,4 @@ private: std::vector m_Conns; }; -#endif // OBSERVABLE_H__ +#endif // INCLUDED_OBSERVABLE diff --git a/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.cpp b/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.cpp index 8cdc77ce63..5d8f1afbfa 100644 --- a/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.cpp +++ b/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.cpp @@ -25,6 +25,9 @@ Please complain if I forget to do those things. #endif #include "FFmpeg.h" +#if _MSC_VER // HACK +#define vsnprintf _vsnprintf +#endif #ifdef _MSC_VER # pragma warning(disable: 4100 4505 4510 4610) diff --git a/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.h b/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.h index acd53d89b0..2b67f2ea9b 100644 --- a/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.h +++ b/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.h @@ -1,5 +1,5 @@ -#ifndef FFMPEG_H__ -#define FFMPEG_H__ +#ifndef INCLUDED_FFMPEG +#define INCLUDED_FFMPEG struct VideoEncoderImpl; @@ -14,4 +14,4 @@ private: VideoEncoderImpl* m; }; -#endif // FFMPEG_H__ +#endif // INCLUDED_FFMPEG diff --git a/source/tools/atlas/AtlasUI/General/VideoRecorder/VideoRecorder.h b/source/tools/atlas/AtlasUI/General/VideoRecorder/VideoRecorder.h index 620618a2c7..c5010579e1 100644 --- a/source/tools/atlas/AtlasUI/General/VideoRecorder/VideoRecorder.h +++ b/source/tools/atlas/AtlasUI/General/VideoRecorder/VideoRecorder.h @@ -1,5 +1,5 @@ -#ifndef VIDEORECORDER_H__ -#define VIDEORECORDER_H__ +#ifndef INCLUDED_VIDEORECORDER +#define INCLUDED_VIDEORECORDER class VideoRecorder { @@ -7,4 +7,4 @@ public: static void RecordCinematic(wxWindow* window, const wxString& trackName, float duration); }; -#endif // VIDEORECORDER_H__ +#endif // INCLUDED_VIDEORECORDER diff --git a/source/tools/atlas/AtlasUI/Misc/DLLInterface.h b/source/tools/atlas/AtlasUI/Misc/DLLInterface.h index 965682187b..f41e0d86eb 100644 --- a/source/tools/atlas/AtlasUI/Misc/DLLInterface.h +++ b/source/tools/atlas/AtlasUI/Misc/DLLInterface.h @@ -13,3 +13,5 @@ ATLASDLLIMPEXP void Atlas_NotifyEndOfFrame(); ATLASDLLIMPEXP void Atlas_DisplayError(const wchar_t* text, unsigned int flags); ATLASDLLIMPEXP void Atlas_ReportError(); + +ATLASDLLIMPEXP void Atlas_ReportError(); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h index c247640b6f..b21e43ba49 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h @@ -1,5 +1,5 @@ -#ifndef SCENARIOEDITOR_H__ -#define SCENARIOEDITOR_H__ +#ifndef INCLUDED_SCENARIOEDITOR +#define INCLUDED_SCENARIOEDITOR #include "General/AtlasWindowCommandProc.h" #include "CustomControls/FileHistory/FileHistory.h" @@ -47,4 +47,4 @@ private: DECLARE_EVENT_TABLE(); }; -#endif // SCENARIOEDITOR_H__ +#endif // INCLUDED_SCENARIOEDITOR diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h index eb9b77561f..7d35145cb3 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h @@ -1,5 +1,5 @@ -#ifndef SECTIONLAYOUT_H__ -#define SECTIONLAYOUT_H__ +#ifndef INCLUDED_SECTIONLAYOUT +#define INCLUDED_SECTIONLAYOUT #include #include @@ -29,4 +29,4 @@ private: std::map m_PageMappings; }; -#endif // SECTIONLAYOUT_H__ +#endif // INCLUDED_SECTIONLAYOUT diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.h index a96a068f88..cfcdbb6f1a 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.h @@ -1,5 +1,4 @@ -/* Andrew Decker, a.k.a pyrolink - Contact ajdecker1022@msn.com +/* Desc: receives user input and communicates with the engine to perform various cinematic functions. */ diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Common/Sidebar.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Common/Sidebar.h index 891bf037ae..845fc27a0e 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Common/Sidebar.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Common/Sidebar.h @@ -1,5 +1,5 @@ -#ifndef SIDEBAR_H__ -#define SIDEBAR_H__ +#ifndef INCLUDED_SIDEBAR +#define INCLUDED_SIDEBAR class Sidebar : public wxPanel { @@ -27,4 +27,4 @@ private: bool m_AlreadyDisplayed; }; -#endif // SIDEBAR_H__ +#endif // INCLUDED_SIDEBAR diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.h index 6a8327e119..980e407039 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.h @@ -1,5 +1,5 @@ -#ifndef LIGHTCONTROL_H__ -#define LIGHTCONTROL_H__ +#ifndef INCLUDED_LIGHTCONTROL +#define INCLUDED_LIGHTCONTROL #include "GameInterface/Messages.h" #include "GameInterface/Shareable.h" @@ -22,4 +22,4 @@ private: LightSphere* m_Sphere; }; -#endif // LIGHTCONTROL_H__ +#endif // INCLUDED_LIGHTCONTROL diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/VariationControl.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/VariationControl.h index 5831c3fdca..5a66e70ecd 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/VariationControl.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/VariationControl.h @@ -1,5 +1,5 @@ -#ifndef VARIATIONCONTROL_H__ -#define VARIATIONCONTROL_H__ +#ifndef INCLUDED_VARIATIONCONTROL +#define INCLUDED_VARIATIONCONTROL #include "General/Observable.h" @@ -22,4 +22,4 @@ private: wxSizer* m_Sizer; }; -#endif // VARIATIONCONTROL_H__ +#endif // INCLUDED_VARIATIONCONTROL diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.h index a5380ca061..3dfc488316 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.h @@ -1,6 +1,4 @@ -/* Andrew Decker, a.k.a pyrolink - Contact ajdecker1022@msn.com - Desc: interface for creation and editing of triggers. Interprets +/* Desc: interface for creation and editing of triggers. Interprets XML specifications then uses this to construct layout. */ @@ -80,3 +78,4 @@ private: DECLARE_EVENT_TABLE(); }; + diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.h index 88aba42a36..fca96af576 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.h @@ -1,5 +1,5 @@ -#ifndef BRUSHES_H__ -#define BRUSHES_H__ +#ifndef INCLUDED_BRUSHES +#define INCLUDED_BRUSHES class BrushShapeCtrl; class BrushSizeCtrl; @@ -43,4 +43,4 @@ extern Brush g_Brush_Elevation; extern Brush* g_Brush_CurrentlyActive; -#endif // BRUSHES_H__ +#endif // INCLUDED_BRUSHES diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/MiscState.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/MiscState.h index 44d009d643..d7ea613d07 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/MiscState.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/MiscState.h @@ -1,5 +1,5 @@ -#ifndef MISCSTATE_H__ -#define MISCSTATE_H__ +#ifndef INCLUDED_MISCSTATE +#define INCLUDED_MISCSTATE #include "General/Observable.h" @@ -12,4 +12,4 @@ extern wxString g_SelectedTexture; extern Observable > g_SelectedObjects; -#endif // MISCSTATE_H__ +#endif // INCLUDED_MISCSTATE diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.h index dbc2bcc838..c24968592b 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.h @@ -1,5 +1,5 @@ -#ifndef ObjectSettings_H__ -#define ObjectSettings_H__ +#ifndef INCLUDED_OBJECTSETTINGS +#define INCLUDED_OBJECTSETTINGS #include #include @@ -62,4 +62,4 @@ private: extern Observable g_ObjectSettings; -#endif // ObjectSettings_H__ +#endif // INCLUDED_OBJECTSETTINGS diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.h index 57bfede516..9a4c0f95c6 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.h @@ -1,5 +1,5 @@ -#ifndef TOOLS_H__ -#define TOOLS_H__ +#ifndef INCLUDED_TOOLS +#define INCLUDED_TOOLS #include "ScenarioEditor/ScenarioEditor.h" #include "General/AtlasWindowCommand.h" @@ -130,4 +130,4 @@ private: }; -#endif // TOOLS_H__ +#endif // INCLUDED_TOOLS diff --git a/source/tools/atlas/DatafileIO/Stream/Stream.h b/source/tools/atlas/DatafileIO/Stream/Stream.h index e718bfccf8..d810657d02 100644 --- a/source/tools/atlas/DatafileIO/Stream/Stream.h +++ b/source/tools/atlas/DatafileIO/Stream/Stream.h @@ -1,5 +1,5 @@ -#ifndef STREAM_H__ -#define STREAM_H__ +#ifndef INCLUDED_STREAM +#define INCLUDED_STREAM /* Stream: A system for input/output of data, particularly with chained streams @@ -69,4 +69,4 @@ namespace DatafileIO } -#endif // STREAM_H__ +#endif // INCLUDED_STREAM diff --git a/source/tools/atlas/GameInterface/ActorViewer.h b/source/tools/atlas/GameInterface/ActorViewer.h index 8fe3d32996..336e53c916 100644 --- a/source/tools/atlas/GameInterface/ActorViewer.h +++ b/source/tools/atlas/GameInterface/ActorViewer.h @@ -1,5 +1,5 @@ -#ifndef ACTORVIEWER_H__ -#define ACTORVIEWER_H__ +#ifndef INCLUDED_ACTORVIEWER +#define INCLUDED_ACTORVIEWER struct ActorViewerImpl; struct SColor4ub; @@ -31,4 +31,4 @@ private: ActorViewerImpl& m; }; -#endif // ACTORVIEWER_H__ +#endif // INCLUDED_ACTORVIEWER diff --git a/source/tools/atlas/GameInterface/Brushes.h b/source/tools/atlas/GameInterface/Brushes.h index 0193f757e9..0e47f66b37 100644 --- a/source/tools/atlas/GameInterface/Brushes.h +++ b/source/tools/atlas/GameInterface/Brushes.h @@ -1,5 +1,5 @@ -#ifndef BRUSHES_H__ -#define BRUSHES_H__ +#ifndef INCLUDED_BRUSHES +#define INCLUDED_BRUSHES #include "maths/Vector3D.h" @@ -37,4 +37,4 @@ extern Brush g_CurrentBrush; } -#endif // BRUSHES_H__ +#endif // INCLUDED_BRUSHES diff --git a/source/tools/atlas/GameInterface/CommandProc.h b/source/tools/atlas/GameInterface/CommandProc.h index 94035016f2..81bf546814 100644 --- a/source/tools/atlas/GameInterface/CommandProc.h +++ b/source/tools/atlas/GameInterface/CommandProc.h @@ -1,5 +1,5 @@ -#ifndef COMMANDPROC_H__ -#define COMMANDPROC_H__ +#ifndef INCLUDED_COMMANDPROC +#define INCLUDED_COMMANDPROC #include #include @@ -166,4 +166,4 @@ The following macros convert that into: } -#endif // COMMANDPROC_H__ +#endif // INCLUDED_COMMANDPROC diff --git a/source/tools/atlas/GameInterface/DeltaArray.h b/source/tools/atlas/GameInterface/DeltaArray.h index 603e1ed3ed..3e78cb5301 100644 --- a/source/tools/atlas/GameInterface/DeltaArray.h +++ b/source/tools/atlas/GameInterface/DeltaArray.h @@ -1,5 +1,5 @@ -#ifndef DELTAARRAY_H__ -#define DELTAARRAY_H__ +#ifndef INCLUDED_DELTAARRAY +#define INCLUDED_DELTAARRAY template class DeltaArray2D { @@ -89,4 +89,4 @@ void DeltaArray2D::Redo() setNew(it->first.first, it->first.second, it->second.second); } -#endif // DELTAARRAY_H__ +#endif // INCLUDED_DELTAARRAY diff --git a/source/tools/atlas/GameInterface/GameLoop.h b/source/tools/atlas/GameInterface/GameLoop.h index 04f8c78f7c..34caecb43a 100644 --- a/source/tools/atlas/GameInterface/GameLoop.h +++ b/source/tools/atlas/GameInterface/GameLoop.h @@ -1,5 +1,5 @@ -#ifndef GAMELOOP_H__ -#define GAMELOOP_H__ +#ifndef INCLUDED_GAMELOOP +#define INCLUDED_GAMELOOP #include "ps/GameSetup/CmdLineArgs.h" @@ -26,4 +26,4 @@ struct GameLoopState extern GameLoopState* g_GameLoop; -#endif // GAMELOOP_H__ +#endif // INCLUDED_GAMELOOP diff --git a/source/tools/atlas/GameInterface/InputProcessor.h b/source/tools/atlas/GameInterface/InputProcessor.h index 7b9dc8315d..77a5e0c341 100644 --- a/source/tools/atlas/GameInterface/InputProcessor.h +++ b/source/tools/atlas/GameInterface/InputProcessor.h @@ -1,5 +1,5 @@ -#ifndef INPUTPROCESSOR_H__ -#define INPUTPROCESSOR_H__ +#ifndef INCLUDED_INPUTPROCESSOR +#define INCLUDED_INPUTPROCESSOR #include "GameLoop.h" @@ -10,4 +10,4 @@ public: bool ProcessInput(GameLoopState* state); }; -#endif // INPUTPROCESSOR_H__ +#endif // INCLUDED_INPUTPROCESSOR diff --git a/source/tools/atlas/GameInterface/MessagePasser.h b/source/tools/atlas/GameInterface/MessagePasser.h index b2ff08c81d..6735d27e65 100644 --- a/source/tools/atlas/GameInterface/MessagePasser.h +++ b/source/tools/atlas/GameInterface/MessagePasser.h @@ -1,5 +1,5 @@ -#ifndef MESSAGEPASSER_H__ -#define MESSAGEPASSER_H__ +#ifndef INCLUDED_MESSAGEPASSER +#define INCLUDED_MESSAGEPASSER #include "SharedMemory.h" @@ -27,4 +27,4 @@ extern MessagePasser* g_MessagePasser; } -#endif // MESSAGEPASSER_H__ +#endif // INCLUDED_MESSAGEPASSER diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h index 7e4ef6fcaf..14b83fb0f9 100644 --- a/source/tools/atlas/GameInterface/Messages.h +++ b/source/tools/atlas/GameInterface/Messages.h @@ -1,5 +1,5 @@ -#ifndef MESSAGES_H__ -#define MESSAGES_H__ +#ifndef INCLUDED_MESSAGES +#define INCLUDED_MESSAGES #ifndef MESSAGES_SKIP_SETUP #include "MessagesSetup.h" @@ -420,4 +420,4 @@ MESSAGE(TriggerToggleSelector, #include "MessagesSetup.h" #endif -#endif // MESSAGES_H__ +#endif // INCLUDED_MESSAGES diff --git a/source/tools/atlas/GameInterface/Shareable.h b/source/tools/atlas/GameInterface/Shareable.h index 7ae3a70042..cf635049ca 100644 --- a/source/tools/atlas/GameInterface/Shareable.h +++ b/source/tools/atlas/GameInterface/Shareable.h @@ -1,5 +1,5 @@ -#ifndef SHAREABLE_H__ -#define SHAREABLE_H__ +#ifndef INCLUDED_SHAREABLE +#define INCLUDED_SHAREABLE /* @@ -302,4 +302,4 @@ public: # undef SHAREABLE_USED_NOMMGR #endif -#endif // SHAREABLE_H__ +#endif // INCLUDED_SHAREABLE diff --git a/source/tools/atlas/GameInterface/SharedMemory.h b/source/tools/atlas/GameInterface/SharedMemory.h index d0ccab0559..d948889259 100644 --- a/source/tools/atlas/GameInterface/SharedMemory.h +++ b/source/tools/atlas/GameInterface/SharedMemory.h @@ -1,5 +1,5 @@ -#ifndef SHAREDMEMORY_H__ -#define SHAREDMEMORY_H__ +#ifndef INCLUDED_SHAREDMEMORY +#define INCLUDED_SHAREDMEMORY // We want to use placement new, which breaks when compiling Debug configurations // in the game and in wx, and they both need different workarounds. @@ -61,4 +61,4 @@ template void ShareableDelete(T* p) #endif -#endif // SHAREDMEMORY_H__ +#endif // INCLUDED_SHAREDMEMORY diff --git a/source/tools/atlas/GameInterface/SharedTypes.h b/source/tools/atlas/GameInterface/SharedTypes.h index 44dab4995d..105fd8e1f1 100644 --- a/source/tools/atlas/GameInterface/SharedTypes.h +++ b/source/tools/atlas/GameInterface/SharedTypes.h @@ -1,5 +1,5 @@ -#ifndef SHAREDTYPES_H__ -#define SHAREDTYPES_H__ +#ifndef INCLUDED_SHAREDTYPES +#define INCLUDED_SHAREDTYPES #include "Shareable.h" @@ -224,4 +224,4 @@ SHAREABLE_STRUCT(sTriggerGroup); } -#endif // SHAREDTYPES_H__ +#endif // INCLUDED_SHAREDTYPES diff --git a/source/tools/atlas/GameInterface/View.h b/source/tools/atlas/GameInterface/View.h index d7d037e68a..8e0c4d68ce 100644 --- a/source/tools/atlas/GameInterface/View.h +++ b/source/tools/atlas/GameInterface/View.h @@ -1,5 +1,5 @@ -#ifndef VIEW_H__ -#define VIEW_H__ +#ifndef INCLUDED_VIEW +#define INCLUDED_VIEW #include "graphics/Camera.h" @@ -91,4 +91,4 @@ private: ActorViewer* m_ActorViewer; }; -#endif // VIEW_H__ +#endif // INCLUDED_VIEW diff --git a/source/tools/fontbuilder/font.h b/source/tools/fontbuilder/font.h index cdd8db823b..2f503ef066 100644 --- a/source/tools/fontbuilder/font.h +++ b/source/tools/fontbuilder/font.h @@ -1,5 +1,5 @@ -#ifndef _FONT_H_ -#define _FONT_H_ +#ifndef INCLUDED_FONT +#define INCLUDED_FONT #include #include FT_FREETYPE_H @@ -81,4 +81,4 @@ private: FT_Face LastFontFace; // = FontFace(0|1), depending on the last LoadGlyph }; -#endif // _FONT_H_ +#endif // INCLUDED_FONT diff --git a/source/tools/pmdexp/DllEntry.cpp b/source/tools/pmdexp/DllEntry.cpp index 9ad7e08bcd..d887bd4d45 100644 --- a/source/tools/pmdexp/DllEntry.cpp +++ b/source/tools/pmdexp/DllEntry.cpp @@ -1,15 +1,11 @@ -/********************************************************************** - *< - FILE: DllEntry.cpp +/** + * ========================================================================= + * File : DllEntry.cpp + * Project : 0 A.D. + * Description : Defines the DLL entry point + * ========================================================================= + */ - DESCRIPTION: Contains the Dll Entry stuff - - CREATED BY: - - HISTORY: - - *> Copyright (c) 2000, All Rights Reserved. - **********************************************************************/ #include "PMDExp.h" #include "PSAExp.h" #include "PSProp.h" @@ -123,3 +119,4 @@ __declspec( dllexport ) ULONG CanAutoDefer() } + diff --git a/source/tools/pmdexp/FilePacker.cpp b/source/tools/pmdexp/FilePacker.cpp index 5447940eea..24a1d235c1 100644 --- a/source/tools/pmdexp/FilePacker.cpp +++ b/source/tools/pmdexp/FilePacker.cpp @@ -1,9 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// // Name: FilePacker.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// /////////////////////////////////////////////////////////////////////////////// #include "pmdexp_types.h" @@ -75,3 +71,4 @@ void CFilePacker::PackString(const char* str) PackRaw((const char*) str,len); } + diff --git a/source/tools/pmdexp/FilePacker.h b/source/tools/pmdexp/FilePacker.h index 2adaffd48f..e8446f20e0 100644 --- a/source/tools/pmdexp/FilePacker.h +++ b/source/tools/pmdexp/FilePacker.h @@ -1,9 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// // Name: FilePacker.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// /////////////////////////////////////////////////////////////////////////////// #ifndef _FILEPACKER_H diff --git a/source/tools/pmdexp/Matrix3D.cpp b/source/tools/pmdexp/Matrix3D.cpp index 1f65d83c2b..a8b0a49a18 100644 --- a/source/tools/pmdexp/Matrix3D.cpp +++ b/source/tools/pmdexp/Matrix3D.cpp @@ -1,9 +1,5 @@ //*********************************************************** -// // Name: Matrix3D.Cpp -// Last Update: 31/1/02 -// Author: Poya Manouchehri -// // Description: A Matrix class used for holding and // manipulating transformation info. // @@ -537,3 +533,4 @@ void CMatrix3D::SetRotation(const CQuaternion& quat) } + diff --git a/source/tools/pmdexp/ModelDef.cpp b/source/tools/pmdexp/ModelDef.cpp index 200cbbe3d1..0d2649716e 100644 --- a/source/tools/pmdexp/ModelDef.cpp +++ b/source/tools/pmdexp/ModelDef.cpp @@ -1,9 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// // Name: ModelDef.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// /////////////////////////////////////////////////////////////////////////////// @@ -75,3 +71,4 @@ void CModelDef::Save(const char* filename,const CModelDef* mdef) packer.Write(filename,FILE_VERSION,"PSMD"); } + diff --git a/source/tools/pmdexp/ModelDef.h b/source/tools/pmdexp/ModelDef.h index 2e3854a2f5..e47938032e 100644 --- a/source/tools/pmdexp/ModelDef.h +++ b/source/tools/pmdexp/ModelDef.h @@ -1,9 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// // Name: ModelDef.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// /////////////////////////////////////////////////////////////////////////////// #ifndef _MODELDEF_H diff --git a/source/tools/pmdexp/SkeletonAnimDef.cpp b/source/tools/pmdexp/SkeletonAnimDef.cpp index 8c6dbf85ec..186e64e030 100644 --- a/source/tools/pmdexp/SkeletonAnimDef.cpp +++ b/source/tools/pmdexp/SkeletonAnimDef.cpp @@ -1,9 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// // Name: SkeletonAnimDef.cpp -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// /////////////////////////////////////////////////////////////////////////////// #include "pmdexp_types.h" @@ -70,3 +66,4 @@ void CSkeletonAnimDef::Save(const char* filename,const CSkeletonAnimDef* anim) packer.Write(filename,FILE_VERSION,"PSSA"); } + diff --git a/source/tools/pmdexp/SkeletonAnimDef.h b/source/tools/pmdexp/SkeletonAnimDef.h index 08c84b361d..017fb73338 100644 --- a/source/tools/pmdexp/SkeletonAnimDef.h +++ b/source/tools/pmdexp/SkeletonAnimDef.h @@ -1,9 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// // Name: SkeletonAnimDef.h -// Author: Rich Cross -// Contact: rich@wildfiregames.com -// /////////////////////////////////////////////////////////////////////////////// #ifndef _SKELETONANIMDEF_H diff --git a/source/tools/pmdexp/Vector3D.cpp b/source/tools/pmdexp/Vector3D.cpp index 2f3a3b2ca3..e5c5d049e6 100644 --- a/source/tools/pmdexp/Vector3D.cpp +++ b/source/tools/pmdexp/Vector3D.cpp @@ -1,9 +1,6 @@ //*********************************************************** // // Name: Vector3D.Cpp -// Last Update: 28/1/02 -// Author: Poya Manouchehri -// // Description: Provides an interface for a vector in R3 and // allows vector and scalar operations on it // diff --git a/source/tools/pmdexp/Vector3D.h b/source/tools/pmdexp/Vector3D.h index 07c93ff62b..4d6485b26c 100644 --- a/source/tools/pmdexp/Vector3D.h +++ b/source/tools/pmdexp/Vector3D.h @@ -1,9 +1,6 @@ //*********************************************************** // // Name: Vector3D.H -// Last Update: 28/1/02 -// Author: Poya Manouchehri -// // Description: Provides an interface for a vector in R3 and // allows vector and scalar operations on it // diff --git a/source/tools/pmdexp/Vector4D.h b/source/tools/pmdexp/Vector4D.h index 081dc225e6..4e87f5bdd9 100644 --- a/source/tools/pmdexp/Vector4D.h +++ b/source/tools/pmdexp/Vector4D.h @@ -1,9 +1,6 @@ //*********************************************************** // // Name: CVector4D.h -// Last Update: 02/11/03 -// Author: Rich Cross -// // Description: Provides an interface for a vector in R4 and // allows vector and scalar operations on it // diff --git a/source/tools/rmgen/Vector2D.h b/source/tools/rmgen/Vector2D.h index 86a438c17d..2fc9608c11 100644 --- a/source/tools/rmgen/Vector2D.h +++ b/source/tools/rmgen/Vector2D.h @@ -1,8 +1,5 @@ //*********************************************************** -// // Name: Vector2D.h -// Author: Matei Zaharia -// // Description: Provides an interface for a vector in R4 and // allows vector and scalar operations on it // diff --git a/source/tools/rmgen/Vector3D.cpp b/source/tools/rmgen/Vector3D.cpp index bed1a6b5d9..ddbb8e7b31 100644 --- a/source/tools/rmgen/Vector3D.cpp +++ b/source/tools/rmgen/Vector3D.cpp @@ -1,9 +1,6 @@ //*********************************************************** -// // Name: Vector3D.Cpp -// Last Update: 28/1/02 -// Author: Poya Manouchehri -// +/ // Description: Provides an interface for a vector in R3 and // allows vector and scalar operations on it // diff --git a/source/tools/rmgen/Vector3D.h b/source/tools/rmgen/Vector3D.h index 6825a22353..f930921934 100644 --- a/source/tools/rmgen/Vector3D.h +++ b/source/tools/rmgen/Vector3D.h @@ -1,9 +1,5 @@ //*********************************************************** -// // Name: Vector3D.H -// Last Update: 28/1/02 -// Author: Poya Manouchehri -// // Description: Provides an interface for a vector in R3 and // allows vector and scalar operations on it // diff --git a/source/tools/rmgen/noise.h b/source/tools/rmgen/noise.h index 556ebddfb1..d75032dfc4 100644 --- a/source/tools/rmgen/noise.h +++ b/source/tools/rmgen/noise.h @@ -1,8 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// // Name: Noise.h -// Author: Matei Zaharia -// Contact: matei@wildfiregames.com // // Description: 2D and 3D seamless Perlin noise classes. Not optimized for speed yet. //