merge

3 files changed, 17 insertions, 17 deletions

diff --git a/include/entities.h b/include/entities.h
index c10bcd4..ef421f5 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -52,22 +52,20 @@ enum BUILD_SUB{
 	STALL_TRADER = 71
 };
 
-class BuySell{
+class Trade{
 public:
-	int member;
-	union{
-		struct{
-			std::string item1;
-			std::string item2;
-		}trade;
-		struct{
-			enum type{BUY,SELL};
-			std::string item;
-			int price;
-		}cost;
-	};
-	BuySell(){}
-	~BuySell(){}
+	std::string item[2];
+	int quantity[2];
+	Trade(int qo, const char* o, int qt, const char* t){
+		item[0] = o;
+		item[1] = t;
+
+		quantity[0] = qo;
+		quantity[1] = qt;
+
+		std::cout << "Trading: " << quantity[0] << " " << item[0] << " for " << quantity[1] << " " << item[1] << std::endl;
+	}
+	Trade(){}
 };
 
 class World;
@@ -220,7 +218,8 @@ public:
 
 class Merchant : public NPC{
 public:
-	std::vector<BuySell>bsinv;
+	std::vector<Trade>trade;
+
 	void interact();
 
 	Merchant();
diff --git a/include/inventory.h b/include/inventory.h
index 8225ab2..69cf073 100644
--- a/include/inventory.h
+++ b/include/inventory.h
@@ -62,6 +62,7 @@ void initInventorySprites(void);
 void destroyInventory(void);
 
 const char *getItemTexturePath(std::string name);
+GLuint getItemTexture(std::string name);
 float getItemWidth(std::string name);
 float getItemHeight(std::string name);
 
diff --git a/include/ui.h b/include/ui.h
index 667a581..ed9fb94 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -146,7 +146,7 @@ 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(const char *name,Trade trade,const char *opt,bool passive,const char *text,...);
 	void merchantBox();
 	void waitForDialog(void);