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

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.8 by root, Sun Sep 10 13:20:27 2006 UTC vs.
Revision 1.13 by root, Fri Sep 15 23:31:34 2006 UTC

-/*
- * static char *rcsid_c_wiz_c =
- *   "$Id: c_wiz.C,v 1.8 2006/09/10 13:20:27 root Exp $";
- */
 /*
     CrossFire, A Multiplayer game for X-windows
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 #include <global.h>
 #ifndef __CEXTRACT__
 # include <sproto.h>
   new_draw_info (NDI_UNIQUE, 0, op, "at different map places.");
   new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks.");
   new_draw_info (NDI_UNIQUE, 0, op, "Very long loop used so server may have to be reset.");
   new_draw_info (NDI_UNIQUE, 0, op, "type loadtest TRUE to run");
   new_draw_info_format (NDI_UNIQUE, 0, op, "{%s}", params);
   if (!params)
     return 0;
   if (strncmp (params, "TRUE", 4))
     return 0;
   new_draw_info_format (NDI_UNIQUE, 0, op, "gogogo");
   for (x = 0; x < settings.worldmaptilesx; x++)
     {
       for (y = 0; y < settings.worldmaptilesy; y++)
         {
           sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty);
 static object *
 find_object_both (char *params)
 {
   if (!params)
     return NULL;
   if (params[0] == '#')
     return find_object (atol (params + 1));
   else
     return find_object_name (params);
 }
   if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
       return 1;
     }
-  for (pl = first_player; pl != NULL; pl = pl->next)
-    save_player (pl->ob, 0);
-  for (pl = first_player; pl != NULL; pl = pl->next)
-    if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
-      leave_map (pl->ob);
   cleanup ();
   /* not reached */
   return 1;
 }
   if (params == NULL)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]");
       return 1;
     }
   bp = params;
   /* We need to know where the line ends */
   endline = bp + strlen (bp);
         }
       bp++;
       set_nrof = 1;
       LOG (llevDebug, "%s creates: (%d) %s\n", &op->name, nrof, bp);
     }
   if (sscanf (bp, "%d ", &magic))
     {
       if ((bp = strchr (bp, ' ')) == NULL)
         {
           new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]");
           return 1;
         }
       bp++;
       set_magic = 1;
       LOG (llevDebug, "%s creates: (%d) (%d) %s\n", &op->name, nrof, magic, bp);
     }
   if ((cp = strstr (bp, " of ")) != NULL)
     {
       *cp = '\0';
       cp += 4;
     }
   for (bp2 = bp; *bp2; bp2++)
     {
       if (*bp2 == ' ')
         {
           *bp2 = '\0';
           bp2++;
           break;
         }
     }
-  if ((at = find_archetype (bp)) == NULL)
+  if ((at = archetype::find (bp)) == NULL)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "No such archetype.");
       return 1;
     }
        * Try to find a spell object for this. Note that
        * we also set up spell_name which is only
        * the first word.
        */
-      at_spell = find_archetype (cp);
+      at_spell = archetype::find (cp);
       if (!at_spell || at_spell->clone.type != SPELL)
         at_spell = find_archetype_by_object_name (cp);
       if (!at_spell || at_spell->clone.type != SPELL)
         {
           strcpy (spell_name, cp);
           fsp = strchr (spell_name, ' ');
           if (fsp)
             {
               *fsp = 0;
               fsp++;
-              at_spell = find_archetype (spell_name);
+              at_spell = archetype::find (spell_name);
               /* Got a spell, update the first string pointer */
               if (at_spell && at_spell->clone.type == SPELL)
                 bp2 = cp + strlen (spell_name) + 1;
               else
        * in this case means its an artifact.
        */
       if (!at_spell)
         {
           if (find_artifactlist (at->clone.type) == NULL)
-            {
-              new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type);
+            new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type);
-            }
           else
             {
               art = find_artifactlist (at->clone.type)->items;
               do
                   if (!strcmp (art->item->name, cp))
                     break;
                   art = art->next;
                 }
               while (art != NULL);
               if (!art)
-                {
-                  new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp);
+                new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp);
-                }
             }
           LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
         }
     }                           /* if cp */
   if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL ||
    * 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);
   if (settings.real_wiz == FALSE)
     SET_FLAG (tmp, FLAG_WAS_WIZ);
   if (set_magic)
     set_abs_magic (tmp, magic);
   if (art)
     give_artifact_abilities (tmp, art->item);
   if (need_identify (tmp))
     {
       SET_FLAG (tmp, FLAG_IDENTIFIED);
       CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL);
     }
   while (*bp2 && bp2 <= endline)
     {
       bp4 = NULL;
       gotspace = 0;
       gotquote = 0;
       /* find the first quote */
       for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
         {
           /* Found a quote - now lets find the second one */
                   else
                     bp3++;
                 }
             }
           else if (*bp3 == ' ')
