diff --git a/assets/items.json b/assets/items.json index 53df9a8..a8f6df3 100644 --- a/assets/items.json +++ b/assets/items.json @@ -38,7 +38,6 @@ "foreground": [150, 100, 189], "background": [150, 100, 189] }, - {"_type": "Loot", "amount": 10}, {"_type": "Sprite", "name": "barrel_small", "width": 256, "height": 256, "scale": 1.0}, {"_type": "Sound", "attack": "pickup", "death": "blank"} ], @@ -84,7 +83,6 @@ "foreground": [32, 123, 164], "background": [24, 205, 189] }, - {"_type": "Loot", "amount": 10}, {"_type": "Sprite", "name": "grave_stone", "width": 256, "height": 256, "scale": 1.0}, {"_type": "Sound", "attack": "pickup", "death": "blank"} ] diff --git a/combat_ui.cpp b/combat_ui.cpp index 10dbe5a..c1d836f 100644 --- a/combat_ui.cpp +++ b/combat_ui.cpp @@ -17,14 +17,16 @@ namespace gui { ); } - DinkyECS::Entity CombatUI::make_button(std::string name, std::wstring label, Events::GUI event, int action, const std::string &icon_name, - const std::string &sound, const std::string &effect_name) + DinkyECS::Entity CombatUI::make_button( + std::string name, + Events::GUI event, + int action, + const std::string &icon_name, + const std::string &sound, + const std::string &effect_name) { - (void)label; auto button = $gui.entity(name); $gui.set(button, {icon_name}); - // $gui.set(button, {}); - // $gui.set