diff --git a/CMakeLists.txt b/CMakeLists.txt index c85acd9d..91817cc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,8 @@ set(SOURCES sources/Runner/Runner.hpp sources/Map/Map.cpp sources/Map/Map.hpp - sources/Bonus/Bonus.cpp - sources/Bonus/Bonus.hpp + sources/Items/Bonus.cpp + sources/Items/Bonus.hpp sources/Component/Bonus/BonusComponent.cpp sources/Component/Bonus/BonusComponent.hpp sources/Component/Position/PositionComponent.cpp diff --git a/assets/items/bombup.png b/assets/items/bombup.png new file mode 100644 index 00000000..687a064f Binary files /dev/null and b/assets/items/bombup.png differ diff --git a/assets/items/fireup.png b/assets/items/fireup.png new file mode 100644 index 00000000..2756f248 Binary files /dev/null and b/assets/items/fireup.png differ diff --git a/assets/items/items.png-autosave.kra b/assets/items/items.png-autosave.kra new file mode 100644 index 00000000..a41c6732 Binary files /dev/null and b/assets/items/items.png-autosave.kra differ diff --git a/assets/items/speedup.png b/assets/items/speedup.png new file mode 100644 index 00000000..81157d2f Binary files /dev/null and b/assets/items/speedup.png differ diff --git a/assets/items/speedup.png~ b/assets/items/speedup.png~ new file mode 100644 index 00000000..9a3f6fa1 Binary files /dev/null and b/assets/items/speedup.png~ differ diff --git a/assets/items/wallpass.png b/assets/items/wallpass.png new file mode 100644 index 00000000..0ecd6181 Binary files /dev/null and b/assets/items/wallpass.png differ diff --git a/sources/System/Health/HealthSystem.cpp b/sources/System/Health/HealthSystem.cpp index 82afdfeb..9c49303a 100644 --- a/sources/System/Health/HealthSystem.cpp +++ b/sources/System/Health/HealthSystem.cpp @@ -51,7 +51,7 @@ namespace BBM // std::cout << "Bonus disappeared" << std::endl; // bonus.scheduleDeletion(); // }) - .addComponent>(map.at(bonusType) + ".obj", std::make_pair(MAP_DIFFUSE, "assets/items/items.png")); + .addComponent>(map.at(bonusType) + ".obj", std::make_pair(MAP_DIFFUSE, map.at(bonusType) + ".png")); } void HealthSystem::onFixedUpdate(WAL::Entity &entity)