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

clean out some dead code and some old commented out code

Browse source
This commit is contained in:
fgenesis 2012-12-19 06:23:51 +01:00
parent b6ae2a6baa
commit 9eb5b9828a
9 changed files with 24 additions and 2099 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Aquaria/Entity.cpp
View file

@ -551,39 +551,6 @@ void Entity::flipToTarget(Vector pos)
}
}
bool Entity::isCollideAgainst(Entity *e)
{
if (this == e) return false;
if (getEntityType()==ET_PET || getEntityType()==ET_AVATAR || getEntityType() == ET_NEUTRAL)
{
if (e->getEntityType()==ET_ENEMY || e->getEntityType()==ET_NEUTRAL)
{
return true;
}
}
if (getEntityType() == ET_ENEMY)
{
if (e->getEntityType()==ET_PET || e->getEntityType()==ET_AVATAR || e->getEntityType()==ET_NEUTRAL)
return true;
}
return false;
}
bool Entity::isOpposedTo(Entity *e)
{
if (getEntityType()==ET_PET || getEntityType()==ET_AVATAR || getEntityType() == ET_NEUTRAL)
{
if (e->getEntityType()==ET_ENEMY || e->getEntityType()==ET_NEUTRAL)
return true;
}
if (getEntityType() == ET_ENEMY)
{
if (e->getEntityType()==ET_PET || e->getEntityType()==ET_AVATAR)
return true;
}
return false;
}
Entity* Entity::getTargetEntity(int t)
{
return targets[t];