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

Fix crash in dialogue filter if local variables are not configured

Browse source 
This could happen e.g. by 'some_npc_in_remote_cell->forcegreeting'
This commit is contained in:
scrawl 2017-09-25 21:21:51 +02:00
parent 36c192a1dd
commit e8c6a3b225
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwdialogue/filter.cpp
View file

@ -193,7 +193,8 @@ bool MWDialogue::Filter::testFunctionLocal(const MWDialogue::SelectWrapper& sele
return false; // shouldn't happen, we checked that variable has a type above, so must exist return false; // shouldn't happen, we checked that variable has a type above, so must exist
const MWScript::Locals& locals = mActor.getRefData().getLocals(); const MWScript::Locals& locals = mActor.getRefData().getLocals();
if (locals.isEmpty())
return select.selectCompare(0);
switch (type) switch (type)
{ {
case 's': return select.selectCompare (static_cast<int> (locals.mShorts[index])); case 's': return select.selectCompare (static_cast<int> (locals.mShorts[index]));