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

Merge remote branch 'scrawl/water'

Browse source
This commit is contained in:
Marc Zinnschlag 2012-03-30 13:07:47 +02:00
commit a90c3b9f23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwscript/cellextensions.cpp
View file

@ -142,8 +142,8 @@ namespace MWScript
InterpreterContext& context
= static_cast<InterpreterContext&> (runtime.getContext());
const ESM::Cell *cell = context.getWorld().getPlayer().getPlayer().getCell()->cell;
runtime.push (cell->water);
MWWorld::Ptr::CellStore *cell = context.getWorld().getPlayer().getPlayer().getCell();
runtime.push (cell->mWaterLevel);
}
};

10
components/esm/loadcell.cpp
View file

@ -21,8 +21,14 @@ void Cell::load(ESMReader &esm)
if (data.flags & Interior)
{
// Interior cells
esm.getHNT(water, "WHGT", 4);
if (esm.isNextSub("INTV"))
{
int waterl;
esm.getHT(waterl);
water = (float) waterl;
}
else if (esm.isNextSub("WHGT"))
esm.getHT(water);
// Quasi-exterior cells have a region (which determines the
// weather), pure interior cells have ambient lighting