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

Comparing deliantra/server/server/build_map.C (file contents):
Revision 1.24 by root, Mon Feb 5 02:07:40 2007 UTC vs.
Revision 1.32 by root, Mon Apr 21 06:35:26 2008 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program 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 2 of the License, or
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * 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, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * 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 <living.h>
 #include <spells.h>
   ob = GET_MAP_OB (map, x, y);
   while (ob)
     {
       /* if ob is not a marking rune or floor, then check special cases */
-      if (strcmp (ob->arch->name, "rune_mark") && ob->type != FLOOR)
+      if (strcmp (ob->arch->archname, "rune_mark") && ob->type != FLOOR)
         {
           switch (tmp->type)
             {
                 case SIGN:
                 case MAGIC_EAR:
   rune = GET_MAP_OB (map, x, y);
   while (rune)
     {
       next = rune->above;
-      if ((rune->type == SIGN) && (!strcmp (rune->arch->name, "rune_mark")))
+      if ((rune->type == SIGN) && (!strcmp (rune->arch->archname, "rune_mark")))
         rune->destroy ();
       rune = next;
     }
 }
   int itest = 0;
   oblinkpt *obp;
   while (itest++ < 1000)
     {
-      connected = 1 + rand () % 20000;
+      connected = rndm (0x20000000UL) + 0x60000000UL;
-      for (obp = map->buttons; obp && (obp->value != connected); obp = obp->next);
+      for (obp = map->buttons; obp && (obp->value != connected); obp = obp->next)
+        ;
       if (!obp)
         return connected;
     }
   return -1;
 }
 /**
  * Helper function for door/button/connected item building.
  *
  * Will search the specified spot for a marking rune.
  * Returns the marking rune on the square, for purposes of building connections
  */
 object *
 get_connection_rune (object *pl, short x, short y)
 {
-  object *rune;
-  rune = GET_MAP_OB (pl->map, x, y);
+  object *rune = GET_MAP_OB (pl->map, x, y);
-  while (rune && ((rune->type != SIGN) || (strcmp (rune->arch->name, "rune_mark"))))
+  while (rune && ((rune->type != SIGN) || (strcmp (rune->arch->archname, "rune_mark"))))
     rune = rune->above;
   return rune;
 }
 /**
  * Returns the book/scroll on the current square, for purposes of building
  */
 object *
 get_msg_book (object *pl, short x, short y)
 {
-  object *book;
-  book = GET_MAP_OB (pl->map, x, y);
+  object *book = GET_MAP_OB (pl->map, x, y);
   while (book && (book->type != BOOK))
     book = book->above;
   return book;
 }
 /**
  * Returns first item of type BUILDABLE_WALL.
  */
 object *
 get_wall (maptile *map, int x, int y)
 {
-  object *wall;
-  wall = GET_MAP_OB (map, x, y);
+  object *wall = GET_MAP_OB (map, x, y);
   while (wall && (BUILDABLE_WALL != wall->type))
     wall = wall->above;
   return wall;
 }
  *   Note: x & y must be valid map coordinates.
  */
 void
 fix_walls (maptile *map, int x, int y)
 {
-  object *wall;
   char archetype[MAX_BUF];
   char *underscore;
   struct archetype *new_arch;
   /* First, find the wall on that spot */
-  wall = get_wall (map, x, y);
+  object *wall = get_wall (map, x, y);
   if (!wall)
     /* Nothing -> bail out */
     return;
   /* Find base name */
-  assign (archetype, wall->arch->name);
+  assign (archetype, wall->arch->archname);
   underscore = strchr (archetype, '_');
   /* search for the first _ before a number */
   while (underscore && !isdigit (*(underscore + 1)))
     underscore = strchr (underscore + 1, '_');
         if (!OUT_OF_REAL_MAP (pl->map, xt, yt))
           fix_walls (pl->map, xt, yt);
       }
   /* Now remove raw item from inventory */
-  decrease_ob (material);
+  material->decrease ();
   /* And tell player about the fix */
   new_draw_info (NDI_UNIQUE, 0, pl, message);
 }
             fix_walls (pl->map, xt, yt);
           }
     }
   /* Now remove item from inventory */
-  decrease_ob (material);
+  material->decrease ();
   /* And tell player what happened */
   new_draw_info (NDI_UNIQUE, 0, pl, message);
 }
   if (!arch)
     return;
   tmp = arch_to_object (arch);
-  if ((floor->above) && (!can_build_over (pl->map, tmp, x, y)))
+  if (!floor->flag[FLAG_IS_BUILDABLE] || (floor->above) && (!can_build_over (pl->map, tmp, x, y)))
     /* Floor has something on top that interferes with building */
     {
       new_draw_info (NDI_UNIQUE, 0, pl, "You can't build here.");
       return;
     }
         case PEDESTAL:
         case CF_HANDLE:
         case MAGIC_EAR:
         case SIGN:
           /* Signs don't need a connection, but but magic mouths do. */
-          if (tmp->type == SIGN && strcmp (tmp->arch->name, "magic_mouth"))
+          if (tmp->type == SIGN && strcmp (tmp->arch->archname, "magic_mouth"))
             break;
           con_rune = get_connection_rune (pl, x, y);
           connected = find_or_create_connection_for_map (pl, x, y, con_rune);
           if (connected == -1)
             {
   insert_ob_in_map_at (tmp, pl->map, floor, insert_flag, x, y);
   if (connected != 0)
     add_button_link (tmp, pl->map, connected);
   new_draw_info_format (NDI_UNIQUE, 0, pl, "You build the %s", query_name (tmp));
-  decrease_ob_nr (item, 1);
+  item->decrease ();
 }
 /**
  * Item remover.
  *
       /* Nothing, meaning player is standing next to an undefined square... */
       LOG (llevError, "apply_map_builder: undefined square at (%d, %d, %s)\n", x, y, &pl->map->path);
       new_draw_info (NDI_UNIQUE, 0, pl, "You'd better not build here, it looks weird.");
       return;
     }
   tmp2 = find_marked_object (pl);
   while (tmp)
     {
-      if (!QUERY_FLAG (tmp, FLAG_IS_BUILDABLE) && ((tmp->type != SIGN) || (strcmp (tmp->arch->name, "rune_mark"))))
+      if (!QUERY_FLAG (tmp, FLAG_IS_BUILDABLE) && ((tmp->type != SIGN) || (strcmp (tmp->arch->archname, "rune_mark"))))
         {
           /* The item building function already has it's own special
            * checks for this
            */
           if ((!tmp2) || (tmp2->subtype != ST_MAT_ITEM))
         }
       tmp = tmp->above;
     }
   /* Now we know the square is ok */
-  builder = pl->contr->ranges[range_builder];
+  builder = pl->contr->ranged_ob;
   if (builder->subtype == ST_BD_REMOVE)
     /* Remover -> call specific function and bail out */
     {
       apply_builder_remove (pl, dir);

Diff Legend

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

Comparing deliantra/server/server/build_map.C (file contents): Revision 1.24 by root, Mon Feb 5 02:07:40 2007 UTC vs. Revision 1.32 by root, Mon Apr 21 06:35:26 2008 UTC

Diff Legend

Comparing deliantra/server/server/build_map.C (file contents):
Revision 1.24 by root, Mon Feb 5 02:07:40 2007 UTC vs.
Revision 1.32 by root, Mon Apr 21 06:35:26 2008 UTC