From 569d23b5d4577fce1473a82ae7f8977205ff7f0f Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Mon, 14 Mar 2016 07:34:08 -0400
Subject: Faggot

---
 include/entities.h | 1 +
 include/ui.h       | 2 ++
 include/world.h    | 1 +
 3 files changed, 4 insertions(+)

(limited to 'include')

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;
 
 /**
-- 
cgit v1.2.3