From: Mario <mario@smbclan.net>
Date: Tue, 10 Jan 2017 15:11:09 +0000 (+1000)
Subject: Fix it properly
X-Git-Tag: xonotic-v0.8.2~303
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bd1c487b7b243df71ea59a999d8952fab2303717;p=xonotic%2Fxonotic-data.pk3dir.git

Fix it properly
---

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 53a1583ef..9c70adca3 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -2,8 +2,8 @@
 //  Master config for core game modes
 // ===================================
 
-// global gametype setting (1 = deathmatch)
-set gamecfg 1
+// global gametype setting (0 = deathmatch)
+set gamecfg 0
 
 // say aliases
 alias asay_ctf_flagcarrier "say_team flag carrier at %y"
diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index d1b7ce16f..2af3d9082 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1146,7 +1146,7 @@ int MapInfo_CurrentFeatures()
 
 Gametype MapInfo_CurrentGametype()
 {
-	Gametype prev = Gametypes_from(cvar("gamecfg") - 1);
+	Gametype prev = Gametypes_from(cvar("gamecfg"));
 	FOREACH(Gametypes, cvar(it.netname) && it != prev, return it);
 	return prev ? prev : MAPINFO_TYPE_DEATHMATCH;
 }
@@ -1230,7 +1230,7 @@ string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags)
 void MapInfo_LoadMapSettings_SaveGameType(Gametype t)
 {
 	MapInfo_SwitchGameType(t);
-	cvar_set("gamecfg", ftos(t.m_id + 1));
+	cvar_set("gamecfg", ftos(t.m_id));
 	MapInfo_LoadedGametype = t;
 }