- Increase server version number due to rooms list protocol changes
authorunc0rr
Fri, 24 Feb 2012 23:49:31 +0400
changeset 6737 ce5fbd98370f
parent 6736 efad396abee9
child 6738 dd98869d74b4
- Increase server version number due to rooms list protocol changes - Frontend doesn't allow to play on old server
QTfrontend/hwconsts.cpp.in
QTfrontend/net/newnetclient.cpp
gameServer/Consts.hs
gameServer/CoreTypes.hs
--- a/QTfrontend/hwconsts.cpp.in	Thu Feb 23 23:13:48 2012 +0400
+++ b/QTfrontend/hwconsts.cpp.in	Fri Feb 24 23:49:31 2012 +0400
@@ -35,7 +35,7 @@
 bool custom_data = false;
 
 int cMaxTeams = 8;
-int cMinServerVersion = 0;
+int cMinServerVersion = 1;
 
 QString * cDefaultAmmoStore = new QString( AMMOLINE_DEFAULT_QT AMMOLINE_DEFAULT_PROB
                                            AMMOLINE_DEFAULT_DELAY AMMOLINE_DEFAULT_CRATE );
--- a/QTfrontend/net/newnetclient.cpp	Thu Feb 23 23:13:48 2012 +0400
+++ b/QTfrontend/net/newnetclient.cpp	Fri Feb 24 23:49:31 2012 +0400
@@ -254,6 +254,10 @@
         {
             // TODO: Warn user, disconnect
             qWarning() << "Server too old";
+            RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("Server too old"));
+            Disconnect();
+            emit disconnected(tr("The server is too old. Disconnecting now."));
+            return;
         }
 
         RawSendNet(QString("NICK%1%2").arg(delimeter).arg(mynick));
--- a/gameServer/Consts.hs	Thu Feb 23 23:13:48 2012 +0400
+++ b/gameServer/Consts.hs	Fri Feb 24 23:49:31 2012 +0400
@@ -4,4 +4,4 @@
 import qualified Data.ByteString.Char8 as B
 
 serverVersion :: B.ByteString
-serverVersion = "0"
+serverVersion = "1"
--- a/gameServer/CoreTypes.hs	Thu Feb 23 23:13:48 2012 +0400
+++ b/gameServer/CoreTypes.hs	Fri Feb 24 23:49:31 2012 +0400
@@ -133,7 +133,7 @@
         latestReleaseVersion :: Word16,
         earliestCompatibleVersion :: Word16,
         listenPort :: PortNumber,
-        nextRoomID :: Int,
+        --nextRoomID :: Int,
         dbHost :: B.ByteString,
         dbName :: B.ByteString,
         dbLogin :: B.ByteString,
@@ -153,11 +153,11 @@
     ServerInfo
         True
         "<h2><p align=center><a href=\"http://www.hedgewars.org/\">http://www.hedgewars.org/</a></p></h2>"
-        "<font color=yellow><h3 align=center>Hedgewars 0.9.16 is out! Please update.</h3><p align=center><a href=http://hedgewars.org/download.html>Download page here</a></font>"
-        39
-        31 -- 0.9.13
+        "<font color=yellow><h3 align=center>Hedgewars 0.9.17 is out! Please update.</h3><p align=center><a href=http://hedgewars.org/download.html>Download page here</a></font>"
+        41
+        43 -- 0.9.18
         46631
-        0
+        --0
         ""
         ""
         ""