# HG changeset patch # User unc0rr # Date 1224337410 0 # Node ID c95c6887b2892131437099e9fcc72090705512de # Parent f33fa81e583db4a8cac8f82e2bc2ffdd71ebdc69 Start new hedgewars server instead of old one diff -r f33fa81e583d -r c95c6887b289 QTfrontend/game.h --- a/QTfrontend/game.h Sat Oct 18 13:37:03 2008 +0000 +++ b/QTfrontend/game.h Sat Oct 18 13:43:30 2008 +0000 @@ -69,12 +69,12 @@ void FromNetChat(const QString & msg); private: - enum GameType { - gtLocal = 1, - gtQLocal = 2, - gtDemo = 3, - gtNet = 4, - gtTraining = 5 + enum GameType { + gtLocal = 1, + gtQLocal = 2, + gtDemo = 3, + gtNet = 4, + gtTraining = 5 }; char msgbuf[MAXMSGCHARS]; QString teams[5]; diff -r f33fa81e583d -r c95c6887b289 QTfrontend/netserver.cpp --- a/QTfrontend/netserver.cpp Sat Oct 18 13:37:03 2008 +0000 +++ b/QTfrontend/netserver.cpp Sat Oct 18 13:43:30 2008 +0000 @@ -18,17 +18,30 @@ */ #include + +#include "hwconsts.h" #include "netserver.h" +HWNetServer::~HWNetServer() +{ + StopServer(); +} + bool HWNetServer::StartServer(quint16 port) { ds_port = port; - return true; + QStringList params; + params << QString("--port=%1").arg(port); + + process.start(bindir->absolutePath() + "/hedgewars-server", params); + + return process.waitForStarted(5000); } void HWNetServer::StopServer() { + process.close(); } diff -r f33fa81e583d -r c95c6887b289 QTfrontend/netserver.h --- a/QTfrontend/netserver.h Sat Oct 18 13:37:03 2008 +0000 +++ b/QTfrontend/netserver.h Sat Oct 18 13:43:30 2008 +0000 @@ -20,12 +20,14 @@ #define _NETSERVER_INCLUDED #include +#include class HWNetServer : public QObject { Q_OBJECT public: + ~HWNetServer(); bool StartServer(quint16 port); void StopServer(); QString getRunningHostName() const; @@ -33,6 +35,7 @@ private: quint16 ds_port; + QProcess process; }; #endif // _NETSERVER_INCLUDED