From 18b2f0dba147382cb63c1cf01ca53474760c2c95 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Tue, 25 Mar 2008 10:44:59 +0100 Subject: [PATCH] Enable server-side network mode. --- src/gui/OnlineDialog.cpp | 5 +++-- src/gui/ServerSettingsDialog.cpp | 9 ++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/OnlineDialog.cpp b/src/gui/OnlineDialog.cpp index fe0a89c..2721909 100644 --- a/src/gui/OnlineDialog.cpp +++ b/src/gui/OnlineDialog.cpp @@ -29,8 +29,9 @@ #include "MainWindow.h" #include "GameClient.h" -OnlineDialog::OnlineDialog(QWidget *parent) : - QDialog(parent), Ui_OnlineDialog(*this) +OnlineDialog::OnlineDialog(QWidget *parent) + : QDialog(parent) + , Ui_OnlineDialog(*this) { setupUi(this); _alreadyJoined = false; diff --git a/src/gui/ServerSettingsDialog.cpp b/src/gui/ServerSettingsDialog.cpp index 2a3e8b4..511adb9 100644 --- a/src/gui/ServerSettingsDialog.cpp +++ b/src/gui/ServerSettingsDialog.cpp @@ -27,8 +27,9 @@ #include "MainWindow.h" #include "GameServer.h" -ServerSettingsDialog::ServerSettingsDialog(QWidget *parent) : - QDialog(parent), Ui_ServerSettingsDialog(*this) +ServerSettingsDialog::ServerSettingsDialog(QWidget *parent) + : QDialog(parent) + , Ui_ServerSettingsDialog(*this) { setupUi(this); ServerSettings set; @@ -196,8 +197,7 @@ void ServerSettingsDialog::accept() MainWindow *mainwin = qobject_cast(parent()); Q_ASSERT(mainwin->_net == 0); - // FIXME: _history è a zero quando lo passo al costruttore e fallisce la Q_ASSERT - //mainwin->_net = new GameServer(this, mainwin->_history); + mainwin->_net = new GameServer(this, mainwin->_history); //disabilito più o meno tutto color_0->setEnabled(false); @@ -304,4 +304,3 @@ void ServerSettingsDialog::gameStarted() { QDialog::accept(); } - -- 2.11.4.GIT