teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix wrong door sounds

Browse source
This commit is contained in:
scrawl 2013-04-29 11:00:15 +02:00
parent 9648804af5
commit 867c7db014
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/world.hpp
View file

@ -326,6 +326,8 @@ namespace MWBase
virtual void setupPlayer(bool newGame) = 0; virtual void setupPlayer(bool newGame) = 0;
virtual void renderPlayer() = 0; virtual void renderPlayer() = 0;
virtual bool getOpenOrCloseDoor(const MWWorld::Ptr& door) = 0;
///< if activated, should this door be opened or closed?
virtual void activateDoor(const MWWorld::Ptr& door) = 0; virtual void activateDoor(const MWWorld::Ptr& door) = 0;
///< activate (open or close) an non-teleport door ///< activate (open or close) an non-teleport door

2
apps/openmw/mwclass/door.cpp
View file

@ -141,7 +141,7 @@ namespace MWClass
{ {
// animated door // animated door
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionDoor(ptr)); boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionDoor(ptr));
if (ptr.getRefData().getLocalRotation().rot[2] == 0) if (MWBase::Environment::get().getWorld()->getOpenOrCloseDoor(ptr))
action->setSound(openSound); action->setSound(openSound);
else else
action->setSound(closeSound); action->setSound(closeSound);

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

@ -1548,4 +1548,11 @@ namespace MWWorld
mDoorStates[door] = 0; // close mDoorStates[door] = 0; // close
} }
} }
bool World::getOpenOrCloseDoor(const Ptr &door)
{
if (mDoorStates.find(door) != mDoorStates.end())
return !mDoorStates[door]; // if currently opening or closing, then do the opposite
return door.getRefData().getLocalRotation().rot[2] == 0;
}
} }

8
apps/openmw/mwworld/worldimp.hpp
View file

@ -113,6 +113,9 @@ namespace MWWorld
void addContainerScripts(const Ptr& reference, Ptr::CellStore* cell); void addContainerScripts(const Ptr& reference, Ptr::CellStore* cell);
void PCDropped (const Ptr& item); void PCDropped (const Ptr& item);
virtual void processDoors(float duration);
///< Run physics simulation and modify \a world accordingly.
public: public:
World (OEngine::Render::OgreRenderer& renderer, World (OEngine::Render::OgreRenderer& renderer,
@ -272,9 +275,6 @@ namespace MWWorld
virtual void doPhysics(const PtrMovementList &actors, float duration); virtual void doPhysics(const PtrMovementList &actors, float duration);
///< Run physics simulation and modify \a world accordingly. ///< Run physics simulation and modify \a world accordingly.
virtual void processDoors(float duration);
///< Run physics simulation and modify \a world accordingly.
virtual bool toggleCollisionMode(); virtual bool toggleCollisionMode();
///< Toggle collision mode for player. If disabled player object should ignore ///< Toggle collision mode for player. If disabled player object should ignore
/// collisions and gravity. /// collisions and gravity.
@ -374,6 +374,8 @@ namespace MWWorld
virtual void setupPlayer(bool newGame); virtual void setupPlayer(bool newGame);
virtual void renderPlayer(); virtual void renderPlayer();
virtual bool getOpenOrCloseDoor(const MWWorld::Ptr& door);
///< if activated, should this door be opened or closed?
virtual void activateDoor(const MWWorld::Ptr& door); virtual void activateDoor(const MWWorld::Ptr& door);
///< activate (open or close) an non-teleport door ///< activate (open or close) an non-teleport door