mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 20:53:50 +00:00
Code Issues Releases Wiki Activity

some cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2012-08-26 18:50:47 +02:00
parent 450656a890
commit d0cebea580
3 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwworld/action.cpp
View file

@ -6,9 +6,8 @@
#include "../mwbase/soundmanager.hpp"
MWWorld::Action::Action() {
teleport = false;
}
MWWorld::Action::Action (bool teleport) : mTeleport (teleport)
{}
MWWorld::Action::~Action() {}
@ -16,7 +15,7 @@ void MWWorld::Action::execute (const Ptr& actor)
{
if (!mSoundId.empty())
{
if (teleport == true)
if (mTeleport == true)
{
//this is a teleport action, so we need to call playSound
MWBase::Environment::get().getSoundManager()->playSound(mSoundId, 1.0, 1.0,

7
apps/openmw/mwworld/action.hpp
View file

@ -11,6 +11,7 @@ namespace MWWorld
class Action
{
std::string mSoundId;
bool mTeleport;
// not implemented
Action (const Action& action);
@ -18,12 +19,10 @@ namespace MWWorld
virtual void executeImp (const Ptr& actor) = 0;
protected:
bool teleport; //True if the action will teleport the actor
public:
Action();
Action (bool teleport = false);
///< \param teleport action will teleport the actor
virtual ~Action();

5
apps/openmw/mwworld/actionteleport.cpp
View file

@ -8,15 +8,12 @@ namespace MWWorld
{
ActionTeleport::ActionTeleport (const std::string& cellName,
const ESM::Position& position)
: mCellName (cellName), mPosition (position)
: Action (true), mCellName (cellName), mPosition (position)
{
teleport = true;
}
void ActionTeleport::executeImp (const Ptr& actor)
{
teleport = true;
if (mCellName.empty())
MWBase::Environment::get().getWorld()->changeToExteriorCell (mPosition);
else