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

Issue #219: Support for boolean select structs

Browse source
This commit is contained in:
Marc Zinnschlag 2012-11-08 17:04:44 +01:00
parent b412ebd0af
commit f5972a3080
4 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -128,6 +128,7 @@ bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
case SelectWrapper::Type_None: return true; case SelectWrapper::Type_None: return true;
case SelectWrapper::Type_Integer: return select.selectCompare (getSelectStructInteger (select)); case SelectWrapper::Type_Integer: return select.selectCompare (getSelectStructInteger (select));
case SelectWrapper::Type_Numeric: return testSelectStructNumeric (select); case SelectWrapper::Type_Numeric: return testSelectStructNumeric (select);
case SelectWrapper::Type_Boolean: return select.selectCompare (getSelectStructBoolean (select));
} }
return true; return true;
@ -153,6 +154,16 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
} }
} }
bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) const
{
switch (select.getFunction())
{
default:
throw std::runtime_error ("unknown boolean select function");
}
}
MWDialogue::Filter::Filter (const MWWorld::Ptr& actor) : mActor (actor) {} MWDialogue::Filter::Filter (const MWWorld::Ptr& actor) : mActor (actor) {}
bool MWDialogue::Filter::operator() (const ESM::DialInfo& info) const bool MWDialogue::Filter::operator() (const ESM::DialInfo& info) const

2
apps/openmw/mwdialogue/filter.hpp
View file

@ -30,6 +30,8 @@ namespace MWDialogue
bool testSelectStructNumeric (const SelectWrapper& select) const; bool testSelectStructNumeric (const SelectWrapper& select) const;
int getSelectStructInteger (const SelectWrapper& select) const; int getSelectStructInteger (const SelectWrapper& select) const;
bool getSelectStructBoolean (const SelectWrapper& select) const;
public: public:

5
apps/openmw/mwdialogue/selectwrapper.cpp
View file

@ -65,3 +65,8 @@ bool MWDialogue::SelectWrapper::selectCompare (float value) const
{ {
return selectCompareImp (mSelect, value)!=IsInverted(); // logic XOR return selectCompareImp (mSelect, value)!=IsInverted(); // logic XOR
} }
bool MWDialogue::SelectWrapper::selectCompare (bool value) const
{
return selectCompareImp (mSelect, static_cast<int> (value))!=IsInverted(); // logic XOR
}

5
apps/openmw/mwdialogue/selectwrapper.hpp
View file

@ -20,7 +20,8 @@ namespace MWDialogue
{ {
Type_None, Type_None,
Type_Integer, Type_Integer,
Type_Numeric Type_Numeric,
Type_Boolean
}; };
public: public:
@ -36,6 +37,8 @@ namespace MWDialogue
bool selectCompare (int value) const; bool selectCompare (int value) const;
bool selectCompare (float value) const; bool selectCompare (float value) const;
bool selectCompare (bool value) const;
}; };
} }