From 9319bbf7839c45eb702318c6b47a2a378bc9ac58 Mon Sep 17 00:00:00 2001
From: Ralusama19 <ralucris.v@gmail.com>
Date: Sat, 21 Jan 2017 01:30:46 +0100
Subject: [PATCH] renamed stuff

---
 VaporWaveWars/button.cpp | 6 +++---
 VaporWaveWars/menu.cpp   | 2 +-
 VaporWaveWars/menu.hpp   | 2 +-
 VaporWaveWars/mygame.cpp | 2 +-
 VaporWaveWars/scene.hpp  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/VaporWaveWars/button.cpp b/VaporWaveWars/button.cpp
index 6d1fdd0..9acc450 100644
--- a/VaporWaveWars/button.cpp
+++ b/VaporWaveWars/button.cpp
@@ -25,7 +25,7 @@ int Button::getClicks(){
     int c = _clicks;
     //cout << "popping clicks " << c << endl;
     _clicks = 0;
-    if (_clicks > 0) std::cout << "popclicks = " << _clicks << std::endl;
+    //if (_clicks > 0) std::cout << "popclicks = " << _clicks << std::endl;
     return c;
 }
 
@@ -51,14 +51,14 @@ void Button::handleMouseEvent(sf::Event& event){
         switch (event.type){
             case (sf::Event::MouseButtonPressed):
                 if(_state == ButtonState::active) _state = ButtonState::pressed;
-                std::cout << "pressed!" << _clicks << std::endl;
+                //std::cout << "pressed!" << _clicks << std::endl;
             break;
 
             case (sf::Event::MouseButtonReleased):
                 if(_state == ButtonState::pressed){
                     _state = ButtonState::active;
                     ++_clicks;
-                    std::cout << "released!" << _clicks << std::endl;
+                    //std::cout << "released!" << _clicks << std::endl;
                 }
             break;
 
diff --git a/VaporWaveWars/menu.cpp b/VaporWaveWars/menu.cpp
index 4f40179..e41b0c2 100644
--- a/VaporWaveWars/menu.cpp
+++ b/VaporWaveWars/menu.cpp
@@ -25,7 +25,7 @@ void Menu::draw(sf::RenderWindow* window){
     }
 }
 
-void Menu::updateButtons(sf::Event e){
+void Menu::updateEvents(sf::Event e){
 //    std::cout << "update menu buttons" << std::endl;
     for(unsigned int i = 0; i < _buttons.size(); ++i){
         _buttons[i]->handleMouseEvent(e);
diff --git a/VaporWaveWars/menu.hpp b/VaporWaveWars/menu.hpp
index ae4cdcb..7b10b1a 100644
--- a/VaporWaveWars/menu.hpp
+++ b/VaporWaveWars/menu.hpp
@@ -12,7 +12,7 @@ class Menu : public Scene{
         Menu& operator=(Menu&& 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:
         Button _start = Button("/home/raluca/Projects/WaveGGJ17/build-VaporWaveWars-Desktop-Debug/Resources/buttontejempl.png");
         Button _exit = Button("/home/raluca/Projects/WaveGGJ17/build-VaporWaveWars-Desktop-Debug/Resources/buttontejempl2.png");
diff --git a/VaporWaveWars/mygame.cpp b/VaporWaveWars/mygame.cpp
index 29df3e6..40319a0 100644
--- a/VaporWaveWars/mygame.cpp
+++ b/VaporWaveWars/mygame.cpp
@@ -36,7 +36,7 @@ void MyGame::update(float deltaTime, sf::RenderWindow*window) {
         case (sf::Event::MouseButtonPressed):
         case (sf::Event::MouseButtonReleased):
 
-             _scenes[_scene]->updateButtons(event);
+             _scenes[_scene]->updateEvents(event);
             switch(_scene){
             case(GameScene::menu):
                 //std::cout << "still in menu" << std::endl;
diff --git a/VaporWaveWars/scene.hpp b/VaporWaveWars/scene.hpp
index a4d4bb7..2e4de31 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 updateButtons(sf::Event) = 0;
+        virtual void updateEvents(sf::Event) = 0;
     protected:
         Game* parent;
 };