mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 13:53:51 +00:00
Code Issues Releases Wiki Activity

Fix dialogue choices being displayed in incorrect order

Browse source
This commit is contained in:
scrawl 2014-09-18 04:10:17 +02:00
parent be7839873a
commit ac97a0f99d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/dialogue.cpp
View file

@ -509,7 +509,7 @@ namespace MWGui
const MyGUI::Colour linkHot (223/255.f, 201/255.f, 159/255.f); const MyGUI::Colour linkHot (223/255.f, 201/255.f, 159/255.f);
const MyGUI::Colour linkNormal (150/255.f, 50/255.f, 30/255.f); const MyGUI::Colour linkNormal (150/255.f, 50/255.f, 30/255.f);
const MyGUI::Colour linkActive (243/255.f, 237/255.f, 221/255.f); const MyGUI::Colour linkActive (243/255.f, 237/255.f, 221/255.f);
for (std::map<std::string, int>::reverse_iterator it = mChoices.rbegin(); it != mChoices.rend(); ++it) for (std::vector<std::pair<std::string, int> >::iterator it = mChoices.begin(); it != mChoices.end(); ++it)
{ {
Choice* link = new Choice(it->second); Choice* link = new Choice(it->second);
mLinks.push_back(link); mLinks.push_back(link);
@ -600,7 +600,7 @@ namespace MWGui
void DialogueWindow::addChoice(const std::string& choice, int id) void DialogueWindow::addChoice(const std::string& choice, int id)
{ {
mChoices[choice] = id; mChoices.push_back(std::make_pair(choice, id));
updateHistory(); updateHistory();
} }

2
apps/openmw/mwgui/dialogue.hpp
View file

@ -161,7 +161,7 @@ namespace MWGui
bool mGoodbye; bool mGoodbye;
std::vector<DialogueText*> mHistoryContents; std::vector<DialogueText*> mHistoryContents;
std::map<std::string, int> mChoices; std::vector<std::pair<std::string, int> > mChoices;
std::vector<Link*> mLinks; std::vector<Link*> mLinks;
std::map<std::string, Link*> mTopicLinks; std::map<std::string, Link*> mTopicLinks;