diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp index 9971e77c..ee9c601a 100644 --- a/cockatrice/src/tab_game.cpp +++ b/cockatrice/src/tab_game.cpp @@ -100,6 +100,8 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent) { loadLocalButton = new QPushButton; loadRemoteButton = new QPushButton; + if (parentGame->getIsLocalGame()) + loadRemoteButton->setEnabled(false); readyStartButton = new ToggleButton; readyStartButton->setEnabled(false); sideboardLockButton = new ToggleButton; @@ -307,6 +309,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) secondsElapsed(0), hostId(-1), localPlayerId(-1), + isLocalGame(_tabSupervisor->getIsLocalGame()), spectator(true), gameStateKnown(false), resuming(false), @@ -375,6 +378,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList &_client roomGameTypes(_roomGameTypes), hostId(event.host_id()), localPlayerId(event.player_id()), + isLocalGame(_tabSupervisor->getIsLocalGame()), spectator(event.spectator()), gameStateKnown(false), resuming(event.resuming()), diff --git a/cockatrice/src/tab_game.h b/cockatrice/src/tab_game.h index 52644583..213d5e92 100644 --- a/cockatrice/src/tab_game.h +++ b/cockatrice/src/tab_game.h @@ -111,6 +111,7 @@ private: QMap roomGameTypes; int hostId; int localPlayerId; + const bool isLocalGame; bool spectator; QMap players; QMap spectators; @@ -238,6 +239,7 @@ public: const QMap &getPlayers() const { return players; } CardItem *getCard(int playerId, const QString &zoneName, int cardId) const; bool isHost() const { return hostId == localPlayerId; } + bool getIsLocalGame() const { return isLocalGame; } int getGameId() const { return gameInfo.game_id(); } QString getTabText() const; bool getSpectator() const { return spectator; } diff --git a/travis-dependencies.sh b/travis-dependencies.sh index cd63a416..13bdc727 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -3,8 +3,6 @@ if [[ $TRAVIS_OS_NAME == "osx" ]] ; then brew update > /dev/null brew install qt5 protobuf > /dev/null - brew unlink cmake - brew upgrade cmake else # common prerequisites sudo add-apt-repository -y ppa:smspillaz/cmake-master @@ -29,4 +27,4 @@ else sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so cd - fi -fi \ No newline at end of file +fi