mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
[11833] remove trailing whitespaces
Signed-off-by: SilverIce <slifeleaf@gmail.com>
This commit is contained in:
parent
ee7f3811e0
commit
09e331767d
21 changed files with 41 additions and 41 deletions
|
|
@ -1276,7 +1276,7 @@ struct MapDifficultyEntry
|
||||||
uint32 MapId; // 1 m_mapID
|
uint32 MapId; // 1 m_mapID
|
||||||
uint32 Difficulty; // 2 m_difficulty (for arenas: arena slot)
|
uint32 Difficulty; // 2 m_difficulty (for arenas: arena slot)
|
||||||
//char* areaTriggerText[16]; // 3-18 m_message_lang (text showed when transfer to map failed)
|
//char* areaTriggerText[16]; // 3-18 m_message_lang (text showed when transfer to map failed)
|
||||||
//uint32 textFlags; // 19
|
//uint32 textFlags; // 19
|
||||||
uint32 resetTime; // 20 m_raidDuration in secs, 0 if no fixed reset time
|
uint32 resetTime; // 20 m_raidDuration in secs, 0 if no fixed reset time
|
||||||
uint32 maxPlayers; // 21 m_maxPlayers some heroic versions have 0 when expected same amount as in normal version
|
uint32 maxPlayers; // 21 m_maxPlayers some heroic versions have 0 when expected same amount as in normal version
|
||||||
//char* difficultyString; // 22 m_difficultystring
|
//char* difficultyString; // 22 m_difficultystring
|
||||||
|
|
@ -1736,7 +1736,7 @@ struct SpellRangeEntry
|
||||||
{
|
{
|
||||||
uint32 ID; // 0 m_ID
|
uint32 ID; // 0 m_ID
|
||||||
float minRange; // 1 m_rangeMin[2]
|
float minRange; // 1 m_rangeMin[2]
|
||||||
float minRangeFriendly; // 2
|
float minRangeFriendly; // 2
|
||||||
float maxRange; // 3 m_rangeMax[2]
|
float maxRange; // 3 m_rangeMax[2]
|
||||||
float maxRangeFriendly; // 4
|
float maxRangeFriendly; // 4
|
||||||
//uint32 Flags; // 5 m_flags
|
//uint32 Flags; // 5 m_flags
|
||||||
|
|
|
||||||
|
|
@ -623,7 +623,7 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
|
||||||
|
|
||||||
// z_rot, y_rot, x_rot - rotation angles around z, y and x axes
|
// z_rot, y_rot, x_rot - rotation angles around z, y and x axes
|
||||||
void SetWorldRotationAngles(float z_rot, float y_rot, float x_rot);
|
void SetWorldRotationAngles(float z_rot, float y_rot, float x_rot);
|
||||||
void SetWorldRotation(float qx, float qy, float qz, float qw);
|
void SetWorldRotation(float qx, float qy, float qz, float qw);
|
||||||
void SetTransportPathRotation(QuaternionData rotation); // transforms(rotates) transport's path
|
void SetTransportPathRotation(QuaternionData rotation); // transforms(rotates) transport's path
|
||||||
int64 GetPackedWorldRotation() const { return m_packedRotation; }
|
int64 GetPackedWorldRotation() const { return m_packedRotation; }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -960,7 +960,7 @@ bool ChatHandler::HandleGameObjectTurnCommand(char* args)
|
||||||
|
|
||||||
float z_rot, y_rot, x_rot;
|
float z_rot, y_rot, x_rot;
|
||||||
if (!ExtractFloat(&args, z_rot) || !ExtractOptFloat(&args, y_rot, 0) || !ExtractOptFloat(&args, x_rot, 0))
|
if (!ExtractFloat(&args, z_rot) || !ExtractOptFloat(&args, y_rot, 0) || !ExtractOptFloat(&args, x_rot, 0))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
obj->SetWorldRotationAngles(z_rot, y_rot, x_rot);
|
obj->SetWorldRotationAngles(z_rot, y_rot, x_rot);
|
||||||
obj->SaveToDB();
|
obj->SaveToDB();
|
||||||
|
|
|
||||||
|
|
@ -4571,7 +4571,7 @@ void ObjectMgr::LoadInstanceEncounters()
|
||||||
m_DungeonEncounters.clear(); // need for reload case
|
m_DungeonEncounters.clear(); // need for reload case
|
||||||
|
|
||||||
QueryResult* result = WorldDatabase.Query("SELECT entry, creditType, creditEntry, lastEncounterDungeon FROM instance_encounters");
|
QueryResult* result = WorldDatabase.Query("SELECT entry, creditType, creditEntry, lastEncounterDungeon FROM instance_encounters");
|
||||||
|
|
||||||
if (!result)
|
if (!result)
|
||||||
{
|
{
|
||||||
BarGoLink bar(1);
|
BarGoLink bar(1);
|
||||||
|
|
@ -4592,13 +4592,13 @@ void ObjectMgr::LoadInstanceEncounters()
|
||||||
|
|
||||||
uint32 entry = fields[0].GetUInt32();
|
uint32 entry = fields[0].GetUInt32();
|
||||||
DungeonEncounterEntry const* dungeonEncounter = sDungeonEncounterStore.LookupEntry(entry);
|
DungeonEncounterEntry const* dungeonEncounter = sDungeonEncounterStore.LookupEntry(entry);
|
||||||
|
|
||||||
if (!dungeonEncounter)
|
if (!dungeonEncounter)
|
||||||
{
|
{
|
||||||
sLog.outErrorDb("Table `instance_encounters` has an invalid encounter id %u, skipped!", entry);
|
sLog.outErrorDb("Table `instance_encounters` has an invalid encounter id %u, skipped!", entry);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8 creditType = fields[1].GetUInt8();
|
uint8 creditType = fields[1].GetUInt8();
|
||||||
uint32 creditEntry = fields[2].GetUInt32();
|
uint32 creditEntry = fields[2].GetUInt32();
|
||||||
switch (creditType)
|
switch (creditType)
|
||||||
|
|
|
||||||
|
|
@ -1021,7 +1021,7 @@ class ObjectMgr
|
||||||
{
|
{
|
||||||
return m_ItemRequiredTarget.equal_range(uiItemEntry);
|
return m_ItemRequiredTarget.equal_range(uiItemEntry);
|
||||||
}
|
}
|
||||||
|
|
||||||
DungeonEncounterMapBounds GetDungeonEncounterBounds(uint32 creditEntry) const
|
DungeonEncounterMapBounds GetDungeonEncounterBounds(uint32 creditEntry) const
|
||||||
{
|
{
|
||||||
return m_DungeonEncounters.equal_range(creditEntry);
|
return m_DungeonEncounters.equal_range(creditEntry);
|
||||||
|
|
|
||||||
|
|
@ -2927,7 +2927,7 @@ enum TradeStatus
|
||||||
};
|
};
|
||||||
|
|
||||||
enum EncounterCreditType
|
enum EncounterCreditType
|
||||||
{
|
{
|
||||||
ENCOUNTER_CREDIT_KILL_CREATURE = 0,
|
ENCOUNTER_CREDIT_KILL_CREATURE = 0,
|
||||||
ENCOUNTER_CREDIT_CAST_SPELL = 1
|
ENCOUNTER_CREDIT_CAST_SPELL = 1
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2923,7 +2923,7 @@ void Spell::cancel()
|
||||||
unit->RemoveAurasByCasterSpell(m_spellInfo->Id, m_caster->GetObjectGuid());
|
unit->RemoveAurasByCasterSpell(m_spellInfo->Id, m_caster->GetObjectGuid());
|
||||||
|
|
||||||
// prevent other effects applying if spell is already interrupted
|
// prevent other effects applying if spell is already interrupted
|
||||||
// i.e. if effects have different targets and it was interrupted on one of them when
|
// i.e. if effects have different targets and it was interrupted on one of them when
|
||||||
// haven't yet applied to another
|
// haven't yet applied to another
|
||||||
ihit->processed = true;
|
ihit->processed = true;
|
||||||
}
|
}
|
||||||
|
|
@ -3238,8 +3238,8 @@ void Spell::cast(bool skipCheck)
|
||||||
m_spellState = SPELL_STATE_DELAYED;
|
m_spellState = SPELL_STATE_DELAYED;
|
||||||
SetDelayStart(0);
|
SetDelayStart(0);
|
||||||
|
|
||||||
// on spell cast end proc,
|
// on spell cast end proc,
|
||||||
// critical hit related part is currently done on hit so proc there,
|
// critical hit related part is currently done on hit so proc there,
|
||||||
// 0 damage since any damage based procs should be on hit
|
// 0 damage since any damage based procs should be on hit
|
||||||
// 0 victim proc since there is no victim proc dependent on successfull cast for caster
|
// 0 victim proc since there is no victim proc dependent on successfull cast for caster
|
||||||
m_caster->ProcDamageAndSpell(procTarget, m_procAttacker, 0, PROC_EX_CAST_END, 0, m_attackType, m_spellInfo);
|
m_caster->ProcDamageAndSpell(procTarget, m_procAttacker, 0, PROC_EX_CAST_END, 0, m_attackType, m_spellInfo);
|
||||||
|
|
@ -4675,9 +4675,9 @@ SpellCastResult Spell::CheckCast(bool strict)
|
||||||
|
|
||||||
// totem immunity for channeled spells(needs to be before spell cast)
|
// totem immunity for channeled spells(needs to be before spell cast)
|
||||||
// spell attribs for player channeled spells
|
// spell attribs for player channeled spells
|
||||||
if ((m_spellInfo->AttributesEx & SPELL_ATTR_EX_UNK14)
|
if ((m_spellInfo->AttributesEx & SPELL_ATTR_EX_UNK14)
|
||||||
&& (m_spellInfo->AttributesEx5 & SPELL_ATTR_EX5_UNK13)
|
&& (m_spellInfo->AttributesEx5 & SPELL_ATTR_EX5_UNK13)
|
||||||
&& target->GetTypeId() == TYPEID_UNIT
|
&& target->GetTypeId() == TYPEID_UNIT
|
||||||
&& ((Creature*)target)->IsTotem())
|
&& ((Creature*)target)->IsTotem())
|
||||||
return SPELL_FAILED_IMMUNE;
|
return SPELL_FAILED_IMMUNE;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -626,7 +626,7 @@ enum ProcFlagsEx
|
||||||
PROC_EX_EX_TRIGGER_ALWAYS = 0x0010000, // If set trigger always ( no matter another flags) used for drop charges
|
PROC_EX_EX_TRIGGER_ALWAYS = 0x0010000, // If set trigger always ( no matter another flags) used for drop charges
|
||||||
PROC_EX_EX_ONE_TIME_TRIGGER = 0x0020000, // If set trigger always but only one time (not used)
|
PROC_EX_EX_ONE_TIME_TRIGGER = 0x0020000, // If set trigger always but only one time (not used)
|
||||||
PROC_EX_PERIODIC_POSITIVE = 0x0040000, // For periodic heal
|
PROC_EX_PERIODIC_POSITIVE = 0x0040000, // For periodic heal
|
||||||
PROC_EX_CAST_END = 0x0080000 // procs on end of cast
|
PROC_EX_CAST_END = 0x0080000 // procs on end of cast
|
||||||
};
|
};
|
||||||
|
|
||||||
struct SpellProcEventEntry
|
struct SpellProcEventEntry
|
||||||
|
|
|
||||||
|
|
@ -197,7 +197,7 @@ bool Totem::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!IsPositiveSpell(spellInfo))
|
if (!IsPositiveSpell(spellInfo))
|
||||||
{
|
{
|
||||||
// immune to all negative auras
|
// immune to all negative auras
|
||||||
|
|
|
||||||
|
|
@ -873,7 +873,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
|
||||||
if (save->GetResetTime() < resettime)
|
if (save->GetResetTime() < resettime)
|
||||||
save->SetResetTime(resettime);
|
save->SetResetTime(resettime);
|
||||||
}
|
}
|
||||||
|
|
||||||
// update encounter state if needed
|
// update encounter state if needed
|
||||||
((DungeonMap*)m)->GetPersistanceState()->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, ((Creature*)cVictim)->GetEntry());
|
((DungeonMap*)m)->GetPersistanceState()->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, ((Creature*)cVictim)->GetEntry());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ Location MoveSpline::ComputePosition() const
|
||||||
else if (splineflags.final_point)
|
else if (splineflags.final_point)
|
||||||
c.orientation = atan2(facing.f.y-c.y, facing.f.x-c.x);
|
c.orientation = atan2(facing.f.y-c.y, facing.f.x-c.x);
|
||||||
//nothing to do for MoveSplineFlag::Final_Target flag
|
//nothing to do for MoveSplineFlag::Final_Target flag
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!splineflags.hasFlag(MoveSplineFlag::OrientationFixed|MoveSplineFlag::Falling))
|
if (!splineflags.hasFlag(MoveSplineFlag::OrientationFixed|MoveSplineFlag::Falling))
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ namespace Movement
|
||||||
moveFlags &= ~MOVEFLAG_WALK_MODE;
|
moveFlags &= ~MOVEFLAG_WALK_MODE;
|
||||||
|
|
||||||
moveFlags |= (MOVEFLAG_SPLINE_ENABLED|MOVEFLAG_FORWARD);
|
moveFlags |= (MOVEFLAG_SPLINE_ENABLED|MOVEFLAG_FORWARD);
|
||||||
|
|
||||||
if (args.velocity == 0.f)
|
if (args.velocity == 0.f)
|
||||||
args.velocity = unit.GetSpeed(SelectSpeedType(moveFlags));
|
args.velocity = unit.GetSpeed(SelectSpeedType(moveFlags));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ namespace Movement
|
||||||
public:
|
public:
|
||||||
|
|
||||||
explicit MoveSplineInit(Unit& m);
|
explicit MoveSplineInit(Unit& m);
|
||||||
|
|
||||||
/* Final pass of initialization that launches spline movement.
|
/* Final pass of initialization that launches spline movement.
|
||||||
*/
|
*/
|
||||||
void Launch();
|
void Launch();
|
||||||
|
|
@ -49,7 +49,7 @@ namespace Movement
|
||||||
* @param amplitude - the maximum height of parabola, value could be negative and positive
|
* @param amplitude - the maximum height of parabola, value could be negative and positive
|
||||||
* @param start_time - delay between movement starting time and beginning to move by parabolic trajectory
|
* @param start_time - delay between movement starting time and beginning to move by parabolic trajectory
|
||||||
* can't be combined with final animation
|
* can't be combined with final animation
|
||||||
*/
|
*/
|
||||||
void SetParabolic(float amplitude, float start_time);
|
void SetParabolic(float amplitude, float start_time);
|
||||||
/* Plays animation after movement done
|
/* Plays animation after movement done
|
||||||
* can't be combined with parabolic movement
|
* can't be combined with parabolic movement
|
||||||
|
|
@ -59,7 +59,7 @@ namespace Movement
|
||||||
/* Adds final facing animation
|
/* Adds final facing animation
|
||||||
* sets unit's facing to specified point/angle after all path done
|
* sets unit's facing to specified point/angle after all path done
|
||||||
* you can have only one final facing: previous will be overriden
|
* you can have only one final facing: previous will be overriden
|
||||||
*/
|
*/
|
||||||
void SetFacing(float angle);
|
void SetFacing(float angle);
|
||||||
void SetFacing(Vector3 const& point);
|
void SetFacing(Vector3 const& point);
|
||||||
void SetFacing(const Unit * target);
|
void SetFacing(const Unit * target);
|
||||||
|
|
@ -67,11 +67,11 @@ namespace Movement
|
||||||
/* Initializes movement by path
|
/* Initializes movement by path
|
||||||
* @param path - array of points, shouldn't be empty
|
* @param path - array of points, shouldn't be empty
|
||||||
* @param pointId - Id of fisrt point of the path. Example: when third path point will be done it will notify that pointId + 3 done
|
* @param pointId - Id of fisrt point of the path. Example: when third path point will be done it will notify that pointId + 3 done
|
||||||
*/
|
*/
|
||||||
void MovebyPath(const PointsArray& path, int32 pointId = 0);
|
void MovebyPath(const PointsArray& path, int32 pointId = 0);
|
||||||
|
|
||||||
/* Initializes simple A to B mition, A is current unit's position, B is destination
|
/* Initializes simple A to B mition, A is current unit's position, B is destination
|
||||||
*/
|
*/
|
||||||
void MoveTo(const Vector3& destination);
|
void MoveTo(const Vector3& destination);
|
||||||
void MoveTo(float x, float y, float z);
|
void MoveTo(float x, float y, float z);
|
||||||
|
|
||||||
|
|
@ -85,10 +85,10 @@ namespace Movement
|
||||||
*/
|
*/
|
||||||
void SetSmooth();
|
void SetSmooth();
|
||||||
/* Enables CatmullRom spline interpolation mode, enables flying animation. Disabled by default
|
/* Enables CatmullRom spline interpolation mode, enables flying animation. Disabled by default
|
||||||
*/
|
*/
|
||||||
void SetFly();
|
void SetFly();
|
||||||
/* Enables walk mode. Disabled by default
|
/* Enables walk mode. Disabled by default
|
||||||
*/
|
*/
|
||||||
void SetWalk(bool enable);
|
void SetWalk(bool enable);
|
||||||
/* Makes movement cyclic. Disabled by default
|
/* Makes movement cyclic. Disabled by default
|
||||||
*/
|
*/
|
||||||
|
|
@ -107,7 +107,7 @@ namespace Movement
|
||||||
* if no set, speed will be selected based on unit's speeds and current movement mode
|
* if no set, speed will be selected based on unit's speeds and current movement mode
|
||||||
* Has no effect if falling mode enabled
|
* Has no effect if falling mode enabled
|
||||||
* velocity shouldn't be negative
|
* velocity shouldn't be negative
|
||||||
*/
|
*/
|
||||||
void SetVelocity(float velocity);
|
void SetVelocity(float velocity);
|
||||||
|
|
||||||
PointsArray& Path() { return args.path; }
|
PointsArray& Path() { return args.path; }
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ namespace Movement
|
||||||
{
|
{
|
||||||
path.reserve(path_capacity);
|
path.reserve(path_capacity);
|
||||||
}
|
}
|
||||||
|
|
||||||
PointsArray path;
|
PointsArray path;
|
||||||
FacingInfo facing;
|
FacingInfo facing;
|
||||||
MoveSplineFlag flags;
|
MoveSplineFlag flags;
|
||||||
|
|
@ -57,7 +57,7 @@ namespace Movement
|
||||||
uint32 splineId;
|
uint32 splineId;
|
||||||
float initialOrientation;
|
float initialOrientation;
|
||||||
|
|
||||||
/** Returns true to show that the arguments were configured correctly and MoveSpline initialization will succeed. */
|
/** Returns true to show that the arguments were configured correctly and MoveSpline initialization will succeed. */
|
||||||
bool Validate() const;
|
bool Validate() const;
|
||||||
private:
|
private:
|
||||||
bool _checkPathBounds() const;
|
bool _checkPathBounds() const;
|
||||||
|
|
|
||||||
|
|
@ -141,7 +141,7 @@ namespace Movement
|
||||||
WriteCatmullRomCyclicPath(spline, data);
|
WriteCatmullRomCyclicPath(spline, data);
|
||||||
else
|
else
|
||||||
WriteCatmullRomPath(spline, data);
|
WriteCatmullRomPath(spline, data);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
WriteLinearPath(spline, data);
|
WriteLinearPath(spline, data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MANGOSSERVER_PACKET_BUILDER_H
|
#ifndef MANGOSSERVER_PACKET_BUILDER_H
|
||||||
#define MANGOSSERVER_PACKET_BUILDER_H
|
#define MANGOSSERVER_PACKET_BUILDER_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,7 @@ public:
|
||||||
index_type getPointCount() const { return points.size();}
|
index_type getPointCount() const { return points.size();}
|
||||||
const Vector3& getPoint(index_type i) const { return points[i];}
|
const Vector3& getPoint(index_type i) const { return points[i];}
|
||||||
|
|
||||||
/** Initializes spline. Don't call other methods while spline not initialized. */
|
/** Initializes spline. Don't call other methods while spline not initialized. */
|
||||||
void init_spline(const Vector3 * controls, index_type count, EvaluationMode m);
|
void init_spline(const Vector3 * controls, index_type count, EvaluationMode m);
|
||||||
void init_cyclic_spline(const Vector3 * controls, index_type count, EvaluationMode m, index_type cyclic_point);
|
void init_cyclic_spline(const Vector3 * controls, index_type count, EvaluationMode m, index_type cyclic_point);
|
||||||
|
|
||||||
|
|
@ -159,7 +159,7 @@ public:
|
||||||
|
|
||||||
/** Calculates the position for given segment Idx, and percent of segment length t
|
/** Calculates the position for given segment Idx, and percent of segment length t
|
||||||
@param t = partial_segment_length / whole_segment_length
|
@param t = partial_segment_length / whole_segment_length
|
||||||
@param Idx - spline segment index, should be in range [first, last). */
|
@param Idx - spline segment index, should be in range [first, last). */
|
||||||
void evaluate_percent(index_type Idx, float u, Vector3& c) const { SplineBase::evaluate_percent(Idx,u,c);}
|
void evaluate_percent(index_type Idx, float u, Vector3& c) const { SplineBase::evaluate_percent(Idx,u,c);}
|
||||||
|
|
||||||
/** Caclulates derivation for index Idx, and percent of segment length t
|
/** Caclulates derivation for index Idx, and percent of segment length t
|
||||||
|
|
@ -171,11 +171,11 @@ public:
|
||||||
index_type computeIndexInBounds(float t) const;
|
index_type computeIndexInBounds(float t) const;
|
||||||
void computeIndex(float t, index_type& out_idx, float& out_u) const;
|
void computeIndex(float t, index_type& out_idx, float& out_u) const;
|
||||||
|
|
||||||
/** Initializes spline. Don't call other methods while spline not initialized. */
|
/** Initializes spline. Don't call other methods while spline not initialized. */
|
||||||
void init_spline(const Vector3 * controls, index_type count, EvaluationMode m) { SplineBase::init_spline(controls,count,m);}
|
void init_spline(const Vector3 * controls, index_type count, EvaluationMode m) { SplineBase::init_spline(controls,count,m);}
|
||||||
void init_cyclic_spline(const Vector3 * controls, index_type count, EvaluationMode m, index_type cyclic_point) { SplineBase::init_cyclic_spline(controls,count,m,cyclic_point);}
|
void init_cyclic_spline(const Vector3 * controls, index_type count, EvaluationMode m, index_type cyclic_point) { SplineBase::init_cyclic_spline(controls,count,m,cyclic_point);}
|
||||||
|
|
||||||
/** Initializes lengths with SplineBase::SegLength method. */
|
/** Initializes lengths with SplineBase::SegLength method. */
|
||||||
void initLengths();
|
void initLengths();
|
||||||
|
|
||||||
/** Initializes lengths in some custom way
|
/** Initializes lengths in some custom way
|
||||||
|
|
|
||||||
|
|
@ -174,7 +174,7 @@ namespace Movement
|
||||||
STR(Final_Target ),// 0x00010000,
|
STR(Final_Target ),// 0x00010000,
|
||||||
STR(Final_Angle ),// 0x00020000,
|
STR(Final_Angle ),// 0x00020000,
|
||||||
STR(Catmullrom ),// 0x00040000, // Used Catmullrom Interpolation Mode
|
STR(Catmullrom ),// 0x00040000, // Used Catmullrom Interpolation Mode
|
||||||
STR(Cyclic ),// 0x00080000, // Movement By Cycled Spline
|
STR(Cyclic ),// 0x00080000, // Movement By Cycled Spline
|
||||||
STR(Enter_Cycle ),// 0x00100000, // Everytime Appears With Cyclic Flag In Monster Move Packet
|
STR(Enter_Cycle ),// 0x00100000, // Everytime Appears With Cyclic Flag In Monster Move Packet
|
||||||
STR(Animation ),// 0x00200000, // Animationid (0...3), Uint32 Time, Not Compartible With Trajectory And Fall Movement
|
STR(Animation ),// 0x00200000, // Animationid (0...3), Uint32 Time, Not Compartible With Trajectory And Fall Movement
|
||||||
STR(Unknown4 ),// 0x00400000, // Disables Movement By Path
|
STR(Unknown4 ),// 0x00400000, // Disables Movement By Path
|
||||||
|
|
@ -193,7 +193,7 @@ namespace Movement
|
||||||
void print_flags(Flags t, const char* (&names)[N], std::string& str)
|
void print_flags(Flags t, const char* (&names)[N], std::string& str)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < N; ++i)
|
for (int i = 0; i < N; ++i)
|
||||||
{
|
{
|
||||||
if ((t & (Flags)(1 << i)) && names[i] != NULL)
|
if ((t & (Flags)(1 << i)) && names[i] != NULL)
|
||||||
str.append(" ").append(names[i]);
|
str.append(" ").append(names[i]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
/// Function body definitions for the template function members of the Database class
|
/// Function body definitions for the template function members of the Database class
|
||||||
|
|
||||||
#define ASYNC_QUERY_BODY(sql) if (!sql || !m_pResultQueue) return false;
|
#define ASYNC_QUERY_BODY(sql) if (!sql || !m_pResultQueue) return false;
|
||||||
#define ASYNC_DELAYHOLDER_BODY(holder) if (!holder || !m_pResultQueue) return false;
|
#define ASYNC_DELAYHOLDER_BODY(holder) if (!holder || !m_pResultQueue) return false;
|
||||||
|
|
||||||
#define ASYNC_PQUERY_BODY(format, szQuery) \
|
#define ASYNC_PQUERY_BODY(format, szQuery) \
|
||||||
if(!format) return false; \
|
if(!format) return false; \
|
||||||
|
|
|
||||||
|
|
@ -226,7 +226,7 @@ bool PostgreSQLConnection::CommitTransaction()
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PostgreSQLConnection::RollbackTransaction()
|
bool PostgreSQLConnection::RollbackTransaction()
|
||||||
{
|
{
|
||||||
return _TransactionCmd("ROLLBACK");
|
return _TransactionCmd("ROLLBACK");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "11832"
|
#define REVISION_NR "11833"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue