--- deliantra/server/common/map.C 2009/02/17 03:53:31 1.158
+++ deliantra/server/common/map.C 2009/10/21 00:44:39 1.166
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * 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 3 of the License, or
- * (at your option) any later version.
+ * 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 GNU General Public License
- * along with this program. If not, see .
+ * 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
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -72,9 +73,6 @@
int
blocked_link (object *ob, maptile *m, int sx, int sy)
{
- object *tmp;
- int mflags, blocked;
-
/* Make sure the coordinates are valid - they should be, as caller should
* have already checked this.
*/
@@ -84,12 +82,10 @@
return 1;
}
- /* Save some cycles - instead of calling get_map_flags(), just get the value
- * directly.
- */
- mflags = m->at (sx, sy).flags ();
+ mapspace &ms = m->at (sx, sy);
- blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
+ int mflags = ms.flags ();
+ int blocked = ms.move_block;
/* If space is currently not blocked by anything, no need to
* go further. Not true for players - all sorts of special
@@ -98,7 +94,7 @@
if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
return 0;
- /* if there isn't anytyhing alive on this space, and this space isn't
+ /* if there isn't anything alive on this space, and this space isn't
* otherwise blocked, we can return now. Only if there is a living
* creature do we need to investigate if it is part of this creature
* or another. Likewise, only if something is blocking us do we
@@ -115,54 +111,51 @@
* true. If we get through the entire stack, that must mean
* ob is blocking it, so return 0.
*/
- for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
+ for (object *tmp = ms.bot; tmp; tmp = tmp->above)
{
-
- /* This must be before the checks below. Code for inventory checkers. */
- if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
+ if (OB_MOVE_BLOCK (ob, tmp))
{
- /* If last_sp is set, the player/monster needs an object,
- * so we check for it. If they don't have it, they can't
- * pass through this space.
- */
- if (tmp->last_sp)
+ if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
+ if (RESULT_INT (0))
+ return 1;
+ else
+ continue;
+
+ if (tmp->type == CHECK_INV)
{
- if (check_inv_recursive (ob, tmp) == NULL)
+ bool have = check_inv_recursive (ob, tmp);
+
+ // last_sp set means we block if we don't have.
+ if (logical_xor (have, tmp->last_sp))
return 1;
- else
- continue;
}
- else
+ else if (tmp->type == T_MATCH)
{
- /* In this case, the player must not have the object -
- * if they do, they can't pass through.
- */
- if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
+ // T_MATCH allows "entrance" iff the match is true
+ // == blocks if the match fails
+
+ // we could have used an INVOKE_OBJECT, but decided against it, as we
+ // assume that T_MATCH is relatively common.
+ if (!match (tmp->slaying, ob, tmp, ob))
return 1;
- else
- continue;
}
- } /* if check_inv */
- else
- {
- /* Broke apart a big nasty if into several here to make
- * this more readable. first check - if the space blocks
- * movement, can't move here.
- * second - if a monster, can't move there, unless it is a
- * hidden dm
- */
- if (OB_MOVE_BLOCK (ob, tmp))
- return 1;
+ else
+ return 1; // unconditional block
+
+ } else {
+ // space does not block the ob, directly, but
+ // anything alive that is not a door still
+ // blocks anything but wizards.
if (tmp->flag [FLAG_ALIVE]
&& tmp->head_ () != ob
&& tmp != ob
&& tmp->type != DOOR
- && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
+ && !tmp->flag [FLAG_WIZPASS])
return 1;
}
-
}
+
return 0;
}
@@ -566,32 +559,30 @@
/* opposite of parse string, this puts the string that was originally fed in to
* the map (or something equivilent) into output_string. */
-static void
-print_shop_string (maptile *m, char *output_string)
+static const char *
+print_shop_string (maptile *m)
{
- int i;
- char tmp[MAX_BUF];
+ static dynbuf_text buf; buf.clear ();
- strcpy (output_string, "");
- for (i = 0; i < m->shopitems[0].index; i++)
+ for (int i = 0; i < m->shopitems[0].index; i++)
{
if (m->shopitems[i].typenum)
{
if (m->shopitems[i].strength)
- sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
+ buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
else
- sprintf (tmp, "%s;", m->shopitems[i].name);
+ buf.printf ("%s;", m->shopitems[i].name);
}
else
{
if (m->shopitems[i].strength)
- sprintf (tmp, "*:%d;", m->shopitems[i].strength);
+ buf.printf ("*:%d;", m->shopitems[i].strength);
else
- sprintf (tmp, "*");
+ buf.printf ("*");
}
-
- strcat (output_string, tmp);
}
+
+ return buf;
}
/* This loads the header information of the map. The header
@@ -736,20 +727,14 @@
MAP_OUT (no_reset);
MAP_OUT (no_drop);
MAP_OUT (difficulty);
-
if (default_region) MAP_OUT2 (region, default_region->name);
- if (shopitems)
- {
- char shop[MAX_BUF];
- print_shop_string (this, shop);
- MAP_OUT2 (shopitems, shop);
- }
-
+ if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
MAP_OUT (shopgreed);
MAP_OUT (shopmin);
MAP_OUT (shopmax);
if (shoprace) MAP_OUT (shoprace);
+
MAP_OUT (darkness);
MAP_OUT (width);
MAP_OUT (height);
@@ -1517,8 +1502,8 @@
retval->distance_x += op2->x - x;
retval->distance_y += op2->y - y;
- retval->part = NULL;
- retval->distance = idistance (retval->distance_x, retval->distance_y);
+ retval->part = 0;
+ retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
}
}