diff --git a/src/engine/network_engine/clientbero.cpp b/src/engine/network_engine/clientbero.cpp index afc12b71..24e0e4c1 100644 --- a/src/engine/network_engine/clientbero.cpp +++ b/src/engine/network_engine/clientbero.cpp @@ -12,7 +12,7 @@ #include "clientbero.h" ClientBeRo::ClientBeRo(HandInterface* hi, int /*id*/, int /*qP*/, int dP, int sB, GameState gS) -: BeRoInterface(), myHand(hi), highestCardsValue(0), myBeRoID(gS), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstRound(1), playersTurn(dP), minimumRaise(0) +: BeRoInterface(), myBeRoID(gS), myHand(hi), highestCardsValue(0), playersTurn(dP), highestSet(0), firstRound(true), smallBlindPosition(0), smallBlind(sB), minimumRaise(0) { } diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp index 4317b8bb..ae80eec4 100644 --- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp +++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp @@ -88,4 +88,5 @@ void createInternetGameDialogImpl::keyPressEvent ( QKeyEvent * event ) { void createInternetGameDialogImpl::clearGamePassword(bool clear) { if(!clear) { lineEdit_Password->clear(); } -} \ No newline at end of file +} + diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index a7f7435a..e36b7466 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -15,7 +15,7 @@ #include "gamedata.h" gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c) - : QDialog(parent), myW(NULL), mySession(NULL), myConfig(c), currentGameName(""), isAdmin(false) + : QDialog(parent), myW(NULL), myConfig(c), mySession(NULL), currentGameName(""), isAdmin(false) { setupUi(this); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 09a82683..74bc1788 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -1763,7 +1763,6 @@ void mainWindowImpl::myRaise(){ pushButton_FoldAllin->setText("All-In"); spinBox_set->show(); - int tempHighestSet = 0; HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand(); spinBox_set->setMinimum(currentHand->getCurrentBeRo()->getHighestSet() - currentHand->getPlayerArray()[0]->getMySet() + currentHand->getCurrentBeRo()->getMinimumRaise()); diff --git a/src/gui/qt/qttools/qthelper/qthelper.cpp b/src/gui/qt/qttools/qthelper/qthelper.cpp index 273b65df..dc6a33cc 100644 --- a/src/gui/qt/qttools/qthelper/qthelper.cpp +++ b/src/gui/qt/qttools/qthelper/qthelper.cpp @@ -55,4 +55,5 @@ QString QtHelper::getDataPath() return QDir::cleanPath(path) + "/"; -} \ No newline at end of file +} + diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index d3a5e6d8..c89f1854 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -358,4 +358,5 @@ void settingsDialogImpl::setLogDir() void settingsDialogImpl::clearInternetGamePassword(bool clear) { if(!clear) { lineEdit_InternetGamePassword->clear(); } -} \ No newline at end of file +} + diff --git a/src/net/clientthread.h b/src/net/clientthread.h index 70cc27ed..6a704728 100644 --- a/src/net/clientthread.h +++ b/src/net/clientthread.h @@ -96,8 +96,8 @@ protected: void SetGameData(const GameData &gameData); const StartData &GetStartData() const; void SetStartData(const StartData &startData); - int GetGuiPlayerId() const; - void SetGuiPlayerId(int guiPlayerId); + unsigned GetGuiPlayerId() const; + void SetGuiPlayerId(unsigned guiPlayerId); boost::shared_ptr GetGame(); diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp index b905f970..4018f4e8 100644 --- a/src/net/common/clientthread.cpp +++ b/src/net/common/clientthread.cpp @@ -282,7 +282,7 @@ ClientThread::Main() boost::shared_ptr factory(new ClientEngineFactory); // LocalEngine erstellen MapPlayerDataList(); - if (GetPlayerDataList().size() != GetStartData().numberOfPlayers) + if (GetPlayerDataList().size() != (unsigned)GetStartData().numberOfPlayers) throw NetException(ERR_NET_INVALID_PLAYER_COUNT, 0); m_game.reset(new Game(&m_gui, factory, GetPlayerDataList(), GetGameData(), GetStartData(), m_curGameId++)); // Initialize GUI speed. @@ -441,14 +441,14 @@ ClientThread::SetStartData(const StartData &startData) m_startData = startData; } -int +unsigned ClientThread::GetGuiPlayerId() const { return m_guiPlayerId; } void -ClientThread::SetGuiPlayerId(int guiPlayerId) +ClientThread::SetGuiPlayerId(unsigned guiPlayerId) { m_guiPlayerId = guiPlayerId; } diff --git a/src/net/win32/socket_helper.cpp b/src/net/win32/socket_helper.cpp index f6a3e351..c62873b7 100644 --- a/src/net/win32/socket_helper.cpp +++ b/src/net/win32/socket_helper.cpp @@ -47,7 +47,7 @@ utf8ToWchar(const char *str) { wchar_t *wstr = new wchar_t[reqLen]; wstr[0] = L'\0'; - if (::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, len, wstr, reqLen) == reqLen) + if (::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, len, wstr, reqLen) == (int)reqLen) retStr = wstr; delete[] wstr; }