Skip to content

Commit 84f8a68

Browse files
AnyOldName3AnyOldName3
committed
Renormalise line endings
This should replace accidental CRLF with LF
1 parent 4d01489 commit 84f8a68

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+9894
-9894
lines changed

‎apps/openmw/mwmechanics/aiactivate.cpp

+63-63
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
#include "aiactivate.hpp"
2-
3-
#include <components/esm3/aisequence.hpp>
4-
5-
#include "../mwbase/world.hpp"
6-
#include "../mwbase/environment.hpp"
7-
8-
#include "../mwworld/class.hpp"
9-
10-
#include "creaturestats.hpp"
11-
#include "movement.hpp"
12-
#include "steering.hpp"
13-
14-
namespace MWMechanics
15-
{
16-
AiActivate::AiActivate(std::string_view objectId, bool repeat)
17-
: TypedAiPackage<AiActivate>(repeat), mObjectId(objectId)
18-
{
19-
}
20-
21-
bool AiActivate::execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
22-
{
23-
const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
24-
25-
actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
26-
27-
// Stop if the target doesn't exist
28-
// Really we should be checking whether the target is currently registered with the MechanicsManager
29-
if (target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled())
30-
return true;
31-
32-
// Turn to target and move to it directly, without pathfinding.
33-
const osg::Vec3f targetDir = target.getRefData().getPosition().asVec3() - actor.getRefData().getPosition().asVec3();
34-
35-
zTurn(actor, std::atan2(targetDir.x(), targetDir.y()), 0.f);
36-
actor.getClass().getMovementSettings(actor).mPosition[1] = 1;
37-
actor.getClass().getMovementSettings(actor).mPosition[0] = 0;
38-
39-
if (MWBase::Environment::get().getWorld()->getMaxActivationDistance() >= targetDir.length())
40-
{
41-
// Note: we intentionally do not cancel package after activation here for backward compatibility with original engine.
42-
MWBase::Environment::get().getWorld()->activate(target, actor);
43-
}
44-
return false;
45-
}
46-
47-
void AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const
48-
{
49-
auto activate = std::make_unique<ESM::AiSequence::AiActivate>();
50-
activate->mTargetId = mObjectId;
51-
activate->mRepeat = getRepeat();
52-
53-
ESM::AiSequence::AiPackageContainer package;
54-
package.mType = ESM::AiSequence::Ai_Activate;
55-
package.mPackage = std::move(activate);
56-
sequence.mPackages.push_back(std::move(package));
57-
}
58-
59-
AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
60-
: AiActivate(activate->mTargetId, activate->mRepeat)
61-
{
62-
}
63-
}
1+
#include "aiactivate.hpp"
2+
3+
#include <components/esm3/aisequence.hpp>
4+
5+
#include "../mwbase/world.hpp"
6+
#include "../mwbase/environment.hpp"
7+
8+
#include "../mwworld/class.hpp"
9+
10+
#include "creaturestats.hpp"
11+
#include "movement.hpp"
12+
#include "steering.hpp"
13+
14+
namespace MWMechanics
15+
{
16+
AiActivate::AiActivate(std::string_view objectId, bool repeat)
17+
: TypedAiPackage<AiActivate>(repeat), mObjectId(objectId)
18+
{
19+
}
20+
21+
bool AiActivate::execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
22+
{
23+
const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
24+
25+
actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
26+
27+
// Stop if the target doesn't exist
28+
// Really we should be checking whether the target is currently registered with the MechanicsManager
29+
if (target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled())
30+
return true;
31+
32+
// Turn to target and move to it directly, without pathfinding.
33+
const osg::Vec3f targetDir = target.getRefData().getPosition().asVec3() - actor.getRefData().getPosition().asVec3();
34+
35+
zTurn(actor, std::atan2(targetDir.x(), targetDir.y()), 0.f);
36+
actor.getClass().getMovementSettings(actor).mPosition[1] = 1;
37+
actor.getClass().getMovementSettings(actor).mPosition[0] = 0;
38+
39+
if (MWBase::Environment::get().getWorld()->getMaxActivationDistance() >= targetDir.length())
40+
{
41+
// Note: we intentionally do not cancel package after activation here for backward compatibility with original engine.
42+
MWBase::Environment::get().getWorld()->activate(target, actor);
43+
}
44+
return false;
45+
}
46+
47+
void AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const
48+
{
49+
auto activate = std::make_unique<ESM::AiSequence::AiActivate>();
50+
activate->mTargetId = mObjectId;
51+
activate->mRepeat = getRepeat();
52+
53+
ESM::AiSequence::AiPackageContainer package;
54+
package.mType = ESM::AiSequence::Ai_Activate;
55+
package.mPackage = std::move(activate);
56+
sequence.mPackages.push_back(std::move(package));
57+
}
58+
59+
AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
60+
: AiActivate(activate->mTargetId, activate->mRepeat)
61+
{
62+
}
63+
}

‎apps/openmw/mwmechanics/aiactivate.hpp

+40-40
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
#ifndef GAME_MWMECHANICS_AIACTIVATE_H
2-
#define GAME_MWMECHANICS_AIACTIVATE_H
3-
4-
#include "typedaipackage.hpp"
5-
6-
#include <string>
7-
#include <string_view>
8-
9-
namespace ESM
10-
{
11-
namespace AiSequence
12-
{
13-
struct AiActivate;
14-
}
15-
}
16-
17-
namespace MWMechanics
18-
{
19-
/// \brief Causes actor to walk to activatable object and activate it
20-
/** Will activate when close to object **/
21-
class AiActivate final : public TypedAiPackage<AiActivate>
22-
{
23-
public:
24-
/// Constructor
25-
/** \param objectId Reference to object to activate **/
26-
explicit AiActivate(std::string_view objectId, bool repeat);
27-
28-
explicit AiActivate(const ESM::AiSequence::AiActivate* activate);
29-
30-
bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
31-
32-
static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Activate; }
33-
34-
void writeState(ESM::AiSequence::AiSequence& sequence) const override;
35-
36-
private:
37-
const std::string mObjectId;
38-
};
39-
}
40-
#endif // GAME_MWMECHANICS_AIACTIVATE_H
1+
#ifndef GAME_MWMECHANICS_AIACTIVATE_H
2+
#define GAME_MWMECHANICS_AIACTIVATE_H
3+
4+
#include "typedaipackage.hpp"
5+
6+
#include <string>
7+
#include <string_view>
8+
9+
namespace ESM
10+
{
11+
namespace AiSequence
12+
{
13+
struct AiActivate;
14+
}
15+
}
16+
17+
namespace MWMechanics
18+
{
19+
/// \brief Causes actor to walk to activatable object and activate it
20+
/** Will activate when close to object **/
21+
class AiActivate final : public TypedAiPackage<AiActivate>
22+
{
23+
public:
24+
/// Constructor
25+
/** \param objectId Reference to object to activate **/
26+
explicit AiActivate(std::string_view objectId, bool repeat);
27+
28+
explicit AiActivate(const ESM::AiSequence::AiActivate* activate);
29+
30+
bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
31+
32+
static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Activate; }
33+
34+
void writeState(ESM::AiSequence::AiSequence& sequence) const override;
35+
36+
private:
37+
const std::string mObjectId;
38+
};
39+
}
40+
#endif // GAME_MWMECHANICS_AIACTIVATE_H

0 commit comments

Comments
 (0)