diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-03-01 08:00:55 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-03-01 08:00:55 -0500 |
| commit | 97c701f329bf3da154c23b0529f194d4d8823287 (patch) | |
| tree | e003610fa009b82eff3580a6b72407f282b19510 /include/ui.h | |
| parent | 4df411931dd63f22258be76911e0648c3cdc3936 (diff) | |
| parent | 26d71799f37bc325b6db0214268f4e72eb970ee9 (diff) | |
Work on merchants and yer mum
Diffstat (limited to 'include/ui.h')
| -rw-r--r-- | include/ui.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/ui.h b/include/ui.h index 0499570..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; @@ -148,7 +146,8 @@ namespace ui { */ void dialogBox(const char *name,const char *opt,bool passive,const char *text,...); - void merchantBox(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); /* @@ -187,7 +186,6 @@ namespace ui { void toggleWhiteFast(void); void waitForCover(void); - void waitForNothing(unsigned int); } #endif // UI_H |