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

[9446] Compile fix in MovementGenerator.cpp

Browse source 
Also added few newlines to end of files to satisfy GCC.

Signed-off-by: ApoC <apoc@nymfe.net>
This commit is contained in:
ApoC 2010-02-24 22:18:38 +01:00
parent 87b08b4fa1
commit 9d6531ae6d
5 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/game/MovementGenerator.cpp
View file

@ -17,6 +17,7 @@
*/ */
#include "MovementGenerator.h" #include "MovementGenerator.h"
#include "Unit.h"
MovementGenerator::~MovementGenerator() MovementGenerator::~MovementGenerator()
{ {
@ -27,4 +28,4 @@ bool MovementGenerator::IsActive( Unit& u )
// When movement generator list modified from Update movegen object erase delayed, // When movement generator list modified from Update movegen object erase delayed,
// so pointer still valid and be used for check // so pointer still valid and be used for check
return !u.GetMotionMaster()->empty() && u.GetMotionMaster()->top() == this; return !u.GetMotionMaster()->empty() && u.GetMotionMaster()->top() == this;
} }

1
src/game/MovementGenerator.h
View file

@ -124,3 +124,4 @@ typedef FactoryHolder<MovementGenerator,MovementGeneratorType> MovementGenerator
typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRegistry MovementGeneratorRegistry; typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRegistry MovementGeneratorRegistry;
typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository; typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository;
#endif #endif

2
src/game/Spell.cpp
View file

@ -6367,4 +6367,4 @@ WorldObject* Spell::GetCastingObject() const
return m_caster->IsInWorld() ? m_caster->GetMap()->GetGameObject(m_originalCasterGUID) : NULL; return m_caster->IsInWorld() ? m_caster->GetMap()->GetGameObject(m_originalCasterGUID) : NULL;
else else
return m_caster; return m_caster;
} }

2
src/game/WaypointMovementGenerator.h
View file

@ -138,4 +138,4 @@ public PathMovementBase<Player>
// allow use for overwrite empty implementation // allow use for overwrite empty implementation
bool GetDestination(float& x, float& y, float& z) const { return PathMovementBase<Player>::GetDestination(x,y,z); } bool GetDestination(float& x, float& y, float& z) const { return PathMovementBase<Player>::GetDestination(x,y,z); }
}; };
#endif #endif

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9445" #define REVISION_NR "9446"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__