- Fix trainings again
- Set trunk version to 0.9.9-dev
- Add new version notification to server
--- a/CMakeLists.txt Thu Jan 08 18:42:11 2009 +0000
+++ b/CMakeLists.txt Thu Jan 08 18:44:30 2009 +0000
@@ -9,7 +9,7 @@
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "9")
-set(CPACK_PACKAGE_VERSION_PATCH "8-dev")
+set(CPACK_PACKAGE_VERSION_PATCH "9-dev")
if(DEFINED DATA_INSTALL_DIR)
set(SHAREPATH ${DATA_INSTALL_DIR}/hedgewars/)
@@ -19,7 +19,7 @@
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(HEDGEWARS_PROTO_VER 20)
+set(HEDGEWARS_PROTO_VER 21)
if(WITH_SERVER)
set(HAVE_NETSERVER true)
--- a/netserver/HWProto.hs Thu Jan 08 18:42:11 2009 +0000
+++ b/netserver/HWProto.hs Thu Jan 08 18:44:30 2009 +0000
@@ -100,14 +100,15 @@
(answerClientOnly ["HH_NUM", teamname team, show $ hhnum team])
answerServerMessage client clients = [\serverInfo -> (clientOnly, "SERVER_MESSAGE" :
- [(mainbody serverInfo) ++ clientsIn ++ (lastHour serverInfo)])]
+ [(mainbody serverInfo) ++ updateInfo ++ clientsIn ++ (lastHour serverInfo)])]
where
mainbody serverInfo = serverMessage serverInfo ++
if isDedicated serverInfo then
"<p align=center>Dedicated server</p>"
else
"<p align=center>Private server</p>"
-
+
+ updateInfo = if protocol client < 21 then "<p align=left>Hedgewars 0.9.8 is out!!! Please, update. Support for 0.9.7 will be dropped in a month.</p>" else ""
clientsIn = if protocol client < 20 then "<p align=left>" ++ (show $ length nicks) ++ " clients in: " ++ clientslist ++ "</p>" else []
clientslist = if not $ null nicks then foldr1 (\a b -> a ++ ", " ++ b) nicks else ""
lastHour serverInfo =
--- a/share/hedgewars/Data/Trainings/001_Shotgun.txt Thu Jan 08 18:42:11 2009 +0000
+++ b/share/hedgewars/Data/Trainings/001_Shotgun.txt Thu Jan 08 18:44:30 2009 +0000
@@ -6,7 +6,7 @@
$delay 0
map mushrooms
theme nature
-ammstore 00009000000000000000000000000
+ammstore 000090000000000000000000000000
hhcoords 1310 230
addtrig s2147483649 1 1 32 1150 300 1
addtrig s1 1 1 32 1310 890 2