From: Mario <mario.mario@y7mail.com>
Date: Sun, 14 Apr 2013 12:00:09 +0000 (+1000)
Subject: Disable mobspawn & butcher in campaign mode
X-Git-Tag: xonotic-v0.8.0~241^2^2~396
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=25dca67c16fceb3b50ac960e98539d4c56afad24;p=xonotic%2Fxonotic-data.pk3dir.git

Disable mobspawn & butcher in campaign mode
---

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index d5122fe79..bb81250c2 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -279,6 +279,7 @@ void ClientCommand_mobspawn(float request, float argc)
 			else if(!IS_PLAYER(self)) { sprint(self, "You can't spawn monsters while spectating.\n"); }
 			else if not(autocvar_g_monsters) { Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_MONSTERS_DISABLED); }
 			else if(self.vehicle) { sprint(self, "You can't spawn monsters while driving a vehicle.\n"); }
+			else if(autocvar_g_campaign) { sprint(self, "You can't spawn monsters in campaign mode.\n"); }
 			else if(g_td) { sprint(self, "You can't spawn monsters in Tower Defense mode.\n"); }
 			else if(self.deadflag) { sprint(self, "You can't spawn monsters while dead.\n"); }
 			else if(self.monstercount >= autocvar_g_monsters_max_perplayer) { sprint(self, "You have spawned too many monsters, kill some before trying to spawn any more.\n"); }
diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index f3264a40c..627a1108e 100644
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -146,6 +146,7 @@ void GameCommand_butcher(float request)
 		case CMD_REQUEST_COMMAND:
 		{
 			if(g_td) { print("This command doesn't work in Tower Defense.\n"); return; }
+			if(autocvar_g_campaign) { print("This command doesn't work in campaign mode.\n"); return; }
 		
             float removed_count = 0;
 			entity montokill, head;