Merge branch 'master' of git@github.com:ElunaLuaEngine/Eluna.git into dev

This commit is contained in:
Salja
2014-12-21 07:40:02 +01:00

View File

@@ -881,33 +881,33 @@ namespace LuaUnit
} }
/** /**
* Returns the current movement type for this [Unit]. * Returns the current movement type for this [Unit].
* *
* <pre> * <pre>
* enum MovementGeneratorType * enum MovementGeneratorType
* { * {
* IDLE_MOTION_TYPE = 0, * IDLE_MOTION_TYPE = 0,
* RANDOM_MOTION_TYPE = 1, * RANDOM_MOTION_TYPE = 1,
* WAYPOINT_MOTION_TYPE = 2, * WAYPOINT_MOTION_TYPE = 2,
* MAX_DB_MOTION_TYPE = 3, * MAX_DB_MOTION_TYPE = 3,
* *
* CONFUSED_MOTION_TYPE = 4, * CONFUSED_MOTION_TYPE = 4,
* CHASE_MOTION_TYPE = 5, * CHASE_MOTION_TYPE = 5,
* HOME_MOTION_TYPE = 6, * HOME_MOTION_TYPE = 6,
* FLIGHT_MOTION_TYPE = 7, * FLIGHT_MOTION_TYPE = 7,
* POINT_MOTION_TYPE = 8, * POINT_MOTION_TYPE = 8,
* FLEEING_MOTION_TYPE = 9, * FLEEING_MOTION_TYPE = 9,
* DISTRACT_MOTION_TYPE = 10, * DISTRACT_MOTION_TYPE = 10,
* ASSISTANCE_MOTION_TYPE = 11, * ASSISTANCE_MOTION_TYPE = 11,
* ASSISTANCE_DISTRACT_MOTION_TYPE = 12, * ASSISTANCE_DISTRACT_MOTION_TYPE = 12,
* TIMED_FLEEING_MOTION_TYPE = 13, * TIMED_FLEEING_MOTION_TYPE = 13,
* FOLLOW_MOTION_TYPE = 14, * FOLLOW_MOTION_TYPE = 14,
* EFFECT_MOTION_TYPE = 15, * EFFECT_MOTION_TYPE = 15,
* }; * };
* </pre> * </pre>
* *
* @return MovementGeneratorType movementType * @return MovementGeneratorType movementType
*/ */
#ifdef MANGOS #ifdef MANGOS
int GetMovementType(Eluna* /*E*/, lua_State* L, Unit* unit) int GetMovementType(Eluna* /*E*/, lua_State* L, Unit* unit)
{ {