mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 14:11:32 +00:00
Code Issues Releases Wiki Activity

Prevent potentially returning garbage flags

Browse source
This commit is contained in:
Evil Eye 2022-10-17 09:37:56 +02:00
parent 1c17260d87
commit 81f138cea0
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/dialoguemanager.hpp
View file

@ -89,7 +89,7 @@ namespace MWBase
}; };
virtual std::list<std::string> getAvailableTopics() = 0; virtual std::list<std::string> getAvailableTopics() = 0;
virtual int getTopicFlag(const std::string&) = 0; virtual int getTopicFlag(const std::string&) const = 0;
virtual bool checkServiceRefused(ResponseCallback* callback, ServiceType service = ServiceType::Any) = 0; virtual bool checkServiceRefused(ResponseCallback* callback, ServiceType service = ServiceType::Any) = 0;

7
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View file

@ -424,9 +424,12 @@ namespace MWDialogue
return keywordList; return keywordList;
} }
int DialogueManager::getTopicFlag(const std::string& topicId) int DialogueManager::getTopicFlag(const std::string& topicId) const
{ {
return mActorKnownTopics[topicId].mFlags; auto known = mActorKnownTopics.find(topicId);
if (known != mActorKnownTopics.end())
return known->second.mFlags;
return 0;
} }
void DialogueManager::keywordSelected(const std::string& keyword, ResponseCallback* callback) void DialogueManager::keywordSelected(const std::string& keyword, ResponseCallback* callback)

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

@ -82,7 +82,7 @@ namespace MWDialogue
bool startDialogue(const MWWorld::Ptr& actor, ResponseCallback* callback) override; bool startDialogue(const MWWorld::Ptr& actor, ResponseCallback* callback) override;
std::list<std::string> getAvailableTopics() override; std::list<std::string> getAvailableTopics() override;
int getTopicFlag(const std::string& topicId) override; int getTopicFlag(const std::string& topicId) const override;
bool inJournal(const std::string& topicId, const std::string& infoId) override; bool inJournal(const std::string& topicId, const std::string& infoId) override;