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

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.76 by root, Fri Nov 6 13:31:47 2009 UTC vs.
Revision 1.91 by root, Wed Nov 21 12:12:03 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and 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 <support@deliantra.net>
  */
 #include <global.h>
 #include <sproto.h>
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str);
       return 1;
     }
-  become_follower (ob, god);
+  ob->become_follower (god);
   return 1;
 }
 int
 command_freeze (object *op, char *params)
 int
 command_summon (object *op, char *params)
 {
   int i;
-  object *dummy;
   player *pl;
   if (!op)
     return 0;
   pl = get_other_player_from_name (op, params);
   if (!pl)
     return 1;
-  i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
+  maptile *m = op->map;
+  sint16 nx = op->x;
+  sint16 ny = op->y;
+  i = find_free_spot (op, m, nx, ny, 1, SIZEOFFREE1+1);
   if (i == -1)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
       return 1;
     }
-  pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]);
+  nx += freearr_x [i];
+  ny += freearr_y [i];
+  if (!xy_normalise (m, nx, ny))
+    {
+      new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
+      return 1;
+    }
+  pl->ob->player_goto (m->path, nx, ny);
   new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
   new_draw_info (NDI_UNIQUE, 0, op, "OK.");
   return 1;
 }
 int
 command_create (object *op, char *params)
 {
   object *tmp = NULL;
   int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace;
-  char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline;
+  char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
   archetype *at, *at_spell = NULL;
   artifact *art = NULL;
   if (!op)
     return 0;
   /*
    * Rather than have two different blocks with a lot of similar code,
    * just create one object, do all the processing, and then determine
    * if that one object should be inserted or if we need to make copies.
    */
-  tmp = arch_to_object (at);
+  tmp = at->instance ();
   if (set_magic)
     set_abs_magic (tmp, magic);
   if (art)
     give_artifact_abilities (tmp, art->item);
-  if (need_identify (tmp))
+  if (tmp->need_identify ())
     {
-      SET_FLAG (tmp, FLAG_IDENTIFIED);
+      tmp->set_flag (FLAG_IDENTIFIED);
-      CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL);
+      tmp->clr_flag (FLAG_KNOWN_MAGICAL);
     }
   /*
    * This entire block here tries to find variable pairings,
    * eg, 'hp 4' or the like.  The mess here is that values
    * is we want to find two spaces, but if we got a quote,
    * any spaces there don't count.
    */
   while (*bp2 && bp2 <= endline)
     {
-      bp4 = NULL;
       gotspace = 0;
       gotquote = 0;
       /* find the first quote */
       for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
     }
   if (at->nrof)
     {
       if (at_spell)
-        tmp->insert (arch_to_object (at_spell));
+        tmp->insert (at_spell->instance ());
       tmp->x   = op->x;
       tmp->y   = op->y;
       tmp->map = op->map;
         {
           object *prev = 0, *head = 0;
           for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
             {
-              object *dup = arch_to_object (atmp);
+              object *dup = atmp->instance ();
               if (at_spell)
-                insert_ob_in_ob (arch_to_object (at_spell), dup);
+                insert_ob_in_ob (at_spell->instance (), dup);
               /*
                * The head is what contains all the important bits,
                * so just copying it over should be fine.
                */
                 }
               prev = dup;
             }
-          if (QUERY_FLAG (head, FLAG_ALIVE))
+          if (head->flag [FLAG_ALIVE])
             {
               object *check = head;
               int size_x = 0;
               int size_y = 0;
               while (check)
                 {
-                  size_x = MAX (size_x, check->arch->x);
+                  size_x = max (size_x, check->arch->x);
-                  size_y = MAX (size_y, check->arch->y);
+                  size_y = max (size_y, check->arch->y);
                   check = check->more;
                 }
               if (out_of_map (op->map, head->x + size_x, head->y + size_y))
                 {
   char *dump = dump_object (tmp);
   new_draw_info (NDI_UNIQUE, 0, op, dump);
   free (dump);
-  if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
+  if (tmp->flag [FLAG_OBJ_ORIGINAL])
     new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
   return 1;
 }
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!");
       return 1;
     }
-  if (QUERY_FLAG (tmp, FLAG_REMOVED))
+  if (tmp->flag [FLAG_REMOVED])
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp));
       return 1;
     }
 /**************************************************************************/
 int
 command_stats (object *op, char *params)
 {
-  char thing[20];
   char buf[MAX_BUF];
-  thing[0] = '\0';
+  if (params == NULL || params[0] == '\0')
-  if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Who?");
       return 1;
     }
   for_all_players (pl)
