mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-27 08:34:02 +00:00
Code Issues Releases Wiki Activity

tiny cleanup

Browse source
This commit is contained in:
fgenesis 2023-09-14 00:02:13 +02:00
parent bf58fe91c6
commit ed5cd03a06
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Aquaria/Entity.cpp
View file

@ -1566,7 +1566,6 @@ void Entity::onUpdate(float dt)
Quad::onUpdate(dt); Quad::onUpdate(dt);
Vector v = position - lastPos; Vector v = position - lastPos;
lastMove = v;
if (position.isFollowingPath() && swimPath) if (position.isFollowingPath() && swimPath)
{ {
movementDetails(v); movementDetails(v);

4
Aquaria/Entity.h
View file

@ -134,7 +134,6 @@ public:
Entity *ridingOnEntity; Entity *ridingOnEntity;
Vector startPos; Vector startPos;
void rotateToVec(Vector addVec, float time, float offsetAngle=0); void rotateToVec(Vector addVec, float time, float offsetAngle=0);
virtual void applyVariation(int variation){}
void popBubble(); void popBubble();
void sound(const std::string &sound, float freq=1, float fadeOut=0); void sound(const std::string &sound, float freq=1, float fadeOut=0);
@ -167,7 +166,6 @@ public:
STATE_FOLLOW =23, STATE_FOLLOW =23,
STATE_TITLE =24 STATE_TITLE =24
}; };
virtual void onNotify(Entity *notify){}
float followPath(Path *p, float speed, int dir, bool deleteOnEnd = false); float followPath(Path *p, float speed, int dir, bool deleteOnEnd = false);
bool touchAvatarDamage(int radius, float dmg, const Vector &override=Vector(-1,-1,-1), float speed=0, float pushTime = 0, Vector collidePos = Vector(0,0,0)); bool touchAvatarDamage(int radius, float dmg, const Vector &override=Vector(-1,-1,-1), float speed=0, float pushTime = 0, Vector collidePos = Vector(0,0,0));
@ -205,7 +203,6 @@ public:
bool isFollowingPath(); bool isFollowingPath();
void stopFollowingPath(); void stopFollowingPath();
void overideMaxSpeed(int ms, float time); void overideMaxSpeed(int ms, float time);
void disableOverideMaxSpeed();
int currentEntityTarget; int currentEntityTarget;
float moveToPos(Vector pos, float speed, int dieOnPathEnd=0, bool swim = false); float moveToPos(Vector pos, float speed, int dieOnPathEnd=0, bool swim = false);
bool isHit(); bool isHit();
@ -220,7 +217,6 @@ public:
void idle(); void idle();
void slowToStopPath(float t); void slowToStopPath(float t);
bool isSlowingToStopPath(); bool isSlowingToStopPath();
Vector lastMove;
float damageTime; float damageTime;
void setEntityProperty(EntityProperty ep, bool value=true); void setEntityProperty(EntityProperty ep, bool value=true);