Fix member variable initialization order

This commit is contained in:
Kevin Boxhoorn 2016-10-03 13:16:16 +11:00
parent 3680f40981
commit c1aebc1af5

View file

@ -309,6 +309,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
secondsElapsed(0), secondsElapsed(0),
hostId(-1), hostId(-1),
localPlayerId(-1), localPlayerId(-1),
isLocalGame(_tabSupervisor->getIsLocalGame()),
spectator(true), spectator(true),
gameStateKnown(false), gameStateKnown(false),
resuming(false), resuming(false),
@ -318,8 +319,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
replay(_replay), replay(_replay),
currentReplayStep(0), currentReplayStep(0),
sayLabel(0), sayLabel(0),
sayEdit(0), sayEdit(0)
isLocalGame(_tabSupervisor->getIsLocalGame())
{ {
// THIS CTOR IS USED ON REPLAY // THIS CTOR IS USED ON REPLAY
gameInfo.CopyFrom(replay->game_info()); gameInfo.CopyFrom(replay->game_info());
@ -378,6 +378,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
roomGameTypes(_roomGameTypes), roomGameTypes(_roomGameTypes),
hostId(event.host_id()), hostId(event.host_id()),
localPlayerId(event.player_id()), localPlayerId(event.player_id()),
isLocalGame(_tabSupervisor->getIsLocalGame()),
spectator(event.spectator()), spectator(event.spectator()),
gameStateKnown(false), gameStateKnown(false),
resuming(event.resuming()), resuming(event.resuming()),
@ -385,8 +386,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
activeCard(0), activeCard(0),
gameClosed(false), gameClosed(false),
replay(0), replay(0),
replayDock(0), replayDock(0)
isLocalGame(_tabSupervisor->getIsLocalGame())
{ {
// THIS CTOR IS USED ON GAMES // THIS CTOR IS USED ON GAMES
gameInfo.set_started(false); gameInfo.set_started(false);