From 8b4b8431e336e9ed9fa716d31c481b9dba35cfee Mon Sep 17 00:00:00 2001 From: Itms Date: Sat, 16 May 2015 09:39:27 +0000 Subject: [PATCH] Small cleanup, based on a change from one of Philip's old patches This was SVN commit r16653. --- source/graphics/Entity.h | 7 +++---- source/simulation2/system/Entity.h | 11 +++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/source/graphics/Entity.h b/source/graphics/Entity.h index b633354112..dcbe034f0f 100644 --- a/source/graphics/Entity.h +++ b/source/graphics/Entity.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011 Wildfire Games. +/* Copyright (C) 2015 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -15,8 +15,8 @@ * along with 0 A.D. If not, see . */ -#ifndef INCLUDED_ENTITY -#define INCLUDED_ENTITY +#ifndef INCLUDED_RMS_ENTITY +#define INCLUDED_RMS_ENTITY #include "maths/FixedVector3D.h" @@ -30,5 +30,4 @@ struct Entity CFixedVector3D rotation; }; - #endif diff --git a/source/simulation2/system/Entity.h b/source/simulation2/system/Entity.h index 672290296a..26b516b504 100644 --- a/source/simulation2/system/Entity.h +++ b/source/simulation2/system/Entity.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 Wildfire Games. +/* Copyright (C) 2015 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -15,9 +15,8 @@ * along with 0 A.D. If not, see . */ -#ifndef INCLUDED_SIM2_ENTITY -#define INCLUDED_SIM2_ENTITY -// (can't call it INCLUDED_ENTITY because that conflicts with simulation/Entity.h) +#ifndef INCLUDED_ENTITY +#define INCLUDED_ENTITY #include "lib/types.h" @@ -80,7 +79,7 @@ struct SEntityComponentCache class CEntityHandle { public: - CEntityHandle() : m_Id(0), m_ComponentCache(NULL) { } + CEntityHandle() : m_Id(INVALID_ENTITY), m_ComponentCache(NULL) { } CEntityHandle(entity_id_t id, SEntityComponentCache* componentCache) : m_Id(id), m_ComponentCache(componentCache) { @@ -94,4 +93,4 @@ private: SEntityComponentCache* m_ComponentCache; }; -#endif // INCLUDED_SIM2_ENTITY +#endif // INCLUDED_ENTITY