mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-29 07:37:45 +00:00
Code Activity

More refactoring, clean up

Browse source
This commit is contained in:
Mordred 2017-10-01 18:43:18 +02:00
parent dda9fb2cc6
commit 57a1c2e8a6
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/servers/Server_Zone/Actor/Actor.cpp
View file

@ -53,13 +53,13 @@ std::string Core::Entity::Actor::getName() const
/*! \return true if the actor is of type player */ /*! \return true if the actor is of type player */
bool Core::Entity::Actor::isPlayer() const bool Core::Entity::Actor::isPlayer() const
{ {
return ( m_type == ActorType::Player ? true : false ); return m_type == ActorType::Player;
} }
/*! \return true if the actor is of type mob */ /*! \return true if the actor is of type mob */
bool Core::Entity::Actor::isMob() const bool Core::Entity::Actor::isMob() const
{ {
return ( m_type == ActorType::BattleNpc ? true : false ); return m_type == ActorType::BattleNpc;
} }
/*! \return list of actors currently in range */ /*! \return list of actors currently in range */
@ -240,10 +240,7 @@ bool Core::Entity::Actor::face( const Common::FFXIVARR_POSITION3& p )
setRotation( newRot ); setRotation( newRot );
if( oldRot != newRot ) return oldRot != newRot ? true : false;
return true;
return false;
} }
/*! /*!
@ -629,7 +626,8 @@ void Core::Entity::Actor::addStatusEffect( StatusEffect::StatusEffectPtr pEffect
/*! \param StatusEffectPtr to be applied to the actor */ /*! \param StatusEffectPtr to be applied to the actor */
void Core::Entity::Actor::addStatusEffectById( uint32_t id, int32_t duration, Entity::Actor& pSource, uint16_t param ) void Core::Entity::Actor::addStatusEffectById( uint32_t id, int32_t duration, Entity::Actor& pSource, uint16_t param )
{ {
StatusEffect::StatusEffectPtr effect( new StatusEffect::StatusEffect( id, pSource.shared_from_this(), shared_from_this(), duration, 3000 ) ); StatusEffect::StatusEffectPtr effect( new StatusEffect::StatusEffect( id, pSource.shared_from_this(),
shared_from_this(), duration, 3000 ) );
effect->setParam( param ); effect->setParam( param );
addStatusEffect( effect ); addStatusEffect( effect );
} }
@ -639,7 +637,8 @@ void Core::Entity::Actor::addStatusEffectByIdIfNotExist( uint32_t id, int32_t du
{ {
if( !m_pStatusEffectContainer->hasStatusEffect( id ) ) if( !m_pStatusEffectContainer->hasStatusEffect( id ) )
{ {
StatusEffect::StatusEffectPtr effect( new StatusEffect::StatusEffect( id, pSource.shared_from_this(), shared_from_this(), duration, 3000 ) ); StatusEffect::StatusEffectPtr effect( new StatusEffect::StatusEffect( id, pSource.shared_from_this(),
shared_from_this(), duration, 3000 ) );
effect->setParam( param ); effect->setParam( param );
addStatusEffect( effect ); addStatusEffect( effect );
} }

2
src/servers/Server_Zone/Actor/BattleNpc.h
View file

@ -104,7 +104,7 @@ private:
uint32_t m_unk2; uint32_t m_unk2;
std::set< HateListEntry* > m_hateList; std::set< HateListEntry* > m_hateList;
ActorPtr m_pOwner; ActorPtr m_pOwner;
int32_t m_timeOfDeath; uint32_t m_timeOfDeath;
uint32_t m_mobType; uint32_t m_mobType;
}; };