mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 07:21:12 +00:00
Code Issues Projects Releases Wiki Activity

Some more missing isInCell checks

Browse Source
This commit is contained in:
scrawl 2014-05-25 15:06:53 +02:00
parent f3ba31de2d
commit 10d835a55c
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/openmw/mwscript/cellextensions.cpp
View File

@ -142,6 +142,11 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime) virtual void execute (Interpreter::Runtime& runtime)
{ {
if (!MWBase::Environment::get().getWorld()->getPlayerPtr().isInCell())
{
runtime.push(0.f);
return;
}
MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell(); MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell();
if (cell->getCell()->hasWater()) if (cell->getCell()->hasWater())
runtime.push (cell->getWaterLevel()); runtime.push (cell->getWaterLevel());
@ -158,6 +163,11 @@ namespace MWScript
{ {
Interpreter::Type_Float level = runtime[0].mFloat; Interpreter::Type_Float level = runtime[0].mFloat;
if (!MWBase::Environment::get().getWorld()->getPlayerPtr().isInCell())
{
return;
}
MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell(); MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell();
if (cell->getCell()->isExterior()) if (cell->getCell()->isExterior())
@ -176,6 +186,11 @@ namespace MWScript
{ {
Interpreter::Type_Float level = runtime[0].mFloat; Interpreter::Type_Float level = runtime[0].mFloat;
if (!MWBase::Environment::get().getWorld()->getPlayerPtr().isInCell())
{
return;
}
MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell(); MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell();
if (cell->getCell()->isExterior()) if (cell->getCell()->isExterior())