From 05abe3c50a8f75e3bb0f187621ba0cb95340e438 Mon Sep 17 00:00:00 2001
From: serk <marcprat_maso@hotmail.com>
Date: Sat, 21 Jan 2017 04:08:44 +0100
Subject: [PATCH] fixed error

---
 VaporWaveWars/actor.cpp   | 6 ++++++
 VaporWaveWars/actor.hpp   | 7 +++++--
 VaporWaveWars/combat.cpp  | 2 ++
 VaporWaveWars/iaenemy.cpp | 2 +-
 VaporWaveWars/iaenemy.hpp | 4 +++-
 VaporWaveWars/menu.hpp    | 4 ++--
 VaporWaveWars/mygame.cpp  | 4 +---
 VaporWaveWars/player.cpp  | 9 +++++----
 VaporWaveWars/player.hpp  | 4 +++-
 9 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/VaporWaveWars/actor.cpp b/VaporWaveWars/actor.cpp
index 7b66709..fa28de1 100644
--- a/VaporWaveWars/actor.cpp
+++ b/VaporWaveWars/actor.cpp
@@ -5,3 +5,9 @@ Actor::Actor() {}
 void Actor::draw(sf::RenderWindow *window) {
 
 }
+
+bool Actor::update(float deltaTime, sf::RenderWindow *window) {
+    character.update(deltaTime);
+
+    return this->updateLogic(deltaTime, window);
+}
diff --git a/VaporWaveWars/actor.hpp b/VaporWaveWars/actor.hpp
index a045b04..cbf08e9 100644
--- a/VaporWaveWars/actor.hpp
+++ b/VaporWaveWars/actor.hpp
@@ -2,16 +2,19 @@
 #define ENEMY_H
 
 #include "commons.hpp"
-
+#include "character.hpp"
 class Actor
 {
 public:
     Actor();
-    virtual bool update(float deltaTime, sf::RenderWindow *window) = 0;
+    bool update(float deltaTime, sf::RenderWindow *window);
     void draw(sf::RenderWindow *window) ;
     virtual bool event(sf::Event e) = 0;
 protected:
     bool animate;
+    virtual bool updateLogic(float deltaTime, sf::RenderWindow *window) = 0;
+private:
+    Character character;
 };
 
 #endif // ENEMY_H
diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp
index 76e4e53..5cf8204 100644
--- a/VaporWaveWars/combat.cpp
+++ b/VaporWaveWars/combat.cpp
@@ -3,6 +3,7 @@
 Combat::Combat() {
     ia = playerOneTurn = true;
     enemy = new IaEnemy();
+
 }
 
 Combat::Combat(bool ia) {
@@ -24,6 +25,7 @@ void Combat::draw(sf::RenderWindow *window) {
 }
 
 void Combat::updateEvents(sf::Event e) {
+//    std::cout << "hellow" << std::endl;
     if (playerOneTurn) playerOneTurn = player.event(e);
     else if (!ia) playerOneTurn = !enemy->event(e);
 }
diff --git a/VaporWaveWars/iaenemy.cpp b/VaporWaveWars/iaenemy.cpp
index 2b00d8a..ce3bf4c 100644
--- a/VaporWaveWars/iaenemy.cpp
+++ b/VaporWaveWars/iaenemy.cpp
@@ -2,7 +2,7 @@
 
 IaEnemy::IaEnemy() {}
 
-bool IaEnemy::update(float deltaTime, sf::RenderWindow *window) {
+bool IaEnemy::updateLogic(float deltaTime, sf::RenderWindow *window) {
     //some playe return true
     return true;
 }
diff --git a/VaporWaveWars/iaenemy.hpp b/VaporWaveWars/iaenemy.hpp
index c2c050c..bcd1a64 100644
--- a/VaporWaveWars/iaenemy.hpp
+++ b/VaporWaveWars/iaenemy.hpp
@@ -6,8 +6,10 @@
 class IaEnemy : public Actor {
 public:
     IaEnemy();
-    bool update(float deltaTime, sf::RenderWindow *window) final override;
     bool event(sf::Event e) final override;
+protected:
+    bool updateLogic(float deltaTime, sf::RenderWindow *window);
+
 };
 
 #endif // IAENEMY_H
diff --git a/VaporWaveWars/menu.hpp b/VaporWaveWars/menu.hpp
index 7b10b1a..1d3d9f9 100644
--- a/VaporWaveWars/menu.hpp
+++ b/VaporWaveWars/menu.hpp
@@ -14,8 +14,8 @@ class Menu : public Scene{
         void draw(sf::RenderWindow *window) 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");
+        Button _start = Button("./Resources/exit-spreadsheet.png");
+        Button _exit = Button("./Resources/exit-spreadsheet.png");
         std::vector<Button*> _buttons;
 };
 
diff --git a/VaporWaveWars/mygame.cpp b/VaporWaveWars/mygame.cpp
index dae896c..2d70b26 100644
--- a/VaporWaveWars/mygame.cpp
+++ b/VaporWaveWars/mygame.cpp
@@ -38,7 +38,6 @@ void MyGame::update(float deltaTime, sf::RenderWindow*window) {
         case (sf::Event::MouseButtonPressed):
         case (sf::Event::MouseButtonReleased):
 
-            _scenes[_scene]->updateEvents(event);
             switch(_scene){
             case(GameScene::menu):
                 //std::cout << "still in menu" << std::endl;
@@ -46,11 +45,10 @@ void MyGame::update(float deltaTime, sf::RenderWindow*window) {
             default:
                 break;
             }
-
         default:
             break;
-
         }
+        _scenes[_scene]->updateEvents(event);
     }
 
     // do shit
diff --git a/VaporWaveWars/player.cpp b/VaporWaveWars/player.cpp
index 3a940f8..c68fdba 100644
--- a/VaporWaveWars/player.cpp
+++ b/VaporWaveWars/player.cpp
@@ -2,9 +2,10 @@
 
 Player::Player() {
     animate = false;
+    compas = Compas();
 }
 
-bool Player::update(float deltaTime, sf::RenderWindow *window) {
+bool Player::updateLogic(float deltaTime, sf::RenderWindow *window) {
     if (deltaTime > BLACKVALUE) compas.incraeseTime();
     return false;
 }
@@ -17,15 +18,15 @@ bool Player::event(sf::Event e) {
             compas.add();
             animate = true;
         }
-    break;
+        break;
     case (sf::Event::KeyReleased):
         if (e.key.code == sf::Keyboard::C) {
             compas.end();
             return false;
         }
-    break;
+        break;
     default:
-    break;
+        break;
     }
     return true;
 }
diff --git a/VaporWaveWars/player.hpp b/VaporWaveWars/player.hpp
index ebbbfcd..1a853d9 100644
--- a/VaporWaveWars/player.hpp
+++ b/VaporWaveWars/player.hpp
@@ -7,10 +7,12 @@
 class Player : public Actor {
 public:
     Player();
-    bool update(float deltaTime, sf::RenderWindow *window) final override;
     bool event(sf::Event e) final override;
 private:
     Compas compas;
+protected:
+    bool updateLogic(float deltaTime, sf::RenderWindow *window);
+
 };
 
 #endif // PLAYER_H