diff options
Diffstat (limited to 'libtdegames/kgame/kgame.cpp')
| -rw-r--r-- | libtdegames/kgame/kgame.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libtdegames/kgame/kgame.cpp b/libtdegames/kgame/kgame.cpp index 2eebac64..c2f7f583 100644 --- a/libtdegames/kgame/kgame.cpp +++ b/libtdegames/kgame/kgame.cpp @@ -75,7 +75,7 @@ public: //KGamePropertys KGamePropertyInt mMaxPlayer; KGamePropertyUInt mMinPlayer; - KGamePropertyInt mGametqStatus; // Game running? + KGamePropertyInt mGameStatus; // Game running? TQValueList<int> mInactiveIdList; }; @@ -95,8 +95,8 @@ KGame::KGame(int cookie,TQObject* parent) : KGameNetwork(cookie,parent) d->mMaxPlayer.setLocal(-1); // Infinite d->mMinPlayer.registerData(KGamePropertyBase::IdMinPlayer, this, i18n("MinPlayers")); d->mMinPlayer.setLocal(0); // Always ok - d->mGametqStatus.registerData(KGamePropertyBase::IdGametqStatus, this, i18n("GameStatus")); - d->mGametqStatus.setLocal(Init); + d->mGameStatus.registerData(KGamePropertyBase::IdGameStatus, this, i18n("GameStatus")); + d->mGameStatus.setLocal(Init); // d->mUniquePlayerNumber = 0; d->mRandom = new KRandomSequence; d->mRandom->setSeed(0); @@ -542,10 +542,10 @@ void KGame::systemRemovePlayer(KPlayer* player,bool deleteit) kdWarning(11001) << "player " << player << "(" << player->id() << ") Could not be found!" << endl; } - if (gametqStatus()==(int)Run && playerCount()<minPlayers()) + if (gameStatus()==(int)Run && playerCount()<minPlayers()) { kdWarning(11001) << k_funcinfo ": not enough players, PAUSING game\n" << endl; - setGametqStatus(Pause); + setGameStatus(Pause); } } @@ -680,11 +680,11 @@ int KGame::maxPlayers() const uint KGame::playerCount() const { return d->mPlayerList.count(); } -int KGame::gametqStatus() const -{ return d->mGametqStatus.value(); } +int KGame::gameStatus() const +{ return d->mGameStatus.value(); } bool KGame::isRunning() const -{ return d->mGametqStatus.value() == Run; } +{ return d->mGameStatus.value() == Run; } KGamePropertyHandler* KGame::dataHandler() const { return d->mProperties; } @@ -772,7 +772,7 @@ KPlayer * KGame::playerInputFinished(KPlayer *player) { player->setTurn(false); } - setGametqStatus(End); + setGameStatus(End); emit signalGameOver(gameOver,player,this); } else if (!player->asyncInput()) @@ -829,7 +829,7 @@ KPlayer *KGame::nextPlayer(KPlayer *last,bool exclusive) return 0; } -void KGame::setGametqStatus(int status) +void KGame::setGameStatus(int status) { kdDebug(11001) << k_funcinfo << ": GAMESTATUS CHANGED to" << status << endl; if (status==(int)Run && playerCount()<minPlayers()) @@ -837,7 +837,7 @@ void KGame::setGametqStatus(int status) kdDebug(11001) << k_funcinfo << ": not enough players, pausing game\n" << endl; status=Pause; } - d->mGametqStatus = status; + d->mGameStatus = status; } void KGame::networkTransmission(TQDataStream &stream, int msgid, TQ_UINT32 receiver, TQ_UINT32 sender, TQ_UINT32 /*clientID*/) @@ -1244,7 +1244,7 @@ void KGame::Debug() kdDebug(11001) << "------------------- KGAME -------------------------" << endl; kdDebug(11001) << "this: " << this << endl; kdDebug(11001) << "uniquePlayer " << d->mUniquePlayerNumber << endl; - kdDebug(11001) << "gameStatus " << gametqStatus() << endl; + kdDebug(11001) << "gameStatus " << gameStatus() << endl; kdDebug(11001) << "MaxPlayers : " << maxPlayers() << endl; kdDebug(11001) << "NoOfPlayers : " << playerCount() << endl; kdDebug(11001) << "NoOfInactive: " << d->mInactivePlayerList.count() << endl; @@ -1264,7 +1264,7 @@ void KGame::slotServerDisconnected() // Client side kdDebug(11001) << "======= SERVER DISCONNECT ======="<<endl; kdDebug(11001) << "+++ (CLIENT)++++++++" << k_funcinfo << ": our GameID="<<gameId() << endl; - int oldgamestatus=gametqStatus(); + int oldgamestatus=gameStatus(); KPlayer *player; KGamePlayerList removeList; @@ -1326,7 +1326,7 @@ void KGame::slotClientDisconnected(TQ_UINT32 clientID,bool /*broken*/) // server { kdDebug(11001) << "++++(SERVER)+++++++" << k_funcinfo << " clientId=" << clientID << endl; - int oldgamestatus=gametqStatus(); + int oldgamestatus=gameStatus(); KPlayer *player; KGamePlayerList removeList; |