diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-10-28 23:59:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-10-28 23:59:44 +0300 |
| commit | 5973d759a2473425e52efd066892c35ab7502ed1 (patch) | |
| tree | 5ce6add127f3d3cffbb89fa7a66045cb9e0e67ae /src/resources/npcdialoginfo.h | |
| parent | ed17aa400a745a81940020e024a3944671a47281 (diff) | |
| download | manaplus-5973d759a2473425e52efd066892c35ab7502ed1.tar.gz manaplus-5973d759a2473425e52efd066892c35ab7502ed1.tar.bz2 manaplus-5973d759a2473425e52efd066892c35ab7502ed1.tar.xz manaplus-5973d759a2473425e52efd066892c35ab7502ed1.zip | |
Move all npc dialog menu related skin elements into menu tag.
Diffstat (limited to 'src/resources/npcdialoginfo.h')
| -rw-r--r-- | src/resources/npcdialoginfo.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/resources/npcdialoginfo.h b/src/resources/npcdialoginfo.h index e6fe6e331..c45ae3b6f 100644 --- a/src/resources/npcdialoginfo.h +++ b/src/resources/npcdialoginfo.h @@ -22,6 +22,7 @@ #define RESOURCES_NPCDIALOGINFO_H #include "resources/npcbuttoninfo.h" +#include "resources/npcdialogmenuinfo.h" #include "resources/npcimageinfo.h" #include "resources/npctextinfo.h" @@ -32,16 +33,13 @@ struct NpcDialogInfo final { NpcDialogInfo() : - buttons(), - images(), + menu(), name(), hideText(false) { } - std::vector<NpcButtonInfo*> buttons; - std::vector<NpcImageInfo*> images; - std::vector<NpcTextInfo*> texts; + NpcDialogMenuInfo menu; std::string name; bool hideText; }; |