summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-10-28 23:59:44 +0300
committerAndrei Karas <akaras@inbox.ru>2015-10-28 23:59:44 +0300
commit5973d759a2473425e52efd066892c35ab7502ed1 (patch)
tree5ce6add127f3d3cffbb89fa7a66045cb9e0e67ae /src/gui
parented17aa400a745a81940020e024a3944671a47281 (diff)
downloadplus-5973d759a2473425e52efd066892c35ab7502ed1.tar.gz
plus-5973d759a2473425e52efd066892c35ab7502ed1.tar.bz2
plus-5973d759a2473425e52efd066892c35ab7502ed1.tar.xz
plus-5973d759a2473425e52efd066892c35ab7502ed1.zip
Move all npc dialog menu related skin elements into menu tag.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/windows/npcdialog.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index f5639acd8..21c8fd577 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -1162,7 +1162,9 @@ void NpcDialog::createSkinControls()
}
mHideText = dialog->hideText;
- FOR_EACH (std::vector<NpcImageInfo*>::const_iterator, it, dialog->images)
+ FOR_EACH (std::vector<NpcImageInfo*>::const_iterator,
+ it,
+ dialog->menu.images)
{
const NpcImageInfo *const info = *it;
Image *const image = Theme::getImageFromTheme(info->name);
@@ -1173,7 +1175,9 @@ void NpcDialog::createSkinControls()
mSkinContainer->add(icon);
}
}
- FOR_EACH (std::vector<NpcTextInfo*>::const_iterator, it, dialog->texts)
+ FOR_EACH (std::vector<NpcTextInfo*>::const_iterator,
+ it,
+ dialog->menu.texts)
{
const NpcTextInfo *const info = *it;
BrowserBox *box = new BrowserBox(this,
@@ -1198,7 +1202,9 @@ void NpcDialog::createSkinControls()
box->addRow(*it2);
}
}
- FOR_EACH (std::vector<NpcButtonInfo*>::const_iterator, it, dialog->buttons)
+ FOR_EACH (std::vector<NpcButtonInfo*>::const_iterator,
+ it,
+ dialog->menu.buttons)
{
const NpcButtonInfo *const info = *it;
Button *const button = new Button(this);