mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'whosabaddoggo' into 'master'

Browse Source 
Handle AllowWerewolfForceGreeting variable (bug #7609)

Closes #7609

See merge request OpenMW/openmw!3476
This commit is contained in:
psi29a 2023-10-09 11:35:16 +00:00
commit ab631fcd70
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -76,6 +76,7 @@
Bug #7573: Drain Fatigue can't bring fatigue below zero by default
Bug #7603: Scripts menu size is not updated properly
Bug #7604: Goblins Grunt becomes idle once injured
Bug #7609: ForceGreeting should not open dialogue for werewolves
Feature #3537: Shader-based water ripples
Feature #5492: Let rain and snow collide with statics
Feature #6149: Dehardcode Lua API_REVISION

9
apps/openmw/mwscript/dialogueextensions.cpp
View File

@ -135,6 +135,15 @@ namespace MWScript
return;
}
bool greetWerewolves = false;
const ESM::RefId& script = ptr.getClass().getScript(ptr);
if (!script.empty())
greetWerewolves = ptr.getRefData().getLocals().hasVar(script, "allowwerewolfforcegreeting");
const MWWorld::Ptr& player = MWBase::Environment::get().getWorld()->getPlayerPtr();
if (player.getClass().getNpcStats(player).isWerewolf() && !greetWerewolves)
return;
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue, ptr);
}
};