diff --git a/README.txt b/README.txt index 335c6d5..ccdf9cf 100644 --- a/README.txt +++ b/README.txt @@ -21,3 +21,4 @@ Space: pause ## Texture used Player/Enemy (modified): http://opengameart.org/content/top-down-runner Tiles (modified): http://opengameart.org/content/metalstone-textures +Item: http://opengameart.org/content/random-adventure-kit diff --git a/resources/textures/gadget.png b/resources/textures/gadget.png deleted file mode 100644 index d9adb6e..0000000 Binary files a/resources/textures/gadget.png and /dev/null differ diff --git a/resources/textures/item.png b/resources/textures/item.png new file mode 100644 index 0000000..c38e8a0 Binary files /dev/null and b/resources/textures/item.png differ diff --git a/resources/textures/weapon.png b/resources/textures/weapon.png deleted file mode 100644 index bf91d2a..0000000 Binary files a/resources/textures/weapon.png and /dev/null differ diff --git a/source/Game.cpp b/source/Game.cpp index 5da6e8a..4acd34e 100644 --- a/source/Game.cpp +++ b/source/Game.cpp @@ -125,7 +125,7 @@ Game::updateGui() { auto item = mWorld.getClosestItem(mPlayer->getPosition()); if (item.get() != nullptr) { - mPickupInstruction->setText("Press F to pick up " + item->getName()); + mPickupInstruction->setText("F - pick up " + item->getName()); mPickupInstruction->setPosition( mWindow.getSize().x / 2 - mPickupInstruction->getSize().x / 2, mWindow.getSize().y * 0.66f); diff --git a/source/items/Gadget.cpp b/source/items/Gadget.cpp index c5e06f7..6cb18b9 100644 --- a/source/items/Gadget.cpp +++ b/source/items/Gadget.cpp @@ -10,7 +10,7 @@ #include "../abstract/Character.h" Gadget::Gadget(std::string name) : - Item(sf::Vector2f(40, 40), "gadget.png"), + Item(sf::Vector2f(32, 32), "item.png"), mName(name) { } diff --git a/source/items/Weapon.cpp b/source/items/Weapon.cpp index dbeecf2..4dec91f 100755 --- a/source/items/Weapon.cpp +++ b/source/items/Weapon.cpp @@ -14,7 +14,7 @@ #include "../util/Yaml.h" Weapon::Weapon(World& world, Character& holder, const Yaml& config) : - Item(Vector2f(80, 30), "weapon.png"), + Item(Vector2f(32, 32), "item.png"), mWorld(world), mHolder(&holder), mName(config.get("name", std::string())),