diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-03-14 07:34:08 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-03-14 07:34:08 -0400 |
| commit | 569d23b5d4577fce1473a82ae7f8977205ff7f0f (patch) | |
| tree | 6c07dd0389dad04c2b8ccd93068f173547b0bb8e /include | |
| parent | 98e08cb7c2ae6c61192bac73a1fc7254224452be (diff) | |
Faggot
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.h | 1 | ||||
| -rw-r--r-- | include/ui.h | 2 | ||||
| -rw-r--r-- | include/world.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/include/entities.h b/include/entities.h index ef421f5..450975f 100644 --- a/include/entities.h +++ b/include/entities.h @@ -219,6 +219,7 @@ public: class Merchant : public NPC{ public: std::vector<Trade>trade; + uint currTrade; void interact(); diff --git a/include/ui.h b/include/ui.h index ed9fb94..f933a37 100644 --- a/include/ui.h +++ b/include/ui.h @@ -106,6 +106,7 @@ namespace ui { extern bool posFlag; extern unsigned char dialogOptChosen; + extern unsigned char merchOptChosen; extern bool dialogBoxExists; extern bool dialogImportant; extern bool dialogPassive; @@ -148,6 +149,7 @@ 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 closeBox(); void waitForDialog(void); /* diff --git a/include/world.h b/include/world.h index a60eab6..2290b18 100644 --- a/include/world.h +++ b/include/world.h @@ -53,6 +53,7 @@ enum class WorldWeather : unsigned char { typedef struct { vec2 loc; /**< Light location */ Color color; /**< Light color */ + float radius; } Light; /** |