diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-03-01 08:43:56 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-03-01 08:43:56 -0500 |
| commit | 47f8aa5b312a5ef671e83322bcbe201a034f84c0 (patch) | |
| tree | 8dccb7228c407e01024752b48dae7150b6b349e5 /include/ui.h | |
| parent | 32cb1880f018fc149d1c8a71a83426a8f5a92a6a (diff) | |
| parent | 883b348abac73d6c2b1d4ea8b65caccf0767e5a8 (diff) | |
merge with remake
Diffstat (limited to 'include/ui.h')
| -rw-r--r-- | include/ui.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/ui.h b/include/ui.h index 3e4fc8a..667a581 100644 --- a/include/ui.h +++ b/include/ui.h @@ -22,7 +22,6 @@ typedef void(*menuFunc)(); struct menuItem{ int member; union{ - struct{ vec2 loc; dim2 dim; @@ -30,7 +29,6 @@ struct menuItem{ const char* text; menuFunc func; }button; - struct{ vec2 loc; dim2 dim; @@ -108,9 +106,9 @@ namespace ui { extern bool posFlag; extern unsigned char dialogOptChosen; - extern bool dialogBoxExists; - extern bool dialogImportant; - extern bool dialogPassive; + extern bool dialogBoxExists; + extern bool dialogImportant; + extern bool dialogPassive; extern unsigned int textWrapLimit; @@ -148,6 +146,8 @@ namespace ui { */ void dialogBox(const char *name,const char *opt,bool passive,const char *text,...); + void merchantBox(const char *name, std::vector<BuySell> *items, const char *opt,bool passive,const char *text,...); + void merchantBox(); void waitForDialog(void); /* |