removed player from gameevents

main
Benjamin Kraft 2 years ago
parent 0c4fd09a4f
commit 04c0d13692
  1. 4
      src/Event.h
  2. 3
      src/Player.cpp

@ -51,18 +51,14 @@ struct GameEvent {
virtual void print() {}; virtual void print() {};
}; };
class Player;
struct WallJumpEvent : GameEvent { struct WallJumpEvent : GameEvent {
double wallHeight = 0; double wallHeight = 0;
Player * player = nullptr;
}; };
struct WallCrashEvent : GameEvent { struct WallCrashEvent : GameEvent {
double wallHeight = 0; double wallHeight = 0;
Player * player = nullptr;
}; };
struct CoinCollectEvent : GameEvent { struct CoinCollectEvent : GameEvent {
Player * player = nullptr;
int value = 0; int value = 0;
}; };

@ -35,7 +35,6 @@ void Player::update(float dTime, std::vector<Wall> &walls, std::vector<Coin>& co
wall.jumped = true; wall.jumped = true;
auto e = new WallJumpEvent; auto e = new WallJumpEvent;
e->time = Game::instance->eTime; e->time = Game::instance->eTime;
e->player = this;
e->wallHeight = wall.size.height(); e->wallHeight = wall.size.height();
Game::eventQueue->submitEvent(e); Game::eventQueue->submitEvent(e);
} else { } else {
@ -43,7 +42,6 @@ void Player::update(float dTime, std::vector<Wall> &walls, std::vector<Coin>& co
auto e = new WallCrashEvent; auto e = new WallCrashEvent;
e->time = Game::instance->eTime; e->time = Game::instance->eTime;
e->wallHeight = wall.size.height(); e->wallHeight = wall.size.height();
e->player = this;
Game::eventQueue->submitEvent(e); Game::eventQueue->submitEvent(e);
} }
} }
@ -56,7 +54,6 @@ void Player::update(float dTime, std::vector<Wall> &walls, std::vector<Coin>& co
coin.collected = true; coin.collected = true;
auto e = new CoinCollectEvent; auto e = new CoinCollectEvent;
e->time = Game::instance->eTime; e->time = Game::instance->eTime;
e->player = this;
e->value = coin.value; e->value = coin.value;
Game::eventQueue->submitEvent(e); Game::eventQueue->submitEvent(e);
} }

Loading…
Cancel
Save