Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Small cleanup, based on a change from one of Philip's old patches

Browse Source 
This was SVN commit r16653.
This commit is contained in:
Nicolas Auvray 2015-05-16 09:39:27 +00:00
parent ce558ddf56
commit 8b4b8431e3
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/graphics/Entity.h
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#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

11
source/simulation2/system/Entity.h
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#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