Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem

Conflicts: apps/openmw/mwdialogue/dialoguemanager.cpp
2012-03-18 17:59:11 +01:00 · 2012-03-18 17:59:11 +01:00 · 48e6a42168
commit 48e6a42168
parent 34b33b78d2 76b24d9d1a
1 changed files with 3 additions and 0 deletions
--- a/apps/openmw/mwdialogue/dialoguemanager.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanager.cpp
@ -353,6 +353,9 @@ namespace MWDialogue
                if(!selectCompare<int,int>(comp,sum,select.i)) return false;
                }

+                return true;
+            }
+
            case '7':// not ID
                if(select.type==ESM::VT_String ||select.type==ESM::VT_Int)//bug in morrowind here? it's not a short, it's a string
                {