From: z411 <z411@omaera.org>
Date: Tue, 12 Oct 2021 02:47:37 +0000 (-0300)
Subject: Fixed compile errors
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=dcee0f872a670f3b08e03464cf97ae6717c2500f;p=xonotic%2Fxonotic-data.pk3dir.git

Fixed compile errors
---

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index fe6ba1498..d33a31a5c 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -2637,7 +2637,7 @@ void Scoreboard_Draw()
 		pos = Scoreboard_Spectators_Draw(pos);
 	}
 
-	pos = Scoreboard_MapStats_Draw(pos, panel_bg_color, bg_size);
+	//pos = Scoreboard_MapStats_Draw(pos, panel_bg_color, bg_size);
 
 	// draw scoreboard spectators after mapstats
 	if (autocvar_hud_panel_scoreboard_spectators_position == 3) {
diff --git a/qcsrc/common/gamemodes/gamemode/mmm/sv_mmm.qc b/qcsrc/common/gamemodes/gamemode/mmm/sv_mmm.qc
index c2931f967..15ccc5aa8 100644
--- a/qcsrc/common/gamemodes/gamemode/mmm/sv_mmm.qc
+++ b/qcsrc/common/gamemodes/gamemode/mmm/sv_mmm.qc
@@ -55,12 +55,12 @@ void karma_Control(entity it)
 			//do nothing
 			case 0: return;
 			//force to spec
-			case 1: PutObserverInServer(it); return;
+			case 1: PutObserverInServer(it, true); return;
 			//kick
 			case 2: dropclient(it); return;
 			//ban and kick
 			case 3: Ban_KickBanClient(it, bantime, masksize, "Too low karma"); return;
-			default: PutObserverInServer(it); return;
+			default: PutObserverInServer(it, true); return;
 		}
 	}
 }
diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index 249d4c69a..ab1b8e7e4 100644
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -126,16 +126,10 @@ REGISTER_STAT(NADE_TIMER, float)
 //REGISTER_STAT(SECRETS_FOUND, int, secrets_found)
 REGISTER_STAT(RESPAWN_TIME, float)
 REGISTER_STAT(ROUNDSTARTTIME, float, round_starttime)
-<<<<<<< HEAD
 REGISTER_STAT(OVERTIMESTARTTIME, float, overtime_starttime)
 REGISTER_STAT(OVERTIMESADDED, float, checkrules_overtimesadded)
 //REGISTER_STAT(MONSTERS_TOTAL, int)
 //REGISTER_STAT(MONSTERS_KILLED, int)
-REGISTER_STAT(BUFFS, int)
-=======
-REGISTER_STAT(MONSTERS_TOTAL, int)
-REGISTER_STAT(MONSTERS_KILLED, int)
->>>>>>> master
 REGISTER_STAT(NADE_BONUS, float)
 REGISTER_STAT(NADE_BONUS_TYPE, int)
 REGISTER_STAT(NADE_BONUS_SCORE, float)
diff --git a/qcsrc/server/world.qh b/qcsrc/server/world.qh
index cd5fa3ad1..9f8b08054 100644
--- a/qcsrc/server/world.qh
+++ b/qcsrc/server/world.qh
@@ -32,6 +32,9 @@ bool autocvar_sv_jingle_end;
 string autocvar_sv_jingle_end_list;
 float autocvar_sv_jingle_end_volume;
 
+float fragsleft;
+int fragsleft_last;
+
 float checkrules_equality;
 float checkrules_suddendeathwarning;
 float checkrules_suddendeathend;