Commit e92e8c0d authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Merge remote-tracking branch 'origin/KDE/4.14'

parents c10c4e21 968ce5cd
......@@ -58,12 +58,11 @@ void LocalGame::buildMachine()
if (m_gameMachine.isRunning())
return;
m_gameMachine.addState(m_neutral);
foreach (Player *player, m_players)
{
m_gameMachine.addState(player);
}
// Player is a subclass of QState and the constructor of Player already adds
// the new Player object to m_gameMachine by passing it to the superclass
// constructor QState(QState *parent = 0).
// Accordingly, we can instantly go ahead with configuring the other
// parts of the machine.
m_gameMachine.setInitialState(m_neutral);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment