jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-13 01:24:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor cleanups

Browse source
This commit is contained in:
brukie 2009-05-22 22:32:05 +02:00
parent 0ef00dd437
commit 7e13352a95
29 changed files with 102 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

4
servatrice/src/main.cpp
View file

@ -32,10 +32,6 @@ int main(int argc, char *argv[])
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
Server server;
if (!server.openDatabase()) {
qCritical("Database error");
return -1;
}
server.listen(QHostAddress::Any, 4747);
return app.exec();

11
servatrice/src/random.cpp
View file

@ -1,14 +1,13 @@
#include "random.h"
#include <QThread>
#include <QDateTime>
#include <stdlib.h>
void Random::init()
Random::Random(QObject *parent)
: QObject(parent)
{
if (initialized)
return;
int seed = QDateTime::currentDateTime().toTime_t();
qDebug(QString("%1: qsrand(%2)").arg(thread()->metaObject()->className()).arg(seed).toLatin1());
qDebug(QString("qsrand(%1)").arg(seed).toLatin1());
qsrand(seed);
initialized = true;
}
unsigned int Random::getNumber(unsigned int min, unsigned int max)

7
servatrice/src/random.h
View file

@ -2,16 +2,11 @@
#define RANDOM_H
#include <QObject>
#include <QDateTime>
#include <stdlib.h>
class Random : public QObject {
Q_OBJECT
private:
bool initialized;
public:
Random(QObject *parent) : QObject(parent), initialized(false) { }
void init();
Random(QObject *parent = 0);
unsigned int getNumber(unsigned int min, unsigned int max);
};

38
servatrice/src/server.cpp
View file

@ -28,6 +28,10 @@ Server::Server(QObject *parent)
: QTcpServer(parent), nextGameId(0)
{
settings = new QSettings("servatrice.ini", QSettings::IniFormat, this);
QString dbType = settings->value("database/type").toString();
if (dbType == "mysql")
openDatabase();
}
Server::~Server()
@ -81,21 +85,27 @@ void Server::incomingConnection(int socketId)
AuthenticationResult Server::checkUserPassword(const QString &user, const QString &password)
{
if (!QSqlDatabase::database().exec("select 1").isActive())
openDatabase();
QSqlQuery query;
query.prepare("select password from players where name = :name");
query.bindValue(":name", user);
if (!query.exec()) {
qCritical(QString("Database error: %1").arg(query.lastError().text()).toLatin1());
return PasswordWrong;
}
if (query.next()) {
if (query.value(0).toString() == password)
return PasswordRight;
else
const QString method = settings->value("authentication/method").toString();
if (method == "none")
return UnknownUser;
else if (method == "sql") {
if (!QSqlDatabase::database().exec("select 1").isActive())
openDatabase();
QSqlQuery query;
query.prepare("select password from players where name = :name");
query.bindValue(":name", user);
if (!query.exec()) {
qCritical(QString("Database error: %1").arg(query.lastError().text()).toLatin1());
return PasswordWrong;
}
if (query.next()) {
if (query.value(0).toString() == password)
return PasswordRight;
else
return PasswordWrong;
} else
return UnknownUser;
} else
return UnknownUser;
}