diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-02-23 22:29:12 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-02-23 22:29:12 -0500 |
| commit | 8a2517c3068bb8fc7b22a01a2f75ab5537342063 (patch) | |
| tree | d1a9973766afa8f09a6676155ff78908db4821ef /include/ui.h | |
| parent | d1ee9a1b4b4d02b564b554a30314a97c1982da22 (diff) | |
| parent | 0396f428411eb015f796643f9e7e38ca97f8fd42 (diff) | |
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'include/ui.h')
| -rw-r--r-- | include/ui.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/ui.h b/include/ui.h index 671a92c..6a81ff8 100644 --- a/include/ui.h +++ b/include/ui.h @@ -50,6 +50,12 @@ public: std::vector<menuItem>items; Menu *child; Menu *parent; + ~Menu(){ + child = NULL; + parent = NULL; + delete child; + delete parent; + } void gotoChild(); void gotoParent(); @@ -104,6 +110,7 @@ namespace ui { extern unsigned char dialogOptChosen; extern bool dialogBoxExists; extern bool dialogImportant; + extern bool dialogPassive; extern unsigned int textWrapLimit; @@ -148,6 +155,7 @@ namespace ui { */ void importantText(const char *text,...); + void passiveImportantText(int duration,const char *text,...); /* * Draw various UI elements (dialogBox, player health) |