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

Fix GetPcInJail to work as in the original engine

Browse source
This commit is contained in:
scrawl 2016-01-05 23:27:42 +01:00
parent 190bf15887
commit 4f8f166f69
4 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -545,6 +545,8 @@ namespace MWBase
virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) = 0; virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) = 0;
virtual void removeContainerScripts(const MWWorld::Ptr& reference) = 0; virtual void removeContainerScripts(const MWWorld::Ptr& reference) = 0;
virtual bool isPlayerInJail() const = 0;
}; };
} }

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

@ -1014,7 +1014,7 @@ namespace MWScript
virtual void execute (Interpreter::Runtime &runtime) virtual void execute (Interpreter::Runtime &runtime)
{ {
runtime.push (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Jail)); runtime.push (MWBase::Environment::get().getWorld()->isPlayerInJail());
} }
}; };

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

@ -2996,6 +2996,14 @@ namespace MWWorld
} }
} }
bool World::isPlayerInJail() const
{
if (mGoToJail)
return true;
return MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Jail);
}
void World::spawnRandomCreature(const std::string &creatureList) void World::spawnRandomCreature(const std::string &creatureList)
{ {
const ESM::CreatureLevList* list = getStore().get<ESM::CreatureLevList>().find(creatureList); const ESM::CreatureLevList* list = getStore().get<ESM::CreatureLevList>().find(creatureList);

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

@ -645,6 +645,8 @@ namespace MWWorld
/// Return the distance between actor's weapon and target's collision box. /// Return the distance between actor's weapon and target's collision box.
virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target); virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target);
virtual bool isPlayerInJail() const;
}; };
} }