version := 0.1.0 for now (string = "git")

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 6b0a9be7d9233b766832a72252b3baaca8573dae..8e75c7a3cbcd1dde11313020b49bb9c4099ad84e 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1,18 +1,3 @@
-set g_xonoticversion 2.5svn    "Xonotic version (formatted for humans)"
-
-// changes a cvar and reports it to the server (for the menu to notify the
-// server about changes)
-alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
-
-// detect dedicated server or client
-alias "_detect_dedicated_$qport" "$*"
-alias "_detect_dedicated_0" ""
-alias if_dedicated "_detect_dedicated_$qport ${* asis}"
-alias if_client "${* asis}"
-if_dedicated alias if_client ""
-
-seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
-
 // Xonotic version (formatted for machines)
 // used to determine if a client version is compatible
 // this doesn't have to be bumped with every release
@@ -23,23 +8,31 @@ seta g_configversion 0       "Configuration file version (used to upgrade settings) 0:
 // servers either
 //
 // e.g. Xonotic 1.5.1 RC1 will be 15101
-gameversion 20000
-gameversion_min 20000 // 2.5.2 still used this
-gameversion_max 20699 // 2.5 version allows any 2.6 release, but no more
+set g_xonoticversion git "Xonotic version (formatted for humans)"
+gameversion 100 // 0.1.0
+gameversion_min 0 // git builds see all versions
+gameversion_max 65535 // git builds see all versions
 
 // compatibility guideline:
 //   version a.b.c   = a0b0c
 //   gameversion_min = a0(b-1)00 // show servers of the previous "line"
 //   gameversion_max = a0(b+1)99 // show servers of the next "line"
-// example: 2.6.3
-//   gameversion 20603
-//   gameversion_min 20500
-//   gameversion_max 20799
-// however, in 2.5.x, we will:
-//   gameversion = 20000 // let other 2.5 clients connect
-//   gameversion_min = 20000 // 2.5.x still has this, we cannot block it within 2.5
-// however, in 2.6.x, we will just:
-//   gameversion_min = 20000 // show 2.5 servers
+// so, for a given gameversion, _min and _max calculate as follows:
+//   gameversion_min = (gameversion / 100) * 100 - 100
+//   gameversion_max = (gameversion / 100) * 100 + 199
+
+// changes a cvar and reports it to the server (for the menu to notify the
+// server about changes)
+alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
+
+// detect dedicated server or client
+alias "_detect_dedicated_$qport" "$*"
+alias "_detect_dedicated_0" ""
+alias if_dedicated "_detect_dedicated_$qport ${* asis}"
+alias if_client "${* asis}"
+if_dedicated alias if_client ""
+
+seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
 // say aliases
 alias asay_ctf_flagcarrier "say_team flag carrier at %y"