From: Mario <mario.mario@y7mail.com>
Date: Sat, 13 Apr 2013 10:29:04 +0000 (+1000)
Subject: Fix monster skin not updating with mobedit skin command
X-Git-Tag: xonotic-v0.8.0~241^2^2~419
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96aaf49e9c0ec0af433159e74d1eb1db0f55814a;p=xonotic%2Fxonotic-data.pk3dir.git

Fix monster skin not updating with mobedit skin command
---

diff --git a/qcsrc/client/monsters.qc b/qcsrc/client/monsters.qc
index 8fc843871..257b27f54 100644
--- a/qcsrc/client/monsters.qc
+++ b/qcsrc/client/monsters.qc
@@ -341,6 +341,8 @@ void ent_monster()
 
 	if(sf & MSF_STATUS)
 	{
+		self.skin = ReadByte();
+	
 		float _tmp;
 		_tmp = ReadByte();
 		if(_tmp != self.team)
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 37292d56a..51463040a 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -199,7 +199,7 @@ void ClientCommand_mobedit(float request, float argc)
 			switch(argv(1))
 			{
 				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)); 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;
diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index c335d8004..4ae1fd56a 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -734,6 +734,8 @@ float monster_send(entity to, float sf)
     
     if(sf & MSF_STATUS)
     {
+		WriteByte(MSG_ENTITY, self.skin);
+		
         WriteByte(MSG_ENTITY, self.team);
         
         if(self.health <= 0)