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

Close doors instantly when using Lock instruction

Browse source
This commit is contained in:
scrawl 2014-07-22 17:55:54 +02:00
parent 2b57c7fa67
commit ca45a63cf7
5 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -398,8 +398,9 @@ namespace MWBase
/// open or close a non-teleport door (depending on current state) /// open or close a non-teleport door (depending on current state)
virtual void activateDoor(const MWWorld::Ptr& door) = 0; virtual void activateDoor(const MWWorld::Ptr& door) = 0;
/// open or close a non-teleport door as specified /// update movement state of a non-teleport door as specified
virtual void activateDoor(const MWWorld::Ptr& door, bool open) = 0; /// @param state see MWClass::setDoorState
virtual void activateDoor(const MWWorld::Ptr& door, int state) = 0;
virtual bool getPlayerStandingOn (const MWWorld::Ptr& object) = 0; ///< @return true if the player is standing on \a object virtual bool getPlayerStandingOn (const MWWorld::Ptr& object) = 0; ///< @return true if the player is standing on \a object
virtual bool getActorStandingOn (const MWWorld::Ptr& object) = 0; ///< @return true if any actor is standing on \a object virtual bool getActorStandingOn (const MWWorld::Ptr& object) = 0; ///< @return true if any actor is standing on \a object

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

@ -62,7 +62,7 @@ namespace MWClass
const DoorCustomData& customData = dynamic_cast<const DoorCustomData&>(*ptr.getRefData().getCustomData()); const DoorCustomData& customData = dynamic_cast<const DoorCustomData&>(*ptr.getRefData().getCustomData());
if (customData.mDoorState > 0) if (customData.mDoorState > 0)
{ {
MWBase::Environment::get().getWorld()->activateDoor(ptr, customData.mDoorState == 1 ? true : false); MWBase::Environment::get().getWorld()->activateDoor(ptr, customData.mDoorState);
} }
} }
} }

8
apps/openmw/mwscript/miscextensions.cpp
View file

@ -147,6 +147,14 @@ namespace MWScript
} }
ptr.getClass().lock (ptr, lockLevel); ptr.getClass().lock (ptr, lockLevel);
// Instantly reset door to closed state
// This is done when using Lock in scripts, but not when using Lock spells.
if (ptr.getTypeName() == typeid(ESM::Door).name())
{
MWBase::Environment::get().getWorld()->activateDoor(ptr, 0);
MWBase::Environment::get().getWorld()->localRotateObject(ptr, 0, 0, 0);
}
} }
}; };

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

@ -1123,6 +1123,9 @@ namespace MWWorld
ptr.getRefData().setPosition(pos); ptr.getRefData().setPosition(pos);
if(ptr.getRefData().getBaseNode() == 0)
return;
if (ptr.getClass().isActor()) if (ptr.getClass().isActor())
mWorldScene->updateObjectRotation(ptr); mWorldScene->updateObjectRotation(ptr);
else else
@ -1130,8 +1133,6 @@ namespace MWWorld
} }
void World::localRotateObject (const Ptr& ptr, float x, float y, float z) void World::localRotateObject (const Ptr& ptr, float x, float y, float z)
{
if (ptr.getRefData().getBaseNode() != 0)
{ {
LocalRotation rot = ptr.getRefData().getLocalRotation(); LocalRotation rot = ptr.getRefData().getLocalRotation();
rot.rot[0]=Ogre::Degree(x).valueRadians(); rot.rot[0]=Ogre::Degree(x).valueRadians();
@ -1144,6 +1145,8 @@ namespace MWWorld
ptr.getRefData().setLocalRotation(rot); ptr.getRefData().setLocalRotation(rot);
if (ptr.getRefData().getBaseNode() != 0)
{
mWorldScene->updateObjectLocalRotation(ptr); mWorldScene->updateObjectLocalRotation(ptr);
} }
} }
@ -1983,11 +1986,12 @@ namespace MWWorld
mDoorStates[door] = state; mDoorStates[door] = state;
} }
void World::activateDoor(const Ptr &door, bool open) void World::activateDoor(const Ptr &door, int state)
{ {
int state = open ? 1 : 2;
door.getClass().setDoorState(door, state); door.getClass().setDoorState(door, state);
mDoorStates[door] = state; mDoorStates[door] = state;
if (state == 0)
mDoorStates.erase(door);
} }
bool World::getPlayerStandingOn (const MWWorld::Ptr& object) bool World::getPlayerStandingOn (const MWWorld::Ptr& object)

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

@ -473,8 +473,9 @@ namespace MWWorld
/// open or close a non-teleport door (depending on current state) /// open or close a non-teleport door (depending on current state)
virtual void activateDoor(const MWWorld::Ptr& door); virtual void activateDoor(const MWWorld::Ptr& door);
/// open or close a non-teleport door as specified /// update movement state of a non-teleport door as specified
virtual void activateDoor(const MWWorld::Ptr& door, bool open); /// @param state see MWClass::setDoorState
virtual void activateDoor(const MWWorld::Ptr& door, int state);
virtual bool getPlayerStandingOn (const MWWorld::Ptr& object); ///< @return true if the player is standing on \a object virtual bool getPlayerStandingOn (const MWWorld::Ptr& object); ///< @return true if the player is standing on \a object
virtual bool getActorStandingOn (const MWWorld::Ptr& object); ///< @return true if any actor is standing on \a object virtual bool getActorStandingOn (const MWWorld::Ptr& object); ///< @return true if any actor is standing on \a object