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

Comparing deliantra/server/server/build_map.C (file contents):
Revision 1.5 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.11 by root, Tue Dec 12 20:53:03 2006 UTC

-/*
- * static char *rcsid_build_map =
- *   "$Id: build_map.C,v 1.5 2006/09/10 15:59:57 root Exp $";
- */
 /*
     CrossFire, A Multiplayer game for X-windows
     Copyright (C) 2001 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 to crossfire-devel@real-time.com
+    The authors can be reached via e-mail to <crossfire@schmorp.de>
 */
 #include <global.h>
 #include <living.h>
 #include <spells.h>
 /**
  *  Check if objects on a square interfere with building
  */
 int
-can_build_over (mapstruct *map, object *tmp, short x, short y)
+can_build_over (maptile *map, object *tmp, short x, short y)
 {
   object *ob;
   ob = GET_MAP_OB (map, x, y);
   while (ob)
 /**
  *  Erases marking runes at specified location
  */
 void
-remove_marking_runes (mapstruct *map, short x, short y)
+remove_marking_runes (maptile *map, short x, short y)
 {
   object *rune;
   object *next;
   rune = GET_MAP_OB (map, x, y);
   while (rune)
     {
       next = rune->above;
       if ((rune->type == SIGN) && (!strcmp (rune->arch->name, "rune_mark")))
         {
-          remove_ob (rune);
+          rune->remove ();
-          free_object (rune);
+          rune->destroy (0);
         }
       rune = next;
     }
 }
  * \return 'connected' value with no item, or -1 if failure.
  *
  * Tries 1000 random values, then returns -1.
  */
 int
-find_unused_connected_value (mapstruct *map)
+find_unused_connected_value (maptile *map)
 {
   int connected = 0;
   int itest = 0;
   oblinkpt *obp;
 /**
  * Returns first item of type WALL.
  */
 object *
-get_wall (mapstruct *map, int x, int y)
+get_wall (maptile *map, int x, int y)
 {
   object *wall;
   wall = GET_MAP_OB (map, x, y);
   while (wall && (WALL != wall->type))
  *   Basically it ensures the correct wall is put where needed.
  *
  *   Note: x & y must be valid map coordinates.
  */
 void
-fix_walls (mapstruct *map, int x, int y)
+fix_walls (maptile *map, int x, int y)
 {
   int connect;
   object *wall;
   char archetype[MAX_BUF];
   char *underscore;
   uint32 old_flags[4];
   struct archetype *new_arch;
   int flag;
   /* First, find the wall on that spot */
   wall = get_wall (map, x, y);
   if (!wall)
     /* Nothing -> bail out */
     return;
   /* Find base name */
   strcpy (archetype, wall->arch->name);
   underscore = strchr (archetype, '_');
+  /* search for the first _ before a number */
+  while (underscore && !isdigit (*(underscore + 1)))
+    underscore = strchr (underscore + 1, '_');
-  if (!underscore || (!isdigit (*(underscore + 1))))
+  if (!underscore || !isdigit (*(underscore + 1)))
     /* Not in a format we can change, bail out */
     return;
   underscore++;
   *underscore = '\0';
   /*
    * Before anything, make sure the archetype does exist...
    * If not, prolly an error...
    */
-  new_arch = find_archetype (archetype);
+  new_arch = archetype::find (archetype);
   if (!new_arch)
     return;
   /* Now delete current wall, and insert new one
    * We save flags to avoid any trouble with buildable/non buildable, and so on
    */
   for (flag = 0; flag < 4; flag++)
     old_flags[flag] = wall->flags[flag];
-  remove_ob (wall);
+  wall->remove ();
-  free_object (wall);
+  wall->destroy (0);
   wall = arch_to_object (new_arch);
   wall->type = WALL;
   insert_ob_in_map_at (wall, map, NULL, INS_ABOVE_FLOOR_ONLY, x, y);
   for (flag = 0; flag < 4; flag++)
           above = tmp->above;
           if (WALL == tmp->type)
             {
               /* There was a wall, remove it & keep its archetype to make new walls */
               new_wall = tmp->arch;
-              remove_ob (tmp);
+              tmp->remove ();
-              free_object (tmp);
+              tmp->destroy (0);
               sprintf (message, "You destroy the wall and redo the floor.");
             }
           else if ((FLOOR == tmp->type) || (QUERY_FLAG (tmp, FLAG_IS_FLOOR)))
             {
-              remove_ob (tmp);
+              tmp->remove ();
-              free_object (tmp);
+              tmp->destroy (0);
               floor_removed = 1;
             }
           else
             {
               if (floor_removed)
           tmp = above;
         }
     }
   /* Now insert our floor */
-  new_floor = find_archetype (material->slaying);
+  new_floor = archetype::find (material->slaying);
   if (!new_floor)
     {
       /* Not found, log & bail out */
       LOG (llevError, "apply_builder_floor: unable to find archetype %s.\n", &material->slaying);
       return;
   /* And tell player about the fix */
   new_draw_info (NDI_UNIQUE, 0, pl, message);
 }
 /**
+ * Wall radius fix function
+ */
+void fix_walls_around (maptile *map, int x, int y)
+{
+  for (int xt = x - 1; xt <= x + 1; xt++)
+    for (int yt = y - 1; yt <= y + 1; yt++)
+      {
+        if (OUT_OF_REAL_MAP (map, xt, yt))
+          continue;
+        fix_walls (map, xt, yt);
+      }
+}
+/**
  * Wall building function
  *
  * Walls can be build:
  *  - on a floor without anything else
  *  - on an existing wall, with or without a floor
   /* Find the raw wall in inventory */
   sprintf (message, "You build a wall.");
   /* Now we can actually insert the wall */
-  new_wall = find_archetype (material->slaying);
+  new_wall = archetype::find (material->slaying);
   if (!new_wall)
     {
       LOG (llevError, "apply_builder_wall: unable to find archetype %s\n", &material->slaying);
       return;
     }
   insert_ob_in_map_at (tmp, pl->map, 0, INS_ABOVE_FLOOR_ONLY, x, y);
   /* If existing wall, remove it, no need to fix other walls */
   if (current_wall)
     {
-      remove_ob (current_wall);
+      current_wall->remove ();
-      free_object (current_wall);
+      current_wall->destroy (0);
       fix_walls (pl->map, x, y);
       sprintf (message, "You redecorate the wall to better suit your tastes.");
     }
   else
     {
     {
       new_draw_info (NDI_UNIQUE, 0, pl, "This square has no floor, you can't build here.");
       return;
     }
   /* Create item, set flag, insert in map */
-  arch = find_archetype (item->slaying);
+  arch = archetype::find (item->slaying);
   if (!arch)
     return;
   tmp = arch_to_object (arch);
           con_rune = get_connection_rune (pl, x, y);
           connected = find_or_create_connection_for_map (pl, x, y, con_rune);
           if (connected == -1)
             {
               /* Player already informed of failure by the previous function */
-              free_object (tmp);
+              tmp->destroy (0);
               return;
             }
           /* Remove marking rune */
-          remove_ob (con_rune);
+          con_rune->remove ();
-          free_object (con_rune);
+          con_rune->destroy (0);
     }
   /* For magic mouths/ears, and signs, take the msg from a book of scroll */
   if ((tmp->type == SIGN) || (tmp->type == MAGIC_EAR))
     {
       if (adjust_sign_msg (pl, x, y, tmp) == -1)
         {
-          free_object (tmp);
+          tmp->destroy (0);
           return;
         }
     }
   insert_ob_in_map_at (tmp, pl->map, floor, insert_flag, x, y);
           /* Fall through */
         default:
           /* Remove generic item */
           new_draw_info_format (NDI_UNIQUE, 0, pl, "You remove the %s", query_name (item));
-          remove_ob (item);
+          item->remove ();
-          free_object (item);
+          item->destroy (0);
     }
 }
 /**
  * Global building function
         }
       tmp->face = book->face;
       tmp->invisible = 0;
     }
-  remove_ob (book);
+  book->remove ();
-  free_object (book);
+  book->destroy (0);
   return 0;
 }

Diff Legend

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

Comparing deliantra/server/server/build_map.C (file contents): Revision 1.5 by root, Sun Sep 10 15:59:57 2006 UTC vs. Revision 1.11 by root, Tue Dec 12 20:53:03 2006 UTC

Diff Legend

Comparing deliantra/server/server/build_map.C (file contents):
Revision 1.5 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.11 by root, Tue Dec 12 20:53:03 2006 UTC