diff --git a/src/Event.h b/src/Event.h index 139fd4c..9a3fd7b 100644 --- a/src/Event.h +++ b/src/Event.h @@ -51,18 +51,14 @@ struct GameEvent { virtual void print() {}; }; -class Player; struct WallJumpEvent : GameEvent { double wallHeight = 0; - Player * player = nullptr; }; struct WallCrashEvent : GameEvent { double wallHeight = 0; - Player * player = nullptr; }; struct CoinCollectEvent : GameEvent { - Player * player = nullptr; int value = 0; }; \ No newline at end of file diff --git a/src/Player.cpp b/src/Player.cpp index 87c7e9a..5e9c6a3 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -35,7 +35,6 @@ void Player::update(float dTime, std::vector &walls, std::vector& co wall.jumped = true; auto e = new WallJumpEvent; e->time = Game::instance->eTime; - e->player = this; e->wallHeight = wall.size.height(); Game::eventQueue->submitEvent(e); } else { @@ -43,7 +42,6 @@ void Player::update(float dTime, std::vector &walls, std::vector& co auto e = new WallCrashEvent; e->time = Game::instance->eTime; e->wallHeight = wall.size.height(); - e->player = this; Game::eventQueue->submitEvent(e); } } @@ -56,7 +54,6 @@ void Player::update(float dTime, std::vector &walls, std::vector& co coin.collected = true; auto e = new CoinCollectEvent; e->time = Game::instance->eTime; - e->player = this; e->value = coin.value; Game::eventQueue->submitEvent(e); }