diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp index 69cf723..a09e6a8 100644 --- a/VaporWaveWars/combat.cpp +++ b/VaporWaveWars/combat.cpp @@ -14,10 +14,10 @@ void Combat::update(float deltaTime, sf::RenderWindow *window) { void Combat::draw(sf::RenderWindow *window) { player.draw(window); enemy->draw(window); - //draw background + } -void Combat::updateButtons(sf::Event e) { +void Combat::updateEvents(sf::Event e) { if (playerOneTurn) playerOneTurn = player.event(e); else if (!ia) playerOneTurn = !enemy->event(e); } diff --git a/VaporWaveWars/combat.hpp b/VaporWaveWars/combat.hpp index d940cd7..2ae1b52 100644 --- a/VaporWaveWars/combat.hpp +++ b/VaporWaveWars/combat.hpp @@ -17,7 +17,7 @@ public: Combat& operator=(Combat&& m) = delete; void update(float deltaTime, sf::RenderWindow *window) final override; void draw(sf::RenderWindow *window) final override; - void updateButtons(sf::Event e) final override; + void updateEvents(sf::Event e) final override; private: Compas compas; bool playerOneTurn, ia; diff --git a/VaporWaveWars/scene.hpp b/VaporWaveWars/scene.hpp index 2e4de31..ac945a2 100644 --- a/VaporWaveWars/scene.hpp +++ b/VaporWaveWars/scene.hpp @@ -10,7 +10,7 @@ class Scene virtual ~Scene(); virtual void update(float deltaTime, sf::RenderWindow *window) = 0; virtual void draw(sf::RenderWindow *window) = 0; - virtual void updateEvents(sf::Event) = 0; + virtual void updateEvents(sf::Event e) = 0; protected: Game* parent; };