From 86c286c24e1db69c9c64fe1a67b1a16ad1347999 Mon Sep 17 00:00:00 2001 From: MiroslavR Date: Tue, 9 Sep 2014 15:12:42 +0200 Subject: [PATCH] Fix werewolf globals --- apps/openmw/mwclass/npc.cpp | 3 +-- apps/openmw/mwworld/worldimp.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp index f20850c96..006ed06f8 100644 --- a/apps/openmw/mwclass/npc.cpp +++ b/apps/openmw/mwclass/npc.cpp @@ -571,8 +571,7 @@ namespace MWClass { healthdmg = true; // GLOB instead of GMST because it gets updated during a quest - const MWWorld::Store &glob = world->getStore().get(); - damage *= glob.find("WerewolfClawMult")->mValue.getFloat(); + damage *= world->getGlobalFloat("werewolfclawmult"); } if(healthdmg) damage *= store.find("fHandtoHandHealthPer")->getFloat(); diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 7ba200083..ec8433262 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -389,8 +389,8 @@ namespace MWWorld std::map globals; // vanilla Morrowind does not define dayspassed. globals["dayspassed"] = ESM::Variant(1); // but the addons start counting at 1 :( - globals["WerewolfClawMult"] = ESM::Variant(1.f); - globals["PCKnownWerewolf"] = ESM::Variant(0); + globals["werewolfclawmult"] = ESM::Variant(25.f); + globals["pcknownwerewolf"] = ESM::Variant(0); for (std::map::iterator it = gmst.begin(); it != gmst.end(); ++it) {