Merge remote branch 'origin/fruitiex/xpm'

diff --git a/defaultXPM.cfg b/defaultXPM.cfg
index 35d5da985993d7ad40c8d974ebf7620ba60ac08b..b8a5ce7a17658bd11f6a50107cde738c5d8aaaf7 100644 (file)
--- a/defaultXPM.cfg
+++ b/defaultXPM.cfg
@@ -7,6 +7,7 @@ exec defaultXonotic.cfg
 
 // players
 sv_fbskin_green // visible playermodel forced on everyone
+set teamplay_mode 2 // friendly fire and self damage
 
 //================
 // impure changes
@@ -25,8 +26,6 @@ set g_shootfromcenter 1 // hit where you point at with the crosshair (almost so,
 // match rules
 set timelimit_overtimes 1 // overtimes on, draw matches are less interesting! :)
 set g_forced_respawn 1 // no delaying/cheating a match by not spawning
-set g_mirrordamage 0 // hurting teammates does not hurt you...
-set g_friendlyfire 1 // ...it hurts them.
 
 // info
 set sv_fragmessage_information_stats 0 // don't reveal how much health/armor the attacker had

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 496a84bac22b9cf0d3c2577d4a002bdb3fac634b..f39ed7c2ce00bc8f21657277ba90d8b4666cda15 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -466,6 +466,7 @@ void cvar_changes_init()
                BADCVAR("timelimit_override");
                BADCVAR("g_warmup");
                BADPREFIX("g_warmup_");
+               BADCVAR("teamplay_mode");
 
                if(autocvar_g_minstagib)
                {