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

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

Browse source 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanager.cpp
This commit is contained in:
gugus 2012-03-18 17:59:11 +01:00
commit 48e6a42168
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -353,6 +353,9 @@ namespace MWDialogue
if(!selectCompare<int,int>(comp,sum,select.i)) return false; if(!selectCompare<int,int>(comp,sum,select.i)) return false;
} }
return true;
}
case '7':// not ID 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 if(select.type==ESM::VT_String ||select.type==ESM::VT_Int)//bug in morrowind here? it's not a short, it's a string
{ {