mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-28 22:37:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Over 100 camangos Cata commits applied (to c12950)

Browse source 
Over 100 camangos Cata commits applied. up to and inclusing c12950.
This commit is contained in:
Charles A Edwards 2016-08-20 17:10:24 +01:00 • committed by Antz
parent b4ec0440aa
commit eef77eadb9
117 changed files with 4314 additions and 3547 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/MotionGenerators/MovementGenerator.h
View file

@ -59,7 +59,7 @@ class MovementGenerator
virtual void unitSpeedChanged() { }
// used by Evade code for select point to evade with expected restart default movement
virtual bool GetResetPosition(Unit&, float& /*x*/, float& /*y*/, float& /*z*/) const { return false; }
virtual bool GetResetPosition(Unit&, float& /*x*/, float& /*y*/, float& /*z*/, float& o) const { return false; }
// given destination unreachable? due to pathfinsing or other
virtual bool IsReachable() const { return true; }
@ -70,7 +70,7 @@ class MovementGenerator
};
template<class T, class D>
class MovementGeneratorMedium : public MovementGenerator
class MANGOS_DLL_SPEC MovementGeneratorMedium : public MovementGenerator
{
public:
void Initialize(Unit& u) override
@ -98,10 +98,10 @@ class MovementGeneratorMedium : public MovementGenerator
// u->AssertIsType<T>();
return (static_cast<D*>(this))->Update(*((T*)&u), time_diff);
}
bool GetResetPosition(Unit& u, float& x, float& y, float& z) const override
bool GetResetPosition(Unit& u, float& x, float& y, float& z, float& o) const override
{
// u->AssertIsType<T>();
return (static_cast<D const*>(this))->GetResetPosition(*((T*)&u), x, y, z);
return (static_cast<D const*>(this))->GetResetPosition(*((T*)&u), x, y, z, o);
}
public:
// Will not link if not overridden in the generators
@ -112,7 +112,7 @@ class MovementGeneratorMedium : public MovementGenerator
bool Update(T& u, const uint32& time_diff);
// not need always overwrites
bool GetResetPosition(T& /*u*/, float& /*x*/, float& /*y*/, float& /*z*/) const { return false; }
bool GetResetPosition(T& /*u*/, float& /*x*/, float& /*y*/, float& /*z*/, float& /*o*/) const { return false; }
};
struct SelectableMovement : public FactoryHolder<MovementGenerator, MovementGeneratorType>