fixed error

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);
+}

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

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);
 }

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;
 }

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

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 _start = Button("./Resources/exit-spreadsheet.png");
-        Button _exit = Button("/home/raluca/Projects/WaveGGJ17/build-VaporWaveWars-Desktop-Debug/Resources/buttontejempl2.png");
+        Button _exit = Button("./Resources/exit-spreadsheet.png");
         std::vector<Button*> _buttons;
 };
 

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

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;
 }

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