# HG changeset patch # User unc0rr # Date 1197644566 0 # Node ID a7e625f5d9d0d14dbb5c0105d79a989be32b56cd # Parent b34fc518a48a4074f1758d6e449b6c97f0c61612 Make use of server port option diff -r b34fc518a48a -r a7e625f5d9d0 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Thu Dec 13 23:07:16 2007 +0000 +++ b/QTfrontend/hwform.cpp Fri Dec 14 15:02:46 2007 +0000 @@ -428,13 +428,13 @@ { config->SaveOptions(); pnetserver = new HWNetServer; - pnetserver->StartServer(); + pnetserver->StartServer(ui.pageNetServer->sbPort->value()); _NetConnect("localhost", pnetserver->getRunningPort(), ui.pageOptions->editNetNick->text()); if (ui.pageNet->rbLocalGame->isChecked()) - pRegisterServer = new HWNetUdpServer(0, "hedgewars server", 46631); + pRegisterServer = new HWNetUdpServer(0, "hedgewars server", ui.pageNetServer->sbPort->value()); else - pRegisterServer = new HWNetWwwServer(0, "hedgewars server", 46631); + pRegisterServer = new HWNetWwwServer(0, "hedgewars server", ui.pageNetServer->sbPort->value()); } void HWForm::NetDisconnect() diff -r b34fc518a48a -r a7e625f5d9d0 QTfrontend/netserver.cpp --- a/QTfrontend/netserver.cpp Thu Dec 13 23:07:16 2007 +0000 +++ b/QTfrontend/netserver.cpp Fri Dec 14 15:02:46 2007 +0000 @@ -23,12 +23,11 @@ #include #include -const quint16 HWNetServer::ds_port=46631; - extern char delimeter; -void HWNetServer::StartServer() +void HWNetServer::StartServer(quint16 port) { + ds_port = port; hhnum=0; IPCServer = new QTcpServer(this); if (!IPCServer->listen(QHostAddress::Any, ds_port)) { diff -r b34fc518a48a -r a7e625f5d9d0 QTfrontend/netserver.h --- a/QTfrontend/netserver.h Thu Dec 13 23:07:16 2007 +0000 +++ b/QTfrontend/netserver.h Fri Dec 14 15:02:46 2007 +0000 @@ -35,7 +35,7 @@ Q_OBJECT public: - void StartServer(); + void StartServer(quint16 port); void StopServer(); bool isChiefClient(HWConnectedClient* cl) const; QMap getGameCfg() const; @@ -56,7 +56,7 @@ private: HWConnectedClient* getChiefClient() const; - static const quint16 ds_port; + quint16 ds_port; QTcpServer* IPCServer; QList connclients;