aboutsummaryrefslogtreecommitdiffstats
path: root/include/ui.h
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2016-03-08 21:14:47 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2016-03-08 21:14:47 -0500
commit98e08cb7c2ae6c61192bac73a1fc7254224452be (patch)
tree2ff5a4b9254b0dc9217795dc8a76365736fd40e4 /include/ui.h
parent0a0766a186db892f7a8f28f0130a043fd9b9dff9 (diff)
parent82c75b0a97eba2f78206d3b97d47eaa580a82f0c (diff)
Fixed incorrect language percentages
Diffstat (limited to 'include/ui.h')
-rw-r--r--include/ui.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/include/ui.h b/include/ui.h
index 6a81ff8..ed9fb94 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,Trade trade,const char *opt,bool passive,const char *text,...);
+ void merchantBox();
void waitForDialog(void);
/*
@@ -186,7 +186,6 @@ namespace ui {
void toggleWhiteFast(void);
void waitForCover(void);
- void waitForNothing(unsigned int);
}
#endif // UI_H