[ViewVC] Diff of: cvs/deliantra/server/server/c

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.50 by root, Thu Aug 9 06:21:56 2007 UTC vs.
Revision 1.61 by root, Sat Dec 20 02:32:31 2008 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <sproto.h>
 #include <spells.h>
 command_kick (object *op, char *params)
 {
   for_all_players (pl)
     if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
       {
-        object *op = pl->ob;
+        object *plop = pl->ob;
-        if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
+        if (!QUERY_FLAG (plop, FLAG_REMOVED) && !QUERY_FLAG (plop, FLAG_FREED))
           {
-            new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
+            new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &plop->name);
-            strcpy (op->contr->killer, "kicked");
+            plop->contr->killer = op;
           }
         pl->ns->destroy ();
       }
       /* we have nowhere to send the prisoner.... */
       new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
       return 0;
     }
-  pl->ob->enter_exit (dummy);
+  pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
   dummy->destroy ();
   new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
   new_draw_info (NDI_UNIQUE, 0, op, "OK.");
   LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
   return 1;
 }
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
       return 1;
     }
-  dummy = object::create ();
+  pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]);
-  EXIT_PATH (dummy) = op->map->path;
-  EXIT_X (dummy) = op->x + freearr_x[i];
-  EXIT_Y (dummy) = op->y + freearr_y[i];
-  pl->ob->enter_exit (dummy);
-  dummy->destroy ();
   new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
   new_draw_info (NDI_UNIQUE, 0, op, "OK.");
   return 1;
 }
     }
   if (at->nrof)
     {
       if (at_spell)
-        insert_ob_in_ob (arch_to_object (at_spell), tmp);
+        tmp->insert (arch_to_object (at_spell));
-      tmp->x = op->x;
+      tmp->x   = op->x;
-      tmp->y = op->y;
+      tmp->y   = op->y;
+      tmp->map = op->map;
       if (set_nrof)
         tmp->nrof = nrof;
-      tmp->map = op->map;
+      op->insert (tmp);
-      tmp = insert_ob_in_ob (tmp, op);
-      esrv_send_item (op, tmp);
       /* Let's put this created item on stack so dm can access it easily. */
       dm_stack_push (op->contr, tmp->count);
       return 1;
           /* Wonder if we really want to push all of these, but since
            * things like rods have nrof 0, we want to cover those.
            */
           dm_stack_push (op->contr, head->count);
-          if (at->randomitems != NULL && !at_spell)
+          if (at->randomitems && !at_spell)
             create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
-          esrv_send_item (op, head);
         }
       /* free the one we used to copy */
       tmp->destroy ();
     }
  */
 int
 command_inventory (object *op, char *params)
 {
+  int i;
   object *tmp;
-  int i;
-  if (!params)
+  if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
     {
-      inventory (op, NULL);
+      op->contr->failmsg ("Inventory of what object (nr)?");
-      return 0;
+      return 1;
-    }
-  if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
-    {
+    }
-      new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
-      return 1;
-    }
-  inventory (op, tmp);
+  op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
   return 1;
 }
 /* just show player's their skills for now. Dm's can
  * already see skills w/ inventory command - b.t.
        * Remove setting flying here - that won't work, because next
        * fix_player() is called that will get cleared - proper solution
        * is probably something like a wiz_force which gives that and any
        * other desired abilities.
        */
-      clear_los (op->contr);
+      op->contr->clear_los (0);
       op->contr->write_buf[0] = '\0';
       if (!silent)
         new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
       new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
       return 0;
     }
   do_forget_spell (op, spell->name);
-  return 1;
-}
-/**
- * Lists all plugins currently loaded with their IDs and full names.
- */
-int
-command_listplugins (object *op, char *params)
-{
-  plugins_display_list (op);
-  return 1;
-}
-/**
- * Loads the given plugin. The DM specifies the name of the library to load (no
- * pathname is needed). Do not ever attempt to load the same plugin more than
- * once at a time, or bad things could happen.
- */
-int
-command_loadplugin (object *op, char *params)
-{
-  char buf[MAX_BUF];
-  if (params == NULL)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
-      return 1;
-    }
-  strcpy (buf, LIBDIR);
-  strcat (buf, "/plugins/");
-  strcat (buf, params);
-  LOG (llevDebug, "Requested plugin file is %s\n", buf);
-  if (plugins_init_plugin (buf) == 0)
-    new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
-  else
-    new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
-  return 1;
-}
-/**
- * Unloads the given plugin. The DM specified the ID of the library to unload.
- * Note that some things may behave strangely if the correct plugins are not
- * loaded.
- */
-int
-command_unloadplugin (object *op, char *params)
-{
-  if (params == NULL)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
-      return 1;
-    }
-  if (plugins_remove_plugin (params) == 0)
-    new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
-  else
-    new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
   return 1;
 }
 /**
  * A players wants to become DM and hide.
       return 0;
     }
   if (!QUERY_FLAG (right, FLAG_REMOVED))
     right->remove ();
-  inserted = insert_ob_in_ob (right, left);
+  insert_ob_in_ob (right, left);
-  if (left->type == PLAYER)
-    if (inserted == right)
-      esrv_send_item (left, right);
-    else
-      esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
   new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
   return 0;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/c_wiz.C (file contents): Revision 1.50 by root, Thu Aug 9 06:21:56 2007 UTC vs. Revision 1.61 by root, Sat Dec 20 02:32:31 2008 UTC

Diff Legend

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.50 by root, Thu Aug 9 06:21:56 2007 UTC vs.
Revision 1.61 by root, Sat Dec 20 02:32:31 2008 UTC