]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix monster skin not updating with mobedit skin command
authorMario <mario.mario@y7mail.com>
Sat, 13 Apr 2013 10:29:04 +0000 (20:29 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 13 Apr 2013 10:29:04 +0000 (20:29 +1000)
qcsrc/client/monsters.qc
qcsrc/server/command/cmd.qc
qcsrc/server/monsters/lib/monsters.qc

index 8fc84387139c0d8b9abd0a7bfa7ddc9adc592dda..257b27f54b61f9c37c954c11163dd1468bccfb1a 100644 (file)
@@ -341,6 +341,8 @@ void ent_monster()
 
        if(sf & MSF_STATUS)
        {
+               self.skin = ReadByte();
+       
                float _tmp;
                _tmp = ReadByte();
                if(_tmp != self.team)
index 37292d56a4e168c382dae69cc33472f3d7d554d7..51463040a3fc41a52dc4fa28a707f84d1535a291 100644 (file)
@@ -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;
index c335d800441ca68118922dff842b85f6c03642c6..4ae1fd56af5889d9d95beb597de98194c544a8b3 100644 (file)
@@ -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)