mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 12:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Remove duplicate disposition code

Browse Source
This commit is contained in:
scrawl 2017-09-25 21:29:06 +02:00
parent e8c6a3b225
commit c5613e384e
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/openmw/mwgui/dialogue.cpp
View File

@ -384,7 +384,7 @@ namespace MWGui
delete (*it); delete (*it);
mLinks.clear(); mLinks.clear();
updateOptions(); updateDisposition();
restock(); restock();
} }
@ -579,13 +579,10 @@ namespace MWGui
updateHistory(); updateHistory();
} }
void DialogueWindow::updateOptions() void DialogueWindow::updateDisposition()
{ {
//Clear the list of topics
mTopicsList->clear();
bool dispositionVisible = false; bool dispositionVisible = false;
if (mPtr.getClass().isNpc()) if (!mPtr.isEmpty() && mPtr.getClass().isNpc())
{ {
dispositionVisible = true; dispositionVisible = true;
mDispositionBar->setProgressRange(100); mDispositionBar->setProgressRange(100);
@ -626,12 +623,6 @@ namespace MWGui
void DialogueWindow::onFrame(float dt) void DialogueWindow::onFrame(float dt)
{ {
checkReferenceAvailable(); checkReferenceAvailable();
if(!mPtr.isEmpty() && mPtr.getTypeName() == typeid(ESM::NPC).name()) updateDisposition();
{
int disp = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr);
mDispositionBar->setProgressRange(100);
mDispositionBar->setProgressPosition(disp);
mDispositionText->setCaption(MyGUI::utility::toString(disp)+std::string("/100"));
}
} }
} }

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

@ -135,7 +135,7 @@ namespace MWGui
virtual void onReferenceUnavailable(); virtual void onReferenceUnavailable();
private: private:
void updateOptions(); void updateDisposition();
void restock(); void restock();
bool mEnabled; bool mEnabled;