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

[11821] ger rid of useless now SplineType, SplineMode etc enums

Browse source
This commit is contained in:
SilverIce 2011-10-14 15:24:39 +03:00
parent 59f8716542
commit 4ad879a3da
4 changed files with 7 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Creature.h
View file

@ -207,6 +207,12 @@ struct CreatureData
ObjectGuid GetObjectGuid(uint32 lowguid) const;
};
enum SplineFlags
{
SPLINEFLAG_WALKMODE = 0x00001000,
SPLINEFLAG_FLYING = 0x00002000,
};
// from `creature_addon` and `creature_template_addon`tables
struct CreatureDataAddon
{

6
src/game/ObjectMgr.cpp
View file

@ -808,12 +808,6 @@ void ObjectMgr::LoadCreatureAddons(SQLStorage& creatureaddons, char const* entry
const_cast<CreatureDataAddon*>(addon)->emote = 0;
}
if (addon->splineFlags & (SPLINEFLAG_TRAJECTORY|SPLINEFLAG_UNKNOWN3))
{
sLog.outErrorDb("Creature (%s %u) spline flags mask defined in `%s` include forbidden flags (" I32FMT ") that can crash client, cleanup at load.", entryName, addon->guidOrEntry, creatureaddons.GetTableName(), (SPLINEFLAG_TRAJECTORY|SPLINEFLAG_UNKNOWN3));
const_cast<CreatureDataAddon*>(addon)->splineFlags &= ~(SPLINEFLAG_TRAJECTORY|SPLINEFLAG_UNKNOWN3);
}
ConvertCreatureAddonAuras(const_cast<CreatureDataAddon*>(addon), creatureaddons.GetTableName(), entryName);
}
}

52
src/game/Unit.h
View file

@ -661,58 +661,6 @@ enum MovementFlags2
MOVEFLAG2_INTERP_MASK = MOVEFLAG2_INTERP_MOVEMENT | MOVEFLAG2_INTERP_TURNING | MOVEFLAG2_INTERP_PITCHING
};
enum SplineFlags
{
SPLINEFLAG_NONE = 0x00000000,
SPLINEFLAG_FORWARD = 0x00000001,
SPLINEFLAG_BACKWARD = 0x00000002,
SPLINEFLAG_STRAFE_LEFT = 0x00000004,
SPLINEFLAG_STRAFE_RIGHT = 0x00000008,
SPLINEFLAG_LEFT = 0x00000010,
SPLINEFLAG_RIGHT = 0x00000020,
SPLINEFLAG_PITCH_UP = 0x00000040,
SPLINEFLAG_PITCH_DOWN = 0x00000080,
SPLINEFLAG_DONE = 0x00000100,
SPLINEFLAG_FALLING = 0x00000200,
SPLINEFLAG_NO_SPLINE = 0x00000400,
SPLINEFLAG_TRAJECTORY = 0x00000800,
SPLINEFLAG_WALKMODE = 0x00001000,
SPLINEFLAG_FLYING = 0x00002000,
SPLINEFLAG_KNOCKBACK = 0x00004000,
SPLINEFLAG_FINALPOINT = 0x00008000,
SPLINEFLAG_FINALTARGET = 0x00010000,
SPLINEFLAG_FINALFACING = 0x00020000,
SPLINEFLAG_CATMULLROM = 0x00040000,
SPLINEFLAG_UNKNOWN1 = 0x00080000,
SPLINEFLAG_UNKNOWN2 = 0x00100000,
SPLINEFLAG_UNKNOWN3 = 0x00200000,
SPLINEFLAG_UNKNOWN4 = 0x00400000,
SPLINEFLAG_UNKNOWN5 = 0x00800000,
SPLINEFLAG_UNKNOWN6 = 0x01000000,
SPLINEFLAG_UNKNOWN7 = 0x02000000,
SPLINEFLAG_UNKNOWN8 = 0x04000000,
SPLINEFLAG_UNKNOWN9 = 0x08000000,
SPLINEFLAG_UNKNOWN10 = 0x10000000,
SPLINEFLAG_UNKNOWN11 = 0x20000000,
SPLINEFLAG_UNKNOWN12 = 0x40000000
};
enum SplineMode
{
SPLINEMODE_LINEAR = 0,
SPLINEMODE_CATMULLROM = 1,
SPLINEMODE_BEZIER3 = 2
};
enum SplineType
{
SPLINETYPE_NORMAL = 0,
SPLINETYPE_STOP = 1,
SPLINETYPE_FACINGSPOT = 2,
SPLINETYPE_FACINGTARGET = 3,
SPLINETYPE_FACINGANGLE = 4
};
class MovementInfo
{
public:

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "11820"
#define REVISION_NR "11821"
#endif // __REVISION_NR_H__