From 34b33b78d2b1e2d2f29ebaa80ca2f417bbf03ee7 Mon Sep 17 00:00:00 2001 From: gugus Date: Sun, 18 Mar 2012 17:58:14 +0100 Subject: [PATCH] better filters --- apps/openmw/mwdialogue/dialoguemanager.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwdialogue/dialoguemanager.cpp b/apps/openmw/mwdialogue/dialoguemanager.cpp index 4e80b8dc79..925191be30 100644 --- a/apps/openmw/mwdialogue/dialoguemanager.cpp +++ b/apps/openmw/mwdialogue/dialoguemanager.cpp @@ -168,6 +168,14 @@ namespace MWDialogue if(!selectCompare(comp,0,select.i)) return false; break; + case 40://PC Common Disease + if(!selectCompare(comp,0,select.i)) return false; + break; + + case 41://PC Blight Disease + if(!selectCompare(comp,0,select.i)) return false; + break; + case 43://PC Crime level if(!selectCompare(comp,0,select.i)) return false; break; @@ -333,15 +341,17 @@ namespace MWDialogue return true; case '5'://item + { MWWorld::Ptr player = mEnvironment.mWorld->getPlayer().getPlayer(); MWWorld::ContainerStore& store = MWWorld::Class::get (player).getContainerStore (player); - Interpreter::Type_Integer sum = 0; + int sum = 0; for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter) if (iter->getCellRef().refID==name) sum += iter->getRefData().getCount(); if(!selectCompare(comp,sum,select.i)) return false; + } 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