sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Running astyle.

Browse Source
This commit is contained in:
lotodore
2013-10-06 16:30:09 +02:00
parent c8939fdbdf
commit f0f3d2eb04
44 changed files with 201 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/local_engine/localplayer.cpp
+1 -1
View File
@@ -3452,7 +3452,7 @@ int LocalPlayer::flopCardsValue(int* cards)
return (71000 + temp*100 + array[j1][1]);
} else {
// Test auf Straight-Flush-Ausnahme 5-4-3-2-A
if(array[j1][1] == 12 && (array[j1+1][1]<=3 || (j1==0 && array[j1+2][1]<=3 && array[j1][0]==array[j1+4][0]))) {
if(array[j1][1] == 12 && (array[j1+1][1]<=3 || (j1==0 && array[j1+2][1]<=3 && array[j1][0]==array[j1+4][0]))) {
// cout << "Straight-Flush-Draw Ass unten";
for(j2=0; j2<4; j2++) {
if(array[j1+j2][2] <= 1) temp++;
src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
+16 -16
View File
@@ -34,10 +34,10 @@
#include <QtCore>
#ifdef ANDROID
#ifndef ANDROID_TEST
#include "QtGui/5.1.1/QtGui/qpa/qplatformnativeinterface.h"
#include <jni.h>
#endif
#ifndef ANDROID_TEST
#include "QtGui/5.1.1/QtGui/qpa/qplatformnativeinterface.h"
#include <jni.h>
#endif
#endif
aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c)
@@ -71,19 +71,19 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c)
#ifdef ANDROID
int api = -2;
#ifndef ANDROID_TEST
JavaVM *currVM = (JavaVM *)QApplication::platformNativeInterface()->nativeResourceForIntegration("JavaVM");
JNIEnv* env;
if (currVM->AttachCurrentThread(&env, NULL)<0) {
qCritical()<<"AttachCurrentThread failed";
} else {
jclass jclassApplicationClass = env->FindClass("android/os/Build$VERSION");
if (jclassApplicationClass) {
api = env->GetStaticIntField(jclassApplicationClass, env->GetStaticFieldID(jclassApplicationClass,"SDK_INT", "I"));
}
currVM->DetachCurrentThread();
#ifndef ANDROID_TEST
JavaVM *currVM = (JavaVM *)QApplication::platformNativeInterface()->nativeResourceForIntegration("JavaVM");
JNIEnv* env;
if (currVM->AttachCurrentThread(&env, NULL)<0) {
qCritical()<<"AttachCurrentThread failed";
} else {
jclass jclassApplicationClass = env->FindClass("android/os/Build$VERSION");
if (jclassApplicationClass) {
api = env->GetStaticIntField(jclassApplicationClass, env->GetStaticFieldID(jclassApplicationClass,"SDK_INT", "I"));
}
#endif
currVM->DetachCurrentThread();
}
#endif
label_pokerthVersion->setText(QString(tr("PokerTH %1 for Android (API%2)").arg(POKERTH_BETA_RELEASE_STRING).arg(api)));
#else
label_pokerthVersion->setText(QString(tr("PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING)));
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+12 -5
View File
@@ -1041,7 +1041,8 @@ void gameLobbyDialogImpl::addConnectedPlayer(unsigned playerId, QString playerNa
refreshConnectedPlayerAvatars();
}
void gameLobbyDialogImpl::addConnectedSpectator(unsigned spectatorId, QString spectatorName) {
void gameLobbyDialogImpl::addConnectedSpectator(unsigned spectatorId, QString spectatorName)
{
QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget_connectedSpectators, 0);
item->setData(0, Qt::UserRole, spectatorId);
@@ -1672,8 +1673,11 @@ void gameLobbyDialogImpl::showNickListContextMenu(QPoint p)
nickListPlayerInGameInfo->setText(playerInGameInfoString);
//prevent admin to total kickban himself
if(playerUid == mySession->getClientUniquePlayerId()) { nickListAdminTotalKickBan->setDisabled(true); }
else { nickListAdminTotalKickBan->setEnabled(true); }
if(playerUid == mySession->getClientUniquePlayerId()) {
nickListAdminTotalKickBan->setDisabled(true);
} else {
nickListAdminTotalKickBan->setEnabled(true);
}
// check for admin and remove admin actions for non-admins
if(!mySession->getClientPlayerInfo(mySession->getClientUniquePlayerId()).isAdmin) {
@@ -1693,8 +1697,11 @@ void gameLobbyDialogImpl::showGameListContextMenu(QPoint p)
assert(mySession);
unsigned selectedGameId = myGameListSelectionModel->selectedRows().first().data(Qt::UserRole).toUInt();
if(selectedGameId == mySession->getClientCurrentGameId()) { gameListAdminCloseGame->setDisabled(true); }
else { gameListAdminCloseGame->setEnabled(true); }
if(selectedGameId == mySession->getClientCurrentGameId()) {
gameListAdminCloseGame->setDisabled(true);
} else {
gameListAdminCloseGame->setEnabled(true);
}
// check for admin and remove admin actions for non-admins
if(!mySession->getClientPlayerInfo(mySession->getClientUniquePlayerId()).isAdmin) {
src/gui/qt/gamelobbydialog/mygamelisttreewidget.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class MyGameListTreeWidget : public QTreeWidget
src/gui/qt/gametable/gametableimpl.cpp
+1 -2
View File
@@ -4482,8 +4482,7 @@ void gameTableImpl::refreshSpectatorsDisplay()
}
spectatorList.remove(spectatorList.size()-4,4);
spectatorIcon->setToolTip(spectatorList);
}
else {
} else {
spectatorIcon->setToolTip("");
spectatorIcon->clear();
}
src/gui/qt/gametable/gametableimpl.h
+1 -1
View File
@@ -48,7 +48,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class guiLog;
src/gui/qt/gametable/log/guilog.h
+1 -1
View File
@@ -42,7 +42,7 @@
#include <QtGui>
#include <QtSql>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
struct result_struct {
src/gui/qt/gametable/myactionbutton.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class GameTableStyleReader;
src/gui/qt/gametable/myavatarlabel.cpp
+3 -4
View File
@@ -397,10 +397,9 @@ void MyAvatarLabel::paintEvent(QPaintEvent*)
//hide avatar if player is on ignore list
boost::shared_ptr<Session> mySession = myW->myStartWindow->getSession();
if(!playerIsOnIgnoreList(QString::fromUtf8(mySession->getClientPlayerInfo(myUniqueId).playerName.c_str()))) {
painter.drawPixmap(0,0,myPixmap);
return;
}
else if(myW->getMyConfig()->readConfigInt("DontHideAvatarsOfIgnored")) {
painter.drawPixmap(0,0,myPixmap);
return;
} else if(myW->getMyConfig()->readConfigInt("DontHideAvatarsOfIgnored")) {
painter.drawPixmap(0,0,myPixmap);
return;
}
src/gui/qt/gametable/myavatarlabel.h
+1 -1
View File
@@ -36,7 +36,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class gameTableImpl;
src/gui/qt/gametable/mycardspixmaplabel.h
+1 -1
View File
@@ -36,7 +36,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class gameTableImpl;
src/gui/qt/gametable/mycashlabel.h
+1 -1
View File
@@ -36,7 +36,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class gameTableImpl;
src/gui/qt/gametable/mychancelabel.h
+1 -1
View File
@@ -36,7 +36,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class gameTableImpl;
src/gui/qt/gametable/mylefttabwidget.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class MyLeftTabWidget : public QTabWidget
src/gui/qt/gametable/mymenubar.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class MyMenuBar : public QMenuBar
src/gui/qt/gametable/mynamelabel.h
+1 -1
View File
@@ -36,7 +36,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class gameTableImpl;
src/gui/qt/gametable/myrighttabwidget.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class MyRightTabWidget : public QTabWidget
src/gui/qt/gametable/mysetlabel.h
+1 -1
View File
@@ -36,7 +36,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class gameTableImpl;
src/gui/qt/gametable/mystatuslabel.h
+1 -1
View File
@@ -36,7 +36,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class gameTableImpl;
src/gui/qt/gametable/mytimeoutlabel.h
+1 -1
View File
@@ -39,7 +39,7 @@
#include <third_party/boost/timers.hpp>
#endif
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class gameTableImpl;
src/gui/qt/gametable/startsplash/startsplash.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
src/gui/qt/logfiledialog/logfiledialog.cpp
+24 -25
View File
@@ -287,31 +287,30 @@ void LogFileDialog::showLogAnalysis(QString /*filename*/, QString returnMessage)
if (retStr == LOG_UPLOAD_ERROR_STR) {
QString errorId(returnMessage.mid(retStr.size()).trimmed());
serverMsg += "\n" + tr("Failure reason: ");
switch (errorId.toInt())
{
case LOG_UPLOAD_ERROR_NO_FILE :
serverMsg += tr("No file received.");
break;
case LOG_UPLOAD_ERROR_MAX_NUM_TOTAL :
serverMsg += tr("File rejected because of too many uploads.");
break;
case LOG_UPLOAD_ERROR_MAX_NUM_IP :
serverMsg += tr("File rejected because of too many recent uploads. Please try again later.");
break;
case LOG_UPLOAD_ERROR_FILE_SIZE :
serverMsg += tr("The file is too large.");
break;
case LOG_UPLOAD_ERROR_FILE_EXT :
case LOG_UPLOAD_ERROR_FILE_HEAD :
serverMsg += tr("This file is not a valid and current PokerTH log file.");
break;
case LOG_UPLOAD_ERROR_OPEN_DB :
case LOG_UPLOAD_ERROR_ID :
case LOG_UPLOAD_ERROR_FILE_MOVE :
case LOG_UPLOAD_ERROR_INSERT_DB :
default :
serverMsg += tr("Internal error. Please try again later. ID: ") + returnMessage;
break;
switch (errorId.toInt()) {
case LOG_UPLOAD_ERROR_NO_FILE :
serverMsg += tr("No file received.");
break;
case LOG_UPLOAD_ERROR_MAX_NUM_TOTAL :
serverMsg += tr("File rejected because of too many uploads.");
break;
case LOG_UPLOAD_ERROR_MAX_NUM_IP :
serverMsg += tr("File rejected because of too many recent uploads. Please try again later.");
break;
case LOG_UPLOAD_ERROR_FILE_SIZE :
serverMsg += tr("The file is too large.");
break;
case LOG_UPLOAD_ERROR_FILE_EXT :
case LOG_UPLOAD_ERROR_FILE_HEAD :
serverMsg += tr("This file is not a valid and current PokerTH log file.");
break;
case LOG_UPLOAD_ERROR_OPEN_DB :
case LOG_UPLOAD_ERROR_ID :
case LOG_UPLOAD_ERROR_FILE_MOVE :
case LOG_UPLOAD_ERROR_INSERT_DB :
default :
serverMsg += tr("Internal error. Please try again later. ID: ") + returnMessage;
break;
}
}
MyMessageBox::warning(
src/gui/qt/newlocalgamedialog/newgamedialogimpl.h
+1 -1
View File
@@ -40,7 +40,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class ConfigFile;
src/gui/qt/serverlistdialog/serverlistdialogimpl.h
+1 -1
View File
@@ -40,7 +40,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class ConfigFile;
src/gui/qt/settingsdialog/myavatarbutton.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class MyAvatarButton : public QPushButton
src/gui/qt/settingsdialog/myhpavatarbutton.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class MyHPAvatarButton : public QPushButton
src/gui/qt/settingsdialog/mystylelistitem.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class MyStyleListItem : public QTreeWidgetItem
src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
class MyAvatarListItem : public QListWidgetItem
src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h
+1 -1
View File
@@ -37,7 +37,7 @@
#include "ui_selectavatardialog.h"
#endif
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
#include <QtCore>
#include <QtGui>
src/gui/qt/settingsdialog/settingsdialogimpl.h
+1 -1
View File
@@ -42,7 +42,7 @@
#include <QtCore>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
#include <boost/shared_ptr.hpp>
src/gui/qt/sound/soundevents.cpp
+11 -11
View File
@@ -31,13 +31,13 @@
#include "soundevents.h"
#ifdef ANDROID
#ifdef ANDROID_API8
#include "androidapi8dummy.h"
#else
#include "androidaudio.h"
#endif
#ifdef ANDROID_API8
#include "androidapi8dummy.h"
#else
#include "sdlplayer.h"
#include "androidaudio.h"
#endif
#else
#include "sdlplayer.h"
#endif
@@ -52,11 +52,11 @@ SoundEvents::SoundEvents(ConfigFile *c): myConfig(c), lastSBValue(0), lastSBLeve
{
#ifdef ANDROID
#ifdef ANDROID_API8
myPlayer = new AndroidApi8Dummy(myConfig);
#else
myPlayer = new AndroidAudio(myConfig);
#endif
#ifdef ANDROID_API8
myPlayer = new AndroidApi8Dummy(myConfig);
#else
myPlayer = new AndroidAudio(myConfig);
#endif
#else
myPlayer = new SDLPlayer(myConfig);
#endif
src/gui/qt/sound/soundevents.h
+11 -11
View File
@@ -34,13 +34,13 @@
#include <string>
#ifdef ANDROID
#ifdef ANDROID_API8
class AndroidApi8Dummy;
#else
class AndroidAudio;
#endif
#ifdef ANDROID_API8
class AndroidApi8Dummy;
#else
class SDLPlayer;
class AndroidAudio;
#endif
#else
class SDLPlayer;
#endif
@@ -64,11 +64,11 @@ protected:
private:
#ifdef ANDROID
#ifdef ANDROID_API8
AndroidApi8Dummy *myPlayer;
#else
AndroidAudio *myPlayer;
#endif
#ifdef ANDROID_API8
AndroidApi8Dummy *myPlayer;
#else
AndroidAudio *myPlayer;
#endif
#else
SDLPlayer *myPlayer;
#endif
src/gui/qt/startwindow/startwindowimpl.cpp
+28 -27
View File
@@ -60,10 +60,10 @@
#include "guilog.h"
#ifdef ANDROID
#ifndef ANDROID_TEST
#include "QtGui/5.1.1/QtGui/qpa/qplatformnativeinterface.h"
#include <jni.h>
#endif
#ifndef ANDROID_TEST
#include "QtGui/5.1.1/QtGui/qpa/qplatformnativeinterface.h"
#include <jni.h>
#endif
#endif
using namespace std;
@@ -96,25 +96,25 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
this->setStatusBar(0);
#ifdef GUI_800x480
#ifdef ANDROID
this->menubar->hide();
#ifdef ANDROID
this->menubar->hide();
//check if custom background picture for the resolution is there. Otherwise create it!
QString UserDataDir = QString::fromUtf8(myConfig->readConfigString("UserDataDir").c_str());
QDesktopWidget dw;
int screenWidth = dw.screenGeometry().width();
int screenHeight = dw.screenGeometry().height();
QString customStartWindowBgFileString(UserDataDir+"/startwindowbg10_"+QString::number(screenWidth)+"x"+QString::number(screenHeight)+".png");
QFile customStartWindowBgFile(customStartWindowBgFileString);
if(customStartWindowBgFile.exists()) {
centralwidget->setStyleSheet(".QWidget { background-image: url("+QFileInfo(customStartWindowBgFile).absoluteFilePath()+"); background-position: top center; background-origin: content; background-repeat: no-repeat;}");
} else {
//if custom bg file could not be found load the big origin file
centralwidget->setStyleSheet(".QWidget { background-image: url(:/android/android-data/gfx/gui/misc/startwindowbg10_mobile.png); background-position: top center; background-origin: content; background-repeat: no-repeat;}");
}
this->showFullScreen();
//check if custom background picture for the resolution is there. Otherwise create it!
QString UserDataDir = QString::fromUtf8(myConfig->readConfigString("UserDataDir").c_str());
QDesktopWidget dw;
int screenWidth = dw.screenGeometry().width();
int screenHeight = dw.screenGeometry().height();
QString customStartWindowBgFileString(UserDataDir+"/startwindowbg10_"+QString::number(screenWidth)+"x"+QString::number(screenHeight)+".png");
QFile customStartWindowBgFile(customStartWindowBgFileString);
if(customStartWindowBgFile.exists()) {
centralwidget->setStyleSheet(".QWidget { background-image: url("+QFileInfo(customStartWindowBgFile).absoluteFilePath()+"); background-position: top center; background-origin: content; background-repeat: no-repeat;}");
} else {
//if custom bg file could not be found load the big origin file
centralwidget->setStyleSheet(".QWidget { background-image: url(:/android/android-data/gfx/gui/misc/startwindowbg10_mobile.png); background-position: top center; background-origin: content; background-repeat: no-repeat;}");
}
this->showFullScreen();
//TODO HACK Missing QSystemScreenSaver::setScreenSaverInhibited(true)
//TODO HACK Missing QSystemScreenSaver::setScreenSaverInhibited(true)
// #ifndef ANDROID_TEST
// JavaVM *currVM = (JavaVM *)QApplication::platformNativeInterface()->nativeResourceForWidget("JavaVM", 0);
// JNIEnv* env;
@@ -128,11 +128,11 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
// currVM->DetachCurrentThread();
// }
// #endif
#else
#else
// Maemo
this->menubar->hide();
centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg10_desktop.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
#endif
this->menubar->hide();
centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg10_desktop.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
#endif
// All mobile GUI's
pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #505050; color: #FDC942; font-size:22px; border-width: 0px;}");
pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #505050; color: #FDC942; font-size:22px; border-width: 0px;}");
@@ -1186,8 +1186,9 @@ void startWindowImpl::networkMessage(unsigned msgId)
msgText = tr("The player could not be found.");
}
break;
default: showMsgBox = false;
break;
default:
showMsgBox = false;
break;
}
if(showMsgBox) {
src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h
+1 -1
View File
@@ -35,7 +35,7 @@
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#include <QtWidgets>
#endif
#ifndef Q_MOC_RUN
#include <third_party/boost/timers.hpp>
src/net/common/netpacketvalidator.cpp
+55 -55
View File
@@ -158,11 +158,11 @@ NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet)
if (packet.GetMsg()->has_announcemessage()) {
const AnnounceMessage &msg = packet.GetMsg()->announcemessage();
if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion())
&& VALIDATE_IS_UINT16(msg.protocolversion().minorversion())
&& VALIDATE_IS_UINT16(msg.latestgameversion().majorversion())
&& VALIDATE_IS_UINT16(msg.latestgameversion().minorversion())
&& VALIDATE_IS_UINT16(msg.latestbetarevision())
&& VALIDATE_IS_UINT16(msg.numplayersonserver())) {
&& VALIDATE_IS_UINT16(msg.protocolversion().minorversion())
&& VALIDATE_IS_UINT16(msg.latestgameversion().majorversion())
&& VALIDATE_IS_UINT16(msg.latestgameversion().minorversion())
&& VALIDATE_IS_UINT16(msg.latestbetarevision())
&& VALIDATE_IS_UINT16(msg.numplayersonserver())) {
retVal = true;
}
@@ -177,12 +177,12 @@ NetPacketValidator::ValidateInitMessage(const NetPacket &packet)
if (packet.GetMsg()->has_initmessage()) {
const InitMessage &msg = packet.GetMsg()->initmessage();
if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion())
&& VALIDATE_IS_UINT16(msg.requestedversion().minorversion())
&& (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16)
&& (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64))
&& (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64))
&& (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256))
&& (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) {
&& VALIDATE_IS_UINT16(msg.requestedversion().minorversion())
&& (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16)
&& (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64))
&& (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64))
&& (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256))
&& (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) {
retVal = true;
}
@@ -236,9 +236,9 @@ NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet)
if (packet.GetMsg()->has_initackmessage()) {
const InitAckMessage &msg = packet.GetMsg()->initackmessage();
if (msg.yoursessionid().size() == 16
&& msg.yourplayerid() != 0
&& (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16)
&& (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) {
&& msg.yourplayerid() != 0
&& (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16)
&& (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) {
retVal = true;
}
@@ -253,7 +253,7 @@ NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet)
if (packet.GetMsg()->has_avatarrequestmessage()) {
const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage();
if (msg.requestid() != 0
&& msg.avatarhash().size() == 16) {
&& msg.avatarhash().size() == 16) {
retVal = true;
}
@@ -268,7 +268,7 @@ NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet)
if (packet.GetMsg()->has_avatarheadermessage()) {
const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage();
if (msg.requestid() != 0
&& VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) {
&& VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) {
retVal = true;
}
@@ -283,7 +283,7 @@ NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet)
if (packet.GetMsg()->has_avatardatamessage()) {
const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage();
if (msg.requestid() != 0
&& VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) {
&& VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) {
retVal = true;
}
@@ -337,9 +337,9 @@ NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet)
if (packet.GetMsg()->has_gamelistnewmessage()) {
const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage();
if (msg.gameid() != 0
&& VALIDATE_LIST_SIZE(msg.playerids(), 0, 10)
&& msg.adminplayerid() != 0
&& ValidateGameInfo(msg.gameinfo())) {
&& VALIDATE_LIST_SIZE(msg.playerids(), 0, 10)
&& msg.adminplayerid() != 0
&& ValidateGameInfo(msg.gameinfo())) {
retVal = true;
}
@@ -444,7 +444,7 @@ NetPacketValidator::ValidateJoinExistingGameMessage(const NetPacket &packet)
if (packet.GetMsg()->has_joinexistinggamemessage()) {
const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage();
if (msg.gameid() != 0
&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
retVal = true;
}
@@ -459,7 +459,7 @@ NetPacketValidator::ValidateJoinNewGameMessage(const NetPacket &packet)
if (packet.GetMsg()->has_joinnewgamemessage()) {
const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage();
if (ValidateGameInfo(msg.gameinfo())
&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
retVal = true;
}
@@ -669,8 +669,8 @@ NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet)
if (packet.GetMsg()->has_gamestartinitialmessage()) {
const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage();
if (msg.gameid() != 0
&& msg.startdealerplayerid() != 0
&& VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) {
&& msg.startdealerplayerid() != 0
&& VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) {
retVal = true;
}
@@ -685,9 +685,9 @@ NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet)
if (packet.GetMsg()->has_gamestartrejoinmessage()) {
const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage();
if (msg.gameid() != 0
&& msg.startdealerplayerid() != 0
&& msg.handnum() != 0
&& VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) {
&& msg.startdealerplayerid() != 0
&& msg.handnum() != 0
&& VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) {
retVal = true;
}
@@ -702,8 +702,8 @@ NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet)
if (packet.GetMsg()->has_handstartmessage()) {
const HandStartMessage &msg = packet.GetMsg()->handstartmessage();
if (msg.gameid() != 0
&& VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000)
&& VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) {
&& VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000)
&& VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) {
retVal = true;
}
@@ -731,8 +731,8 @@ NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet)
if (packet.GetMsg()->has_myactionrequestmessage()) {
const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage();
if (msg.gameid() != 0
&& msg.handnum() != 0
&& VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) {
&& msg.handnum() != 0
&& VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) {
retVal = true;
}
@@ -773,9 +773,9 @@ NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet)
if (packet.GetMsg()->has_dealflopcardsmessage()) {
const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage();
if (msg.gameid() != 0
&& VALIDATE_UINT_UPPER(msg.flopcard1(), 51)
&& VALIDATE_UINT_UPPER(msg.flopcard2(), 51)
&& VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) {
&& VALIDATE_UINT_UPPER(msg.flopcard1(), 51)
&& VALIDATE_UINT_UPPER(msg.flopcard2(), 51)
&& VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) {
retVal = true;
}
@@ -790,7 +790,7 @@ NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet)
if (packet.GetMsg()->has_dealturncardmessage()) {
const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage();
if (msg.gameid() != 0
&& VALIDATE_UINT_UPPER(msg.turncard(), 51)) {
&& VALIDATE_UINT_UPPER(msg.turncard(), 51)) {
retVal = true;
}
@@ -805,7 +805,7 @@ NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet)
if (packet.GetMsg()->has_dealrivercardmessage()) {
const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage();
if (msg.gameid() != 0
&& VALIDATE_UINT_UPPER(msg.rivercard(), 51)) {
&& VALIDATE_UINT_UPPER(msg.rivercard(), 51)) {
retVal = true;
}
@@ -820,7 +820,7 @@ NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet)
if (packet.GetMsg()->has_allinshowcardsmessage()) {
const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage();
if (msg.gameid() != 0
&& VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) {
&& VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) {
retVal = true;
}
@@ -835,7 +835,7 @@ NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet)
if (packet.GetMsg()->has_endofhandshowcardsmessage()) {
const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage();
if (msg.gameid() != 0
&& VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) {
&& VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) {
retVal = true;
}
@@ -938,11 +938,11 @@ NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet)
if (packet.GetMsg()->has_startkickpetitionmessage()) {
const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage();
if (msg.gameid() != 0
&& msg.petitionid() != 0
&& msg.proposingplayerid() != 0
&& msg.kickplayerid() != 0
&& msg.kicktimeoutsec() > 0
&& msg.numvotesneededtokick() > 0) {
&& msg.petitionid() != 0
&& msg.proposingplayerid() != 0
&& msg.kickplayerid() != 0
&& msg.kicktimeoutsec() > 0
&& msg.numvotesneededtokick() > 0) {
retVal = true;
}
@@ -1095,7 +1095,7 @@ NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet)
if (packet.GetMsg()->has_reportavatarmessage()) {
const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage();
if (msg.reportedplayerid() != 0
&& msg.reportedavatarhash().size() == 16) {
&& msg.reportedavatarhash().size() == 16) {
retVal = true;
}
@@ -1210,17 +1210,17 @@ NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
{
bool retVal = false;
if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64)
&& VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10)
&& (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000))
&& (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000))
&& (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000))
&& VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11)
&& VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20)
&& VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60)
&& VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000)
&& VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000)
&& VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30)
&& ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) {
&& VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10)
&& (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000))
&& (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000))
&& (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000))
&& VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11)
&& VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20)
&& VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60)
&& VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000)
&& VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000)
&& VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30)
&& ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) {
retVal = true;
}
src/net/common/serveracceptwebhelper.cpp
+2 -2
View File
@@ -37,7 +37,7 @@
using namespace std;
ServerAcceptWebHelper::ServerAcceptWebHelper(ServerCallback &serverCallback, boost::shared_ptr<boost::asio::io_service> ioService,
const string &webSocketResource, const string &webSocketOrigin)
const string &webSocketResource, const string &webSocketOrigin)
: m_ioService(ioService), m_serverCallback(serverCallback),
m_webSocketResource(webSocketResource), m_webSocketOrigin(webSocketOrigin)
{
@@ -78,7 +78,7 @@ ServerAcceptWebHelper::validate(websocketpp::connection_hdl hdl)
bool retVal = false;
server::connection_ptr con = m_webSocketServer->get_con_from_hdl(hdl);
if ((m_webSocketResource.empty() || con->get_resource() == m_webSocketResource)
&& (m_webSocketOrigin.empty() || (con->get_origin() != "null" && con->get_origin() == m_webSocketOrigin))) {
&& (m_webSocketOrigin.empty() || (con->get_origin() != "null" && con->get_origin() == m_webSocketOrigin))) {
retVal = true;
}
return retVal;
src/net/common/serverlobbythread.cpp
+5 -6
View File
@@ -1372,7 +1372,7 @@ ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr<SessionData> sessio
const GameData &tmpData = game->GetGameData();
// As guest, you are only allowed to join normal games or to join as spectator.
if (session->GetPlayerData()->GetRights() == PLAYER_RIGHTS_GUEST
&& tmpData.gameType != GAME_TYPE_NORMAL && !joinGame.spectateonly()) {
&& tmpData.gameType != GAME_TYPE_NORMAL && !joinGame.spectateonly()) {
SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_GUEST_FORBIDDEN);
} else if (tmpData.gameType == GAME_TYPE_INVITE_ONLY
&& !game->IsPlayerInvited(session->GetPlayerData()->GetUniqueId())) {
@@ -1583,9 +1583,9 @@ ServerLobbyThread::HandleNetPacketAdminBanPlayer(boost::shared_ptr<SessionData>
RemovePlayer(tmpPlayer->GetUniqueId(), ERR_NET_PLAYER_KICKED);
// Permanently ban the player in the database.
if (tmpPlayer->GetDBId() != DB_ID_INVALID) {
LOG_ERROR("Player " << session->GetPlayerData()->GetName() << "(" << session->GetPlayerData()->GetDBId()
<< ") bans player " << tmpPlayer->GetName() << "(" << tmpPlayer->GetDBId()
<< ") who has IP " << tmpSession->GetClientAddr());
LOG_ERROR("Player " << session->GetPlayerData()->GetName() << "(" << session->GetPlayerData()->GetDBId()
<< ") bans player " << tmpPlayer->GetName() << "(" << tmpPlayer->GetDBId()
<< ") who has IP " << tmpSession->GetClientAddr());
GetDatabase()->AsyncBlockPlayer(session->GetPlayerData()->GetUniqueId(), tmpPlayer->GetUniqueId(), tmpPlayer->GetDBId(), 0, 4);
netBanAck->set_banplayerresult(AdminBanPlayerAckMessage::banPlayerPending);
} else {
@@ -1837,8 +1837,7 @@ ServerLobbyThread::TimerRemoveGame(const boost::system::error_code &ec)
GameMap::iterator next = i;
++next;
boost::shared_ptr<ServerGame> tmpGame = i->second;
if (!tmpGame->GetSessionManager().HasSessionWithState(SessionData::Game))
{
if (!tmpGame->GetSessionManager().HasSessionWithState(SessionData::Game)) {
tmpGame->MoveSpectatorsToLobby();
InternalRemoveGame(tmpGame); // This will delete the game.
}
src/net/common/servermanager.cpp
+1 -2
View File
@@ -94,8 +94,7 @@ ServerManager::Init(unsigned serverPort, unsigned websocketPort, bool ipv6, int
sctpAcceptHelper->Listen(serverPort, ipv6, logDir, m_lobbyThread);
m_acceptHelperPool.push_back(sctpAcceptHelper);
}*/
if (proto & TRANSPORT_PROTOCOL_WEBSOCKET)
{
if (proto & TRANSPORT_PROTOCOL_WEBSOCKET) {
boost::shared_ptr<ServerAcceptInterface> webAcceptHelper(
new ServerAcceptWebHelper(GetGui(), m_ioService, webSocketResource, webSocketOrigin));
webAcceptHelper->Listen(websocketPort, ipv6, logDir, m_lobbyThread);
src/net/netpacketvalidator.h
+1 -1
View File
@@ -133,7 +133,7 @@ protected:
typedef bool (*ValidateFunctor)(const NetPacket &);
typedef std::map<int, ValidateFunctor> ValidateFunctorMap;
private:
ValidateFunctorMap m_validationMap;
};
src/net/serveracceptwebhelper.h
+1 -1
View File
@@ -52,7 +52,7 @@ protected:
typedef std::map<websocketpp::connection_hdl, boost::weak_ptr<SessionData> > SessionMap;
bool validate(websocketpp::connection_hdl hdl);
bool validate(websocketpp::connection_hdl hdl);
void on_open(websocketpp::connection_hdl hdl);
void on_close(websocketpp::connection_hdl hdl);
void on_message(websocketpp::connection_hdl hdl, server::message_ptr msg);
src/net/servermanager.h
+1 -1
View File
@@ -55,7 +55,7 @@ public:
// Set the parameters.
virtual void Init(unsigned serverPort, unsigned websocketPort, bool ipv6, int proto, const std::string &logDir,
const std::string &webSocketResource, const std::string &webSocketOrigin);
const std::string &webSocketResource, const std::string &webSocketOrigin);
// Main start function.
virtual void RunAll();
src/net/servermanagerirc.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
// Set the parameters.
virtual void Init(unsigned serverPort, unsigned websocketPort, bool ipv6, int proto, const std::string &logDir,
const std::string &webSocketResource, const std::string &webSocketOrigin);
const std::string &webSocketResource, const std::string &webSocketOrigin);
// Main start function.
virtual void RunAll();
src/net/websocketdata.h
+1 -2
View File
@@ -36,8 +36,7 @@
#include <net/websocket_defs.h>
struct WebSocketData
{
struct WebSocketData {
boost::shared_ptr<server> webSocketServer;
websocketpp::connection_hdl webHandle;
};
src/pokerth.cpp
+1 -2
View File
@@ -211,8 +211,7 @@ int main( int argc, char **argv )
QPixmap pixmap;
if(customWelcomePokerTHFile.exists()) {
pixmap.load(QFileInfo(customWelcomePokerTHFile).absoluteFilePath());
}
else {
} else {
//if custom welcome pic could not be saved locally we need to scale it on the fly
pixmap.load(":/android/android-data/gfx/gui/misc/welcomepokerth10_mobile.png");
pixmap = pixmap.scaled(screenWidth, screenHeight, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);