X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fcmd.qc;h=5baf7ded5e16c655ef6d3394215e7f018e01f01a;hp=0db172f475176f8f75fd9d1b3664ee8979df4793;hb=2c0e35d3ee9fe6652c9c56f29dbbf546da0043b0;hpb=306b95b7d03edfdada049ad3118809137bfe731d

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 0db172f47..5baf7ded5 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -196,20 +196,16 @@ void ClientCommand_mobedit(float request, float argc)
 			
 			switch(argv(1))
 			{
-				case "name": trace_ent.netname = strzone(strdecolorize(argv(2))); if(trace_ent.sprite) WaypointSprite_UpdateSprites(trace_ent.sprite, trace_ent.netname, "", ""); break;
-				case "skin": trace_ent.skin = stof(argv(2)); trace_ent.SendFlags |= MSF_STATUS; break;
-				case "movetarget": trace_ent.monster_moveflags = stof(argv(2)); break;
-				default: sprint(self, "Unknown parameter\n"); break;
+				case "skin": if(trace_ent.monsterid != MON_MAGE) { trace_ent.skin = stof(argv(2)); trace_ent.SendFlags |= MSF_STATUS; } return;
+				case "movetarget": trace_ent.monster_moveflags = stof(argv(2)); return;
 			}
-			
-			return; // never fall through to usage
 		}
 		default:
 			sprint(self, "Incorrect parameters for ^2mobedit^7\n");
 		case CMD_REQUEST_USAGE:
 		{
 			sprint(self, "\nUsage:^3 cmd mobedit [argument]\n");
-			sprint(self, "  Where 'argument' can be name, skin, color or movetarget.\n");
+			sprint(self, "  Where 'argument' can be skin or movetarget.\n");
 			return;
 		}
 	}
@@ -231,7 +227,7 @@ void ClientCommand_mobkill(float request)
 					sprint(self, "That monster does not belong to you.\n");
 					return;
 				}
-				sprint(self, strcat("Your pet '", trace_ent.netname, "' has been brutally mutilated.\n"));
+				sprint(self, strcat("Your pet '", trace_ent.monster_name, "' has been brutally mutilated.\n"));
 				Damage (trace_ent, world, world, trace_ent.health + trace_ent.max_health + 200, DEATH_KILL, trace_ent.origin, '0 0 0');
 				return;
 			}
@@ -259,27 +255,32 @@ void ClientCommand_mobspawn(float request, float argc)
 		case CMD_REQUEST_COMMAND:
 		{
 			entity e;
-			string tospawn, mname;
+			string tospawn;
 			float moveflag;
 			
 			moveflag = (argv(2) ? stof(argv(2)) : 1); // follow owner if not defined
 			tospawn = strtolower(argv(1));
-			mname = argv(3);
 			
 			if(tospawn == "list")
 			{
-				sprint(self, "Available monsters:\n");
-				sprint(self, strcat(autocvar_g_monsters_spawn_list, "\n"));
+				float i;
+				string list = "Available monsters:";
+				
+				for(i = MON_FIRST; i <= MON_LAST; ++i)
+					list = strcat(list, " ", (get_monsterinfo(i)).netname);
+				
+				sprint(self, strcat(list, "\n"));
+				
 				return;
 			}
 			
 			if(autocvar_g_monsters_max <= 0 || autocvar_g_monsters_max_perplayer <= 0) { sprint(self, "Monster spawning is disabled.\n"); }
 			else if(!IS_PLAYER(self)) { sprint(self, "You can't spawn monsters while spectating.\n"); }
+			else if(g_invasion) { sprint(self, "You can't spawn monsters during an invasion!\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.deadflag != DEAD_NO) { 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"); }
 			else if(totalspawned >= autocvar_g_monsters_max) { sprint(self, "The global maximum monster count has been reached, kill some before trying to spawn any more.\n"); }
 			else // all worked out, so continue
@@ -288,12 +289,12 @@ void ClientCommand_mobspawn(float request, float argc)
 				totalspawned += 1;
 			
 				makevectors(self.v_angle);
-				WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 150, MOVE_NORMAL, self);
-			
-				e = spawnmonster(tospawn, self, self, trace_endpos, FALSE, moveflag);
-				if(mname) e.netname = strzone(mname);
+				WarpZone_TraceBox (CENTER_OR_VIEWOFS(self), PL_MIN, PL_MAX, CENTER_OR_VIEWOFS(self) + v_forward * 150, TRUE, self);
+				//WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 150, MOVE_NORMAL, self);
 			
-				sprint(self, strcat("Spawned 1 ", tospawn, "\n"));
+				e = spawnmonster(tospawn, 0, self, self, trace_endpos, FALSE, moveflag);
+				
+				sprint(self, strcat("Spawned ", e.monster_name, "\n"));
 			}
 			
 			return;
@@ -318,7 +319,7 @@ void ClientCommand_ready(float request) // todo: anti-spam for toggling readynes
 		{
 			if(IS_CLIENT(self))
 			{
-				if(inWarmupStage || autocvar_sv_ready_restart || g_race_qualifying == 2)
+				if(warmup_stage || autocvar_sv_ready_restart || g_race_qualifying == 2)
 				{
 					if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable)
 					{