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

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-02-26 13:23:15 +01:00
commit 281e0042ab
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwworld/scene.cpp
View file

@ -230,7 +230,7 @@ namespace MWWorld
cell->getCell()->getGridX(), cell->getCell()->getGridX(),
cell->getCell()->getGridY() cell->getCell()->getGridY()
); );
if (land) { if (land && land->mDataTypes&ESM::Land::DATA_VHGT) {
// Actually only VHGT is needed here, but we'll need the rest for rendering anyway. // Actually only VHGT is needed here, but we'll need the rest for rendering anyway.
// Load everything now to reduce IO overhead. // Load everything now to reduce IO overhead.
const int flags = ESM::Land::DATA_VCLR|ESM::Land::DATA_VHGT|ESM::Land::DATA_VNML|ESM::Land::DATA_VTEX; const int flags = ESM::Land::DATA_VCLR|ESM::Land::DATA_VHGT|ESM::Land::DATA_VNML|ESM::Land::DATA_VTEX;

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

@ -423,6 +423,19 @@ namespace MWWorld
globals["werewolfclawmult"] = ESM::Variant(25.f); globals["werewolfclawmult"] = ESM::Variant(25.f);
globals["pcknownwerewolf"] = ESM::Variant(0); globals["pcknownwerewolf"] = ESM::Variant(0);
// following should exist in all versions of MW, but not necessarily in TCs
globals["gamehour"] = ESM::Variant(0.f);
globals["timescale"] = ESM::Variant(30.f);
globals["day"] = ESM::Variant(1);
globals["month"] = ESM::Variant(1);
globals["year"] = ESM::Variant(1);
globals["pcrace"] = ESM::Variant(0);
globals["pchascrimegold"] = ESM::Variant(0);
globals["pchasgolddiscount"] = ESM::Variant(0);
globals["crimegolddiscount"] = ESM::Variant(0);
globals["crimegoldturnin"] = ESM::Variant(0);
globals["pchasturnin"] = ESM::Variant(0);
for (std::map<std::string, ESM::Variant>::iterator it = gmst.begin(); it != gmst.end(); ++it) for (std::map<std::string, ESM::Variant>::iterator it = gmst.begin(); it != gmst.end(); ++it)
{ {
if (!mStore.get<ESM::GameSetting>().search(it->first)) if (!mStore.get<ESM::GameSetting>().search(it->first))