Fix it properly

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 53a1583ef715fdb2b0c96601f5165c8b34bd9b4f..9c70adca3cd8c695b9f2f10762f8af0acb01a62d 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -2,8 +2,8 @@
 //  Master config for core game modes
 // ===================================
 
 //  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"
 
 // 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 d1b7ce16fa861bb502311c82ee049a66817869ad..2af3d90823e9dcddee7f187889ca50e2da4eddf2 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1146,7 +1146,7 @@ int MapInfo_CurrentFeatures()
 
 Gametype MapInfo_CurrentGametype()
 {
 
 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;
 }
        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);
 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;
 }
 
        MapInfo_LoadedGametype = t;
 }