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

better filters

Browse source
This commit is contained in:
gugus 2012-03-18 15:26:18 +01:00
parent d9677cb33e
commit 019a28093b
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,79 +164,79 @@ namespace MWDialogue
switch(ifunction) switch(ifunction)
{ {
case 39://PC Expelled case 39://PC Expelled
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 43://PC Crime level case 43://PC Crime level
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 46://Same faction case 46://Same faction
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 48://Detected case 48://Detected
if(!selectCompare(comp,1,select.i)) return false; if(!selectCompare<int,int>(comp,1,select.i)) return false;
break; break;
case 49://Alarmed case 49://Alarmed
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 50://choice case 50://choice
isAChoice = true; isAChoice = true;
if(choice) if(choice)
{ {
if(!selectCompare(comp,mChoice,select.i)) return false; if(!selectCompare<int,int>(comp,mChoice,select.i)) return false;
} }
break; break;
case 60://PC Vampire case 60://PC Vampire
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 61://Level case 61://Level
if(!selectCompare(comp,1,select.i)) return false; if(!selectCompare<int,int>(comp,1,select.i)) return false;
break; break;
case 62://Attacked case 62://Attacked
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 63://Talked to PC case 63://Talked to PC
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 64://PC Health case 64://PC Health
if(!selectCompare(comp,50,select.i)) return false; if(!selectCompare<int,int>(comp,50,select.i)) return false;
break; break;
case 65://Creature target case 65://Creature target
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 66://Friend hit case 66://Friend hit
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 67://Fight case 67://Fight
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 68://Hello???? case 68://Hello????
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 69://Alarm case 69://Alarm
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 70://Flee case 70://Flee
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
case 71://Should Attack case 71://Should Attack
if(!selectCompare(comp,0,select.i)) return false; if(!selectCompare<int,int>(comp,0,select.i)) return false;
break; break;
default: default:
@ -331,6 +331,9 @@ namespace MWDialogue
return true; return true;
case '5'://item
if(!selectCompare<int,int>(comp,0,select.i)) return false;
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
{ {
@ -563,6 +566,8 @@ namespace MWDialogue
void DialogueManager::startDialogue (const MWWorld::Ptr& actor) void DialogueManager::startDialogue (const MWWorld::Ptr& actor)
{ {
mChoice = -1;
mIsInChoice = false;
std::cout << "talking with " << MWWorld::Class::get (actor).getName (actor) << std::endl; std::cout << "talking with " << MWWorld::Class::get (actor).getName (actor) << std::endl;
mActor = actor; mActor = actor;