abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Removed old attribute table code since it's no longer used.

Browse Source 
This was SVN commit r4087.
This commit is contained in:
Matei 2006-07-12 22:50:09 +00:00
parent c3879b182d
commit d2e8804ce0
2 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source/simulation/Entity.cpp
View File

@ -34,17 +34,11 @@ extern int g_xres, g_yres;
#include <algorithm>
using namespace std;
std::map<CStr, size_t> CEntity::m_AttributeTable;
CEntity::CEntity( CBaseEntity* base, CVector3D position, float orientation, const std::set<CStrW>& actorSelections, CStrW building )
{
ent_flags = 0;
if(m_AttributeTable.size() == 0) // not nice
{
initAttributes(this);
}
m_position = position;
m_orientation.Y = orientation;
m_ahead.x = sin( m_orientation.Y );
@ -198,67 +192,6 @@ void CEntity::loadBase()
m_sectorValues[i] = false;
}
void CEntity::initAttributes(const CEntity* _this)
{
#define getoffset(member) \
(size_t) ((unsigned char*)&_this->member - (unsigned char*)_this)
#define getoffset_action(member, mem2) \
(size_t) ((unsigned char*)&_this->member.mem2 - (unsigned char*)_this)
// JW: temporarily disabled (-> techs are dead) until we replace getoffset with CJSComplex.
// it is no longer safe to use this because some fields are no longer present inside CEntity.
// they must be accessed via m_base instead.
#if 0
//Add the attribute name and the variable that holds it
CEntity::m_AttributeTable["actions.move.speed_curr"] = getoffset(m_speed);
CEntity::m_AttributeTable["actions.move.run.speed"] = getoffset(m_runSpeed);
CEntity::m_AttributeTable["actions.move.run.rangemin"] = getoffset_action(m_run, m_MinRange);
CEntity::m_AttributeTable["actions.move.run.range"] = getoffset_action(m_run, m_MaxRange);
CEntity::m_AttributeTable["actions.move.run.regen_rate"] = getoffset(m_runRegenRate);
CEntity::m_AttributeTable["actions.move.run.decay_rate"] = getoffset(m_runDecayRate);
CEntity::m_AttributeTable["actions.move.pass_through_allies"] = getoffset(m_passThroughAllies);
CEntity::m_AttributeTable["traits.extant"] = getoffset(m_extant);
CEntity::m_AttributeTable["actions.move.turningradius"] = getoffset(m_turningRadius);
CEntity::m_AttributeTable["traits.health.curr"] = getoffset(m_healthCurr);
CEntity::m_AttributeTable["traits.health.max"] = getoffset(m_healthMax);
CEntity::m_AttributeTable["traits.health.regen_rate"] = getoffset(m_healthRegenRate);
CEntity::m_AttributeTable["traits.health.regen_start"] = getoffset(m_healthRegenStart);
CEntity::m_AttributeTable["traits.health.decay_rate"] = getoffset(m_healthDecayRate);
//This are not changable from techs until the updated bars are finished
/* CEntity::m_AttributeTable["traits.stamina.curr"] = getoffset(m_staminaCurr);
CEntity::m_AttributeTable["traits.stamina.max"] = getoffset(m_staminaMax);
CEntity::m_AttributeTable["traits.bars.height"] = getoffset(m_barHeight);
CEntity::m_AttributeTable["traits.bars"] = getoffset(m_barOffset);
CEntity::m_AttributeTable["traits.bars.width"] = getoffset(m_barWidth);
CEntity::m_AttributeTable["traits.bars.border_height"] = getoffset(m_barBorderHeight);
CEntity::m_AttributeTable["traits.bars.border_width"] = getoffset(m_barBorderWidth);
CEntity::m_AttributeTable["traits.bars.border_name"] = getoffset(m_barBorderName);*/
CEntity::m_AttributeTable["traits.flank_penalty.sectors"] = getoffset(m_sectorDivs);
CEntity::m_AttributeTable["traits.pitch.sectors"] = getoffset(m_pitchDivs);
CEntity::m_AttributeTable["traits.rank.width"] = getoffset(m_rankWidth);
// CEntity::m_AttributeTable["traits.rank"] = getoffset(m_rankOffset);
CEntity::m_AttributeTable["traits.rank.height"] = getoffset(m_rankHeight);
CEntity::m_AttributeTable["traits.rank.name"] = getoffset(m_rankName);
CEntity::m_AttributeTable["traits.minimap.type"] = getoffset(m_minimapType);
CEntity::m_AttributeTable["traits.minimap.red"] = getoffset(m_minimapR);
CEntity::m_AttributeTable["traits.minimap.green"] = getoffset(m_minimapG);
CEntity::m_AttributeTable["traits.minimap.blue"] = getoffset(m_minimapB);
CEntity::m_AttributeTable["traits.anchor.type"] = getoffset(m_anchorType);
CEntity::m_AttributeTable["traits.anchor.conformx"] = getoffset(m_anchorConformX);
CEntity::m_AttributeTable["traits.anchor.conformz"] = getoffset(m_anchorConformZ);
CEntity::m_AttributeTable["traits.vision.los"] = getoffset(m_los);
CEntity::m_AttributeTable["traits.vision.permanent"] = getoffset(m_permanent);
CEntity::m_AttributeTable["last_combat_time"] = getoffset(m_lastCombatTime);
CEntity::m_AttributeTable["last_run_time"] = getoffset(m_lastRunTime);
CEntity::m_AttributeTable["building"] = getoffset(m_building);
#endif
#undef getoffset
}
void CEntity::kill()
{
g_Selection.removeAll( me );

3
source/simulation/Entity.h
View File

@ -96,9 +96,6 @@ public:
// Intrinsic properties
CBaseEntity* m_base;
//Attributes table: key=attribute, value=variable name
static std::map<CStr, size_t> m_AttributeTable;
// The class types this entity has
SClassSet m_classes;