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

Handle swimleft and swimright soundgen keys

Browse source
This commit is contained in:
Chris Robinson 2013-08-08 01:35:22 -07:00
parent 109df46590
commit dfdd2dc308
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwclass/creature.cpp
View file

@ -420,6 +420,10 @@ namespace MWClass
return 1; return 1;
return -1; return -1;
} }
if(name == "swimleft")
return 2;
if(name == "swimright")
return 3;
if(name == "moan") if(name == "moan")
return 4; return 4;
if(name == "roar") if(name == "roar")

8
apps/openmw/mwclass/npc.cpp
View file

@ -940,6 +940,8 @@ namespace MWClass
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
Ogre::Vector3 pos(ptr.getRefData().getPosition().pos); Ogre::Vector3 pos(ptr.getRefData().getPosition().pos);
if(world->isSwimming(ptr))
return "Swim Left";
if(world->isUnderwater(ptr.getCell(), pos)) if(world->isUnderwater(ptr.getCell(), pos))
return "FootWaterLeft"; return "FootWaterLeft";
if(world->isOnGround(ptr)) if(world->isOnGround(ptr))
@ -965,6 +967,8 @@ namespace MWClass
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
Ogre::Vector3 pos(ptr.getRefData().getPosition().pos); Ogre::Vector3 pos(ptr.getRefData().getPosition().pos);
if(world->isSwimming(ptr))
return "Swim Right";
if(world->isUnderwater(ptr.getCell(), pos)) if(world->isUnderwater(ptr.getCell(), pos))
return "FootWaterRight"; return "FootWaterRight";
if(world->isOnGround(ptr)) if(world->isOnGround(ptr))
@ -986,6 +990,10 @@ namespace MWClass
} }
return ""; return "";
} }
if(name == "swimleft")
return "Swim Left";
if(name == "swimright")
return "Swim Right";
// TODO: I have no idea what these are supposed to do for NPCs since they use // TODO: I have no idea what these are supposed to do for NPCs since they use
// voiced dialog for various conditions like health loss and combat taunts. Maybe // voiced dialog for various conditions like health loss and combat taunts. Maybe
// only for biped creatures? // only for biped creatures?