-    if (!strcmp (&pl->ob->name, thing))
+    if (!strcmp (&pl->ob->name, params))
       {
         sprintf (buf, "Str : %-2d      H.P. : %-4d  MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
         new_draw_info (NDI_UNIQUE, 0, op, buf);
         sprintf (buf, "Dex : %-2d      S.P. : %-4d  MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
         new_draw_info (NDI_UNIQUE, 0, op, buf);
 }
 int
 command_nowiz (object *op, char *params)
 {                               /* 'nodm' is alias */
-  CLEAR_FLAG (op, FLAG_WIZ);
+  op->clr_flag (FLAG_WIZ);
-  CLEAR_FLAG (op, FLAG_WIZPASS);
+  op->clr_flag (FLAG_WIZPASS);
-  CLEAR_FLAG (op, FLAG_WIZCAST);
+  op->clr_flag (FLAG_WIZCAST);
-  CLEAR_FLAG (op, FLAG_WIZLOOK);
+  op->clr_flag (FLAG_WIZLOOK);
   op->contr->do_los = 1;
   if (op->contr->hidden)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
 do_wizard_dm (object *op, char *params, int silent)
 {
   if (!op->contr)
     return 0;
-  if (QUERY_FLAG (op, FLAG_WIZ))
+  if (op->flag [FLAG_WIZ])
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
       return 0;
     }
   if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
     {
-      SET_FLAG (op, FLAG_WIZ);
+      op->set_flag (FLAG_WIZ);
-      SET_FLAG (op, FLAG_WIZPASS);
+      op->set_flag (FLAG_WIZPASS);
-      SET_FLAG (op, FLAG_WIZCAST);
+      op->set_flag (FLAG_WIZCAST);
-      SET_FLAG (op, FLAG_WIZLOOK);
+      op->set_flag (FLAG_WIZLOOK);
       op->contr->do_los = 1;
       new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
       op->contr->write_buf[0] = '\0';
 static object *
 get_spell_by_name (object *op, shstr_cmp spell_name)
 {
   /* First check for full name matches. */
   int conflict_found = 0;
-  archetype *found;
+  archetype *found = 0;
   for_all_archetypes (at)
     {
       if (at->type != SPELL)
         continue;
       found = at;
     }
   /* Return if exactly one archetype matches. */
   if (found)
-    return arch_to_object (found);
+    return found->instance ();
   /* No spell found: just print an error message. */
   new_draw_info_format (NDI_UNIQUE, 0, op, "The spell does not exist.");
   return 0;
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to forget?");
       return 0;
     }
-  spell = lookup_spell_by_name (op, params);
+  spell = op->find_spell (params);
   if (spell == NULL)
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
       return 0;
     }
 }
 int
 command_insert_into (object *op, char *params)
 {
-  object *left, *right, *inserted;
+  object *left, *right;
   int left_from, right_from;
   left = get_dm_object (op->contr, &params, &left_from);
   if (!left)
     {
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
       return 0;
     }
-  if (!QUERY_FLAG (right, FLAG_REMOVED))
+  if (!right->flag [FLAG_REMOVED])
     right->remove ();
-  insert_ob_in_ob (right, left);
+  object *inserted = insert_ob_in_ob (right, left);
   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.76 by root, Fri Nov 6 13:31:47 2009 UTC vs. Revision 1.91 by root, Wed Nov 21 12:12:03 2012 UTC

Diff Legend

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.76 by root, Fri Nov 6 13:31:47 2009 UTC vs.
Revision 1.91 by root, Wed Nov 21 12:12:03 2012 UTC