-            {
-              gotspace++;
+            gotspace++;
-            }
         }
       /*
        * If we got two spaces, send the second one to null.
        * if we've reached the end of the line, increase gotspace -
            * anyways.
            */
           new_draw_info_format (NDI_UNIQUE, 0, op, "Malformed create line: %s", bp2);
           break;
         }
       /* bp2 should still point to the start of this line,
        * with bp3 pointing to the end
        */
       if (set_variable (tmp, bp2) == -1)
         new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", bp2);
       else
         new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
       bp2 = bp3 + 1;
     }
   if (at->clone.nrof)
     {
       if (at_spell)
         insert_ob_in_ob (arch_to_object (at_spell), tmp);
       tmp->x = op->x;
       tmp->y = op->y;
       if (set_nrof)
         tmp->nrof = nrof;
       tmp->map = op->map;
       tmp = insert_ob_in_ob (tmp, op);
       esrv_send_item (op, tmp);
   else
     {
       for (i = 0; i < (set_nrof ? nrof : 1); i++)
         {
           archetype *atmp;
-          object *prev = NULL, *head = NULL, *dup;
+          object *prev = 0, *head = 0;
-          for (atmp = at; atmp != NULL; atmp = atmp->more)
+          for (atmp = at; atmp; atmp = atmp->more)
             {
-              dup = arch_to_object (atmp);
+              object *dup = arch_to_object (atmp);
               if (at_spell)
                 insert_ob_in_ob (arch_to_object (at_spell), dup);
               /*
                * The head is what contains all the important bits,
                * so just copying it over should be fine.
                */
-              if (head == NULL)
+              if (!head)
                 {
                   head = dup;
                   copy_object (tmp, dup);
                 }
               if (settings.real_wiz == FALSE)
                 SET_FLAG (dup, FLAG_WAS_WIZ);
               dup->x = op->x + dup->arch->clone.x;
               dup->y = op->y + dup->arch->clone.y;
               dup->map = op->map;
               if (head != dup)
                 {
                   dup->head = head;
                   prev->more = dup;
                 }
               prev = dup;
             }
           if (QUERY_FLAG (head, FLAG_ALIVE))
             {
                       free_object (tmp);
                       return 1;
                     }
                   check = head;
                   while (check)
                     {
                       check->x -= size_x;
                       check->y -= size_y;
                       check = check->more;
            */
           dm_stack_push (op->contr, head->count);
           if (at->clone.randomitems != NULL && !at_spell)
             create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0);
           esrv_send_item (op, head);
         }
       /* free the one we used to copy */
       free_object (tmp);

Diff Legend

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

Comparing deliantra/server/server/c_wiz.C (file contents): Revision 1.8 by root, Sun Sep 10 13:20:27 2006 UTC vs. Revision 1.13 by root, Fri Sep 15 23:31:34 2006 UTC

Diff Legend

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.8 by root, Sun Sep 10 13:20:27 2006 UTC vs.
Revision 1.13 by root, Fri Sep 15 23:31:34 2006 UTC