fixes merge bug
This commit is contained in:
parent
244f98178a
commit
8f41d89a3c
1 changed files with 2 additions and 2 deletions
|
@ -47,11 +47,11 @@ protected:
|
|||
drawTrace(trace);
|
||||
}
|
||||
|
||||
for (const game::Explosion *explosion : m_game.state()->explosions) {
|
||||
for (const game::Explosion *explosion : m_game->state()->explosions) {
|
||||
drawExplosion(explosion);
|
||||
}
|
||||
|
||||
for (const game::Ship *ship : m_game.state()->ships) {
|
||||
for (const game::Ship *ship : m_game->state()->ships) {
|
||||
drawShip(ship->position);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue