Begin cleaning up most monster functions (still a bit buggy)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / cmd.qc

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index a12fc3f14b1ea55f5539a2c9a8554e3c9f5b7a1b..ce049adf305e31d93ec3fc8b37ddf651c978440a 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -197,7 +197,7 @@ 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, "", ""); return;
-                               case "skin": if(trace_ent.monsterid != MONSTER_MAGE) { trace_ent.skin = stof(argv(2)); trace_ent.SendFlags |= MSF_STATUS; } return;
+                               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;
                        }
                }
@@ -268,8 +268,8 @@ void ClientCommand_mobspawn(float request, float argc)
                                float i;
                                string list = "Available monsters:";
                                
-                               for(i = MONSTER_FIRST + 1; i < MONSTER_LAST; ++i)
-                                       list = strcat(list, " ", monster_id2string(i));
+                               for(i = MON_FIRST; i <= MON_LAST; ++i)
+                                       list = strcat(list, " ", (get_monsterinfo(i)).netname);
                                
                                sprint(self, strcat(list, "\n"));
                                
@@ -295,9 +295,9 @@ void ClientCommand_mobspawn(float request, float argc)
                                //WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 150, MOVE_NORMAL, self);
                        
                                e = spawnmonster(tospawn, 0, self, self, trace_endpos, FALSE, moveflag);
-                               if(mname) e.netname = strzone(mname);
+                               if(mname) e.monster_name = strzone(mname);
                                
-                               sprint(self, strcat("Spawned ", e.netname, "\n"));
+                               sprint(self, strcat("Spawned ", e.monster_name, "\n"));
                        }
                        
                        return;