mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-10 16:19:59 +00:00
Code Issues Releases Wiki Activity

Revert "Changed a bunch of enums in Entity.h"

Browse source 
This reverts commit 8b67ece907.
This commit is contained in:
fgenesis 2012-12-15 22:46:39 +01:00
parent 0f13f08357
commit ad4bc9bd21
3 changed files with 72 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Aquaria/Entity.cpp
View file

@ -1614,12 +1614,15 @@ void Entity::moveOutOfWall()
void Entity::clearDamageTargets()
{
disabledDamageTypes.reset();
disabledDamageTypes.clear();
}
void Entity::setDamageTarget(DamageType dt, bool v)
{
disabledDamageTypes.set(dt, !v);
if (v)
disabledDamageTypes.erase(dt);
else
disabledDamageTypes.insert(dt);
}
void Entity::setEatType(EatType et, const std::string &file)
@ -1640,17 +1643,17 @@ void Entity::setAllDamageTargets(bool v)
else
{
for (int i = DT_ENEMY; i < DT_ENEMY_REALMAX; i++)
disabledDamageTypes.set(DamageType(i));
disabledDamageTypes.insert(DamageType(i));
for (int i = DT_AVATAR; i < DT_AVATAR_REALMAX; i++)
disabledDamageTypes.set(DamageType(i));
disabledDamageTypes.insert(DamageType(i));
for (int i = DT_AVATAR_MAX; i < DT_REALMAX; i++)
disabledDamageTypes.set(DamageType(i));
disabledDamageTypes.insert(DamageType(i));
}
}
bool Entity::isDamageTarget(DamageType dt)
{
return disabledDamageTypes.test(dt);
return disabledDamageTypes.find(dt) == disabledDamageTypes.end();
}
float Entity::getHealthPerc()