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

Comparing deliantra/server/server/build_map.C (file contents):
Revision 1.68 by root, Mon Oct 29 23:55:55 2012 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,2011,2012 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
   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)
     {
 }
 /**
  * Quad building.
  */
-void
+static void
 apply_builder_quad (object *pl, object *material, mapxy &pos)
 {
   object *open_space = 0;
   object *floor = 0;
   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.");
+          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;
+            open_space = floor;
-            }
           else if (!floor->flag [FLAG_IS_QUAD])
             {
-              pl->failmsg (
-                "You can't build there, the floor is not suited.");
+              pl->failmsg ("You can't build there, the floor is not suited.");
               return;
             }
         }
       tmp = tmp->above;
     {
       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.>");
+            "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
     {
       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.>");
+          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.>");
+          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."
+                  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);
             }
         }
       if (material->destroyed ())
         {
-          pl->failmsg (
-            "You don't have enough build material to build a wall here.");
+          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.");
+    pl->failmsg ("You can't build a quad block here.");
-    }
 }
 /**
  * Global building function
  *

Diff Legend

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

Comparing deliantra/server/server/build_map.C (file contents): Revision 1.68 by root, Mon Oct 29 23:55:55 2012 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.68 by root, Mon Oct 29 23:55:55 2012 UTC vs.
Revision 1.72 by root, Sat Sep 16 22:17:42 2017 UTC