Now shops get item names from the xml database

4 files changed, 2 insertions, 133 deletions

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 2da38c36..c26be5d3 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -102,12 +102,7 @@ void BuyDialog::addItem(short id, int price)
 {
     ITEM_SHOP item_shop;
 
-    if (id >= 501 && id <= 2301) {
-        sprintf(item_shop.name, "%s %i gp", item_db[id - 501], price);
-    }
-    else {
-        sprintf(item_shop.name, "Unknown item %i gp", price);
-    }
+    sprintf(item_shop.name, "%s %i gp", itemDb.getName(id).c_str(), price);
     item_shop.price = price;
     item_shop.id = id;
 
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index d4bd1d8a..2c9e8745 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -93,12 +93,7 @@ void SellDialog::addItem(short index, int price)
     int id = inventoryWindow->items->getId(index);
     ITEM_SHOP item_shop;
 
-    if (id >= 501 && id <= 2301) {
-        sprintf(item_shop.name, "%s %i gp", item_db[id - 501], price);
-    }
-    else {
-        sprintf(item_shop.name, "Unknown item %i gp", price);
-    }
+    sprintf(item_shop.name, "%s %i gp", itemDb.getName(id).c_str(), price);
     item_shop.price = price;
     item_shop.index = index;
     item_shop.id = id;
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index 09d99669..1dd498a8 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -23,122 +23,3 @@
 
 #include "shop.h"
 
-// TODO: replace it with item database
-
-char *item_db[] = {
-    "Cactus Drink",
-    "Cactus potion",
-    "Casino coins",
-    "Decor Candy",
-    "Maggot Slime",
-    "Candy Cane",
-    "Scorpion Stinger",
-    "Xmas Cake",
-    "Chocolate",
-    "Candy",
-    "Santa Hat",
-    "Ginger bread man",
-    "Slice of cake",
-    "Xmas candy cane",
-    "Purple present",
-    "Yellow present",
-    "Red scorpion stinger",
-    "Bug leg",
-    "Cherry cake",
-    "Easter Egg",
-    "Dagger",
-    "Sharp knife",
-    "Leather shirt",
-    "Fancy hat","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    
-    // 601    
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    
-    // 701
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    
-    // 801
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    
-    // 901
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    
-    // 1001
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-
-    // 1101
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","Arrow","Bow",
-    
-    // 1201
-    "Knife","Cotton Shirt","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-    "","","","","","","","","","",
-};
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 635075a1..c3d85780 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -35,6 +35,4 @@ struct ITEM_SHOP {
     int quantity;
 };
 
-extern char *item_db[];
-
 #endif