mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 19:45:34 +00:00
Code Issues Releases Wiki Activity

More container and door trap fixes

Browse source
This commit is contained in:
Michael Papageorgiou 2012-02-27 16:59:45 +02:00
parent 28fdfb0f99
commit fe977fe313
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwclass/container.cpp
View file

@ -99,8 +99,9 @@ namespace MWClass
else else
{ {
// Trap activation goes here // Trap activation goes here
std::cout << "Trapped with: " << ptr.getCellRef().trap << std::endl; std::cout << "Activated trap: " << ptr.getCellRef().trap << std::endl;
environment.mSoundManager->playSound(trapActivationSound, 1.0, 1.0); environment.mSoundManager->playSound(trapActivationSound, 1.0, 1.0);
ptr.getCellRef().trap = "";
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction); return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
} }
} }

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

@ -66,6 +66,7 @@ namespace MWClass
const std::string &openSound = ref->base->openSound; const std::string &openSound = ref->base->openSound;
//const std::string &closeSound = ref->base->closeSound; //const std::string &closeSound = ref->base->closeSound;
const std::string lockedSound = "LockedDoor"; const std::string lockedSound = "LockedDoor";
const std::string trapActivationSound = "Disarm Trap Fail";
if (ptr.getCellRef().lockLevel>0) if (ptr.getCellRef().lockLevel>0)
{ {
@ -76,7 +77,14 @@ namespace MWClass
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction); return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
} }
// TODO check trap if(!ptr.getCellRef().trap.empty())
{
// Trap activation
std::cout << "Activated trap: " << ptr.getCellRef().trap << std::endl;
environment.mSoundManager->playSound(trapActivationSound, 1.0, 1.0);
ptr.getCellRef().trap = "";
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
}
if (ref->ref.teleport) if (ref->ref.teleport)
{ {
@ -99,6 +107,9 @@ namespace MWClass
{ {
// animated door // animated door
// TODO return action for rotating the door // TODO return action for rotating the door
// This is a little pointless, but helps with testing
environment.mSoundManager->playSound(openSound, 1.0, 1.0);
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction); return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
} }
} }