diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/inventory.cpp | 11 | ||||
| -rw-r--r-- | src/gui/shop.cpp | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/gui/inventory.cpp b/src/gui/inventory.cpp index 807fae15..9d48f0fb 100644 --- a/src/gui/inventory.cpp +++ b/src/gui/inventory.cpp @@ -53,11 +53,12 @@ void TmwInventory::draw(BITMAP * buffer) { update_dialog(inventory_player); for(int i=0;i<INVENTORY_SIZE;i++) { if(items[i].quantity>0) { - if(items[i].id>=501 && items[i].id<=510) - masked_blit((BITMAP *)itemset[items[i].id-500].dat, gui_bitmap, 0, 0, inventory_dialog[0].x+24*i, inventory_dialog[0].y+26, 22, 22); - else - masked_blit((BITMAP *)itemset[0].dat, gui_bitmap, 0, 0, inventory_dialog[0].x+24*i, inventory_dialog[0].y+26, 22, 22); - textprintf_ex(gui_bitmap, font, inventory_dialog[0].x+24*i, inventory_dialog[0].y+44, makecol(0,0,0), -1, "%i", items[i].quantity); + if(items[i].id>=501 && items[i].id<=511) + draw_rle_sprite(gui_bitmap, (RLE_SPRITE *)itemset[items[i].id-501].dat, inventory_dialog[0].x+24*i, inventory_dialog[0].y+26); + //else + //masked_blit((BITMAP *)itemset[0].dat, gui_bitmap, 0, 0, inventory_dialog[0].x+24*i, inventory_dialog[0].y+26, 22, 22); + + textprintf_ex(gui_bitmap, font, inventory_dialog[0].x+24*i, inventory_dialog[0].y+44, makecol(0,0,0), -1, "%i", items[i].quantity); } } } diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp index 25aac085..0220ad67 100644 --- a/src/gui/shop.cpp +++ b/src/gui/shop.cpp @@ -28,8 +28,8 @@ char* selectedItem = "You got 4"; ITEM_SHOP *shop = NULL; char *item_db[] = { - "Cactus Drink", "Cactus potion", "Casino coins", "Royal Jam", "Faerie Walnut", - "Cup of wishes", "Magic rope", "Midge mallet", "Flammie drum", "Moogle belt" + "Cactus Drink", "Cactus potion", "Casino coins", "Decor Candy", "Maggot Slime", + "Candy Cane", "Scorpion Stinger", "Xmas Cake", "Chocolate", "Candy", "Santa Hat" }; char *shop_list(int index, int *list_size) { @@ -49,7 +49,7 @@ char *shop_list(int index, int *list_size) { void add_buy_item(short id, int price) { ITEM_SHOP *item_shop = (ITEM_SHOP *)malloc(sizeof(ITEM_SHOP)); - if(id-501>=0 && id-501<=2) + if(id-501>=0 && id-501<=11) sprintf(item_shop->name, "%s %i gp", item_db[id-501], price); else sprintf(item_shop->name, "Unknown item %i gp", price); |