fixes merge bug

This commit is contained in:
j3d1 2016-09-28 03:45:59 +02:00
parent 244f98178a
commit 8f41d89a3c

View file

@ -47,11 +47,11 @@ protected:
drawTrace(trace); drawTrace(trace);
} }
for (const game::Explosion *explosion : m_game.state()->explosions) { for (const game::Explosion *explosion : m_game->state()->explosions) {
drawExplosion(explosion); drawExplosion(explosion);
} }
for (const game::Ship *ship : m_game.state()->ships) { for (const game::Ship *ship : m_game->state()->ships) {
drawShip(ship->position); drawShip(ship->position);
} }