mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-21 04:41:35 +00:00
Code Issues Releases Wiki Activity

Make all MWMechanics::Actor functions inline

Browse source
This commit is contained in:
elsid 2022-05-18 19:58:53 +02:00
parent 77c09dff39
commit 1bb1053569
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
3 changed files with 22 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/CMakeLists.txt
View file

@ -95,7 +95,7 @@ add_openmw_dir (mwmechanics
mechanicsmanagerimp stat creaturestats magiceffects movement actorutil spelllist mechanicsmanagerimp stat creaturestats magiceffects movement actorutil spelllist
drawstate spells activespells npcstats aipackage aisequence aipursue alchemy aiwander aitravel aifollow aiavoiddoor aibreathe drawstate spells activespells npcstats aipackage aisequence aipursue alchemy aiwander aitravel aifollow aiavoiddoor aibreathe
aicast aiescort aiface aiactivate aicombat recharge repair enchanting pathfinding pathgrid security spellcasting spellresistance aicast aiescort aiface aiactivate aicombat recharge repair enchanting pathfinding pathgrid security spellcasting spellresistance
disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction actor summoning disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction summoning
character actors objects aistate trading weaponpriority spellpriority weapontype spellutil character actors objects aistate trading weaponpriority spellpriority weapontype spellutil
spelleffects spelleffects
) )

82
apps/openmw/mwmechanics/actor.cpp
View file

@ -1,82 +0,0 @@
#include "actor.hpp"
#include "character.hpp"
namespace MWMechanics
{
Actor::Actor(const MWWorld::Ptr &ptr, MWRender::Animation *animation)
: mCharacterController(ptr, animation)
, mPositionAdjusted(false)
{
}
const MWWorld::Ptr& Actor::getPtr() const
{
return mCharacterController.getPtr();
}
void Actor::updatePtr(const MWWorld::Ptr &newPtr)
{
mCharacterController.updatePtr(newPtr);
}
CharacterController& Actor::getCharacterController()
{
return mCharacterController;
}
int Actor::getGreetingTimer() const
{
return mGreetingTimer;
}
void Actor::setGreetingTimer(int timer)
{
mGreetingTimer = timer;
}
float Actor::getAngleToPlayer() const
{
return mTargetAngleRadians;
}
void Actor::setAngleToPlayer(float angle)
{
mTargetAngleRadians = angle;
}
GreetingState Actor::getGreetingState() const
{
return mGreetingState;
}
void Actor::setGreetingState(GreetingState state)
{
mGreetingState = state;
}
bool Actor::isTurningToPlayer() const
{
return mIsTurningToPlayer;
}
void Actor::setTurningToPlayer(bool turning)
{
mIsTurningToPlayer = turning;
}
Misc::TimerStatus Actor::updateEngageCombatTimer(float duration)
{
return mEngageCombat.update(duration, MWBase::Environment::get().getWorld()->getPrng());
}
void Actor::setPositionAdjusted(bool adjusted)
{
mPositionAdjusted = adjusted;
}
bool Actor::getPositionAdjusted() const
{
return mPositionAdjusted;
}
}

36
apps/openmw/mwmechanics/actor.hpp
View file

@ -23,31 +23,37 @@ namespace MWMechanics
class Actor class Actor
{ {
public: public:
Actor(const MWWorld::Ptr& ptr, MWRender::Animation* animation); Actor(const MWWorld::Ptr& ptr, MWRender::Animation* animation)
: mCharacterController(ptr, animation)
, mPositionAdjusted(false)
{}
const MWWorld::Ptr& getPtr() const; const MWWorld::Ptr& getPtr() const { return mCharacterController.getPtr(); }
/// Notify this actor of its new base object Ptr, use when the object changed cells /// Notify this actor of its new base object Ptr, use when the object changed cells
void updatePtr(const MWWorld::Ptr& newPtr); void updatePtr(const MWWorld::Ptr& newPtr) { mCharacterController.updatePtr(newPtr); }
CharacterController& getCharacterController(); CharacterController& getCharacterController() { return mCharacterController; }
int getGreetingTimer() const; int getGreetingTimer() const { return mGreetingTimer; }
void setGreetingTimer(int timer); void setGreetingTimer(int timer) { mGreetingTimer = timer; }
float getAngleToPlayer() const; float getAngleToPlayer() const { return mTargetAngleRadians; }
void setAngleToPlayer(float angle); void setAngleToPlayer(float angle) { mTargetAngleRadians = angle; }
GreetingState getGreetingState() const; GreetingState getGreetingState() const { return mGreetingState; }
void setGreetingState(GreetingState state); void setGreetingState(GreetingState state) { mGreetingState = state; }
bool isTurningToPlayer() const; bool isTurningToPlayer() const { return mIsTurningToPlayer; }
void setTurningToPlayer(bool turning); void setTurningToPlayer(bool turning) { mIsTurningToPlayer = turning; }
Misc::TimerStatus updateEngageCombatTimer(float duration); Misc::TimerStatus updateEngageCombatTimer(float duration)
{
return mEngageCombat.update(duration, MWBase::Environment::get().getWorld()->getPrng());
}
void setPositionAdjusted(bool adjusted); void setPositionAdjusted(bool adjusted) { mPositionAdjusted = adjusted; }
bool getPositionAdjusted() const; bool getPositionAdjusted() const { return mPositionAdjusted; }
private: private:
CharacterController mCharacterController; CharacterController mCharacterController;