From: Mario <mario.mario@y7mail.com>
Date: Sat, 13 Apr 2013 14:07:19 +0000 (+1000)
Subject: Remove color selector from monster tools menu (no longer works)
X-Git-Tag: xonotic-v0.8.0~241^2^2~412
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5b990e7d43bd320ae47080485ac9308690e3ea0;p=xonotic%2Fxonotic-data.pk3dir.git

Remove color selector from monster tools menu (no longer works)
---

diff --git a/qcsrc/menu/xonotic/dialog_monstertools.c b/qcsrc/menu/xonotic/dialog_monstertools.c
index 2aacd1521..761ffb92b 100644
--- a/qcsrc/menu/xonotic/dialog_monstertools.c
+++ b/qcsrc/menu/xonotic/dialog_monstertools.c
@@ -56,9 +56,6 @@ void XonoticMonsterToolsDialog_fill(entity me)
 		me.TD(me, 1, 0.5, e = makeXonoticCommandButton(_("Set skin:"), '0 0 0', "editmob skin $menu_monsters_edit_skin", 0));
 		me.TD(me, 1, 1.5, e = makeXonoticSlider(0, 99, 1, "menu_monsters_edit_skin"));
 	me.TR(me);
-		me.TD(me, 1, 0.5, e = makeXonoticCommandButton(_("Set color:"), '0 0 0', "editmob color \"$menu_monsters_edit_color\"", 0));
-		me.TD(me, 2, 1.5, e = makeXonoticColorpickerString("menu_monsters_edit_color", "menu_monsters_edit_color"));
-	me.TR(me);
 
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 51463040a..d5122fe79 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -200,7 +200,6 @@ void ClientCommand_mobedit(float request, float argc)
 			{
 				case "name": trace_ent.netname = strzone(strdecolorize(argv(2))); WaypointSprite_UpdateSprites(trace_ent.sprite, trace_ent.netname, "", ""); break;
 				case "skin": trace_ent.skin = stof(argv(2)); trace_ent.SendFlags |= MSF_STATUS; break;
-				case "color": trace_ent.colormod = stov(argv(2)); break;
 				case "movetarget": trace_ent.monster_moveflags = stof(argv(2)); break;
 				default: sprint(self, "Unknown parameter\n"); break;
 			}