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

Comparing deliantra/server/server/build_map.C (file contents):
Revision 1.60 by root, Wed Apr 14 21:36:32 2010 UTC vs.
Revision 1.72 by root, Sat Sep 16 22:17:42 2017 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
  * 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 <living.h>
         {
           new_draw_info (NDI_UNIQUE, 0, pl, "Could not create more groups.");
           return shstr_tmp ();
         }
-      force = get_archetype (FORCE_NAME);
+      force = archetype::get (FORCE_NAME);
       force->slaying = pl->map->path;
       force->msg     = rune->msg;
       force->race    = id;
       force->set_speed (0);
     {
       new_draw_info (NDI_UNIQUE, 0, pl, "You need to put a book or scroll with the message.");
       return -1;
     }
+  if (tmp->type == MAGIC_EAR)
+    {
+      snprintf (buf, sizeof (buf), "@match %s", &(book->msg));
+      tmp->msg = buf;
+    }
+  else
-  tmp->msg = book->msg;
+    tmp->msg = book->msg;
   if (tmp->invisible)
     {
       if (book->custom_name)
         snprintf (buf, sizeof (buf), "talking %s", &book->custom_name);
   if (x > 0               && get_wall (map, x - 1, y)) connect |= 1;
   if (x < map->width - 1  && get_wall (map, x + 1, y)) connect |= 2;
   if (y > 0               && get_wall (map, x, y - 1)) connect |= 4;
   if (y < map->height - 1 && get_wall (map, x, y + 1)) connect |= 8;
-  // one bit per dir, 1 left, 2 right, 4 up, 8 down
-  static const char *walltype[16] = {
-    "0",
-    "1_3",
-    "1_4",
-    "2_1_2",
-    "1_2",
-    "2_2_4",
-    "2_2_1",
-    "3_1",
-    "1_1",
-    "2_2_3",
-    "2_2_2",
-    "3_3",
-    "2_1_1",
-    "3_4",
-    "3_2",
-    "4"
-  };
-  strcat (archetype, walltype [connect]);
+  strcat (archetype, wall_suffix [connect]);
   /*
    * Before anything, make sure the archetype does exist...
    * If not, prolly an error...
    */
   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
    */
   object::flags_t old_flags = wall->flag; // elmex: this is where C++ pays off
   wall->destroy ();
   char message[MAX_BUF];
   sprintf (message, "You change the floor to better suit your tastes.");
   /*
    * Now the building part...
    * First, remove wall(s) and floor(s) at position x, y
    */
   above_floor = NULL;
   new_wall = NULL;
   floor_removed = 0;
    * Next step: make sure there are either walls or floors around the new square
    * Since building, you can have: blocking view / floor / wall / nothing
    */
   for (i = 1; i <= 8; i++)
     {
-      xt = x + freearr_x[i];
+      xt = x + DIRX (i);
-      yt = y + freearr_y[i];
+      yt = y + DIRY (i);
       tmp = GET_MAP_OB (pl->map, xt, yt);
       if (!tmp)
         {
           /* Must insert floor & wall */
           tmp = new_floor->instance ();
 apply_builder_remove (object *pl, int dir)
 {
   object *item;
   int x, y;
-  x = pl->x + freearr_x[dir];
+  x = pl->x + DIRX (dir);
-  y = pl->y + freearr_y[dir];
+  y = pl->y + DIRY (dir);
   /* Check square */
   item = GET_MAP_OB (pl->map, x, y);
   if (!item)
     {
       new_draw_info_format (NDI_UNIQUE, 0, pl, "You remove the %s", query_name (item));
       item->destroy ();
     }
 }
+static void
+replace_open_space_floor (object *os, object *material)
+{
+  object *new_floor = archetype::get (material->slaying);
+  insert_ob_in_map_at (new_floor, os->map, os,
+                       INS_BELOW_ORIGINATOR, os->x, os->y);
+  os->destroy ();
+  material->decrease ();
+}
+/**
+ * Quad building.
+ */
+static void
+apply_builder_quad (object *pl, object *material, mapxy &pos)
+{
+  object *open_space = 0;
+  object *floor = 0;
+  object *tmp = pos.ms ().bot;
+  bool floor_exists = false;
+  while (tmp)
+    {
+      if (floor_exists && tmp->flag [FLAG_IS_QUAD])
+        {
+          pl->failmsg ("You can't build there, there is a block in the way.");
+          return;
+        }
+      if (IS_FLOOR (tmp))
+        {
+          floor = tmp;
+          floor_exists = true;
+          if (floor->arch->archname == shstr_quad_open_space)
+            open_space = floor;
+          else if (!floor->flag [FLAG_IS_QUAD])
+            {
+              pl->failmsg ("You can't build there, the floor is not suited.");
+              return;
+            }
+        }
+      tmp = tmp->above;
+    }
+  if (open_space)
+    {
+      if (!material->slaying)
+        {
+          pl->failmsg (
+            "The floor is open and you can't fill it with that material."
+            "H<Use another material to fill the ceiling.>"
+          );
+          return;
+        }
+      replace_open_space_floor (open_space, material);
+      pl->contr->fire_on = 0; // TODO: stopgap, do not add more than one per keypress
+      return;
+    }
+  else if (floor)
+    {
+      maptile *upper_floor = pos.m->tile_available (TILE_UP);
+      if (!upper_floor)
+        {
+          pl->failmsg ("Whoops, you can't see the ceiling.. H<You may try again.>");
+          return;
+        }
+      mapxy above_pos (upper_floor, pos.x, pos.y);
+      if (!above_pos.normalise ())
+        {
+          pl->failmsg ("Whoops, you can't access the ceiling. H<You may try again.>");
+          return;
+        }
+      mapspace &above_ms = above_pos.ms ();
+      for (object *quad_obj = above_ms.top; quad_obj; quad_obj = quad_obj->below)
+        {
+          if (quad_obj->arch->archname == shstr_quad_open_space)
+            {
+              if (!material->slaying)
+                {
+                  pl->failmsg ("The ceiling is open and you can't fill it with that material."
+                    "H<Use another material to fill the ceiling.>");
+                  return;
+                }
+              replace_open_space_floor (quad_obj, material);
+              break;
+            }
+        }
+      if (material->destroyed ())
+        {
+          pl->failmsg ("You don't have enough build material to build a wall here.");
+          return;
+        }
+      object *quad_wall = material->other_arch->instance ();
+      material->decrease ();
+      insert_ob_in_map_at (quad_wall, floor->map, 0,
+                           INS_ABOVE_FLOOR_ONLY, floor->x, floor->y);
+    }
+  else
+    pl->failmsg ("You can't build a quad block here.");
+}
 /**
  * Global building function
  *
  * This is the general map building function. Called when the player 'fires' a builder
  * or remover object.
  */
 void
 apply_map_builder (object *pl, int dir)
 {
-  int x, y;
   if (!pl->type == PLAYER)
     return;
-  /*if ( !player->map->unique )
-     {
-     new_draw_info( NDI_UNIQUE, 0, player, "You can't build outside a unique map." );
-     return;
-     } */
   if (dir == 0)
     {
       new_draw_info (NDI_UNIQUE, 0, pl, "You can't build or destroy under yourself.");
       return;
     }
-  x = pl->x + freearr_x[dir];
+  mapxy pos (pl); pos.move (dir);
-  y = pl->y + freearr_y[dir];
-  if ((1 > x) || (1 > y) || ((pl->map->width - 2) < x) || ((pl->map->height - 2) < y))
+  if (!pos.normalise ())
     {
-      new_draw_info (NDI_UNIQUE, 0, pl, "Can't build on map edge...");
+      pl->failmsg ("You can't build here. H<There is nothing in this direction.>");
       return;
     }
   /*
    * Check specified square
    * The square must have only buildable items
    * Exception: marking runes are all right,
    * since they are used for special things like connecting doors / buttons
    */
-  object *tmp = GET_MAP_OB (pl->map, x, y);
-  if (!tmp)
-    {
-      /* 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;
-    }
   object *builder = pl->contr->ranged_ob;
   object *tmp2 = pl->mark ();
-  while (tmp)
+  object *tmp = 0;
+  for (tmp = pos.ms ().bot; tmp; tmp = tmp->above)
     {
+      if (!tmp->flag [FLAG_IS_BUILDABLE]
-      if (!tmp->flag [FLAG_IS_BUILDABLE] && (tmp->type != SIGN || tmp->arch->archname != shstr_rune_mark))
+          && (tmp->type != SIGN || tmp->arch->archname != shstr_rune_mark))
         {
           /* The item building function already has it's own special
-           * checks for this
+           * checks for this. And so does the quad building function.
            */
-          if (!tmp2 || tmp2->subtype != ST_MAT_ITEM)
+          if (!tmp2 || (tmp2->subtype != ST_MAT_ITEM && tmp2->subtype != ST_MAT_QUAD))
             {
-              if (!INVOKE_PLAYER (BUILD, pl->contr, ARG_OBJECT (builder), ARG_MAP (pl->map), ARG_INT (x), ARG_INT (y), ARG_INT (0)))
+              if (!INVOKE_PLAYER (BUILD, pl->contr, ARG_OBJECT (builder),
+                                  ARG_MAP (pl->map),
+                                  ARG_INT (pos.y), ARG_INT (pos.y),
+                                  ARG_INT (0)))
                 new_draw_info (NDI_UNIQUE, 0, pl, "You can't build here.");
               return;
             }
         }
-      tmp = tmp->above;
     }
   /* Now we know the square is ok */
-  if (INVOKE_PLAYER (BUILD, pl->contr, ARG_OBJECT (builder), ARG_MAP (pl->map), ARG_INT (x), ARG_INT (y), ARG_INT (1)))
+  if (INVOKE_PLAYER (BUILD, pl->contr, ARG_OBJECT (builder),
+                     ARG_MAP (pl->map), ARG_INT (pos.x), ARG_INT (pos.y), ARG_INT (1)))
     return;
   if (builder->subtype == ST_BD_REMOVE)
     /* Remover -> call specific function and bail out */
     {
         }
       switch (tmp->subtype)
         {
           case ST_MAT_FLOOR:
-            apply_builder_floor (pl, tmp, x, y);
+            apply_builder_floor (pl, tmp, pos.x, pos.y);
             return;
           case ST_MAT_WALL:
-            apply_builder_wall (pl, tmp, x, y);
+            apply_builder_wall (pl, tmp, pos.x, pos.y);
             return;
           case ST_MAT_ITEM:
-            apply_builder_item (pl, tmp, x, y);
+            apply_builder_item (pl, tmp, pos.x, pos.y);
+            return;
+          case ST_MAT_QUAD:
+            apply_builder_quad (pl, tmp, pos);
             return;
           default:
             new_draw_info (NDI_UNIQUE, 0, pl, "Don't know how to apply this material, sorry.");
             LOG (llevError, "apply_map_builder: invalid material subtype %d\n", tmp->subtype);

Diff Legend

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

Comparing deliantra/server/server/build_map.C (file contents): Revision 1.60 by root, Wed Apr 14 21:36:32 2010 UTC vs. Revision 1.72 by root, Sat Sep 16 22:17:42 2017 UTC

Diff Legend

Comparing deliantra/server/server/build_map.C (file contents):
Revision 1.60 by root, Wed Apr 14 21:36:32 2010 UTC vs.
Revision 1.72 by root, Sat Sep 16 22:17:42 2017 UTC