--- deliantra/server/common/map.C 2009/05/05 04:51:56 1.159
+++ deliantra/server/common/map.C 2010/04/18 12:50:07 1.193
@@ -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 (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2001-2003 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 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
*/
@@ -24,9 +25,10 @@
#include
#include "global.h"
-#include "loader.h"
#include "path.h"
+//+GPL
+
sint8 maptile::outdoor_darkness;
/* This rolls up wall, blocks_magic, blocks_view, etc, all into
@@ -72,9 +74,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 +83,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 +95,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,59 +112,54 @@
* 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.top; tmp; tmp = tmp->below)
{
-
- /* 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
if (tmp->flag [FLAG_ALIVE]
- && tmp->head_ () != ob
- && tmp != ob
&& tmp->type != DOOR
- && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
+ && tmp->head_ () != ob) //TODO: maybe move these check up?
return 1;
}
-
}
+
return 0;
}
/*
- * Returns qthe blocking object if the given object can't fit in the given
+ * Returns the blocking object if the given object can't fit in the given
* spot. This is meant for multi space objects - for single space objecs,
* just calling get_map_blocked and checking that against movement type
* of object. This function goes through all the parts of the multipart
@@ -224,32 +216,7 @@
return 0;
}
-/* When the map is loaded, load_object does not actually insert objects
- * into inventory, but just links them. What this does is go through
- * and insert them properly.
- * The object 'container' is the object that contains the inventory.
- * This is needed so that we can update the containers weight.
- */
-void
-fix_container (object *container)
-{
- object *tmp = container->inv, *next;
-
- container->inv = 0;
- while (tmp)
- {
- next = tmp->below;
- if (tmp->inv)
- fix_container (tmp);
-
- insert_ob_in_ob (tmp, container);
- tmp = next;
- }
-
- // go through and calculate what all the containers are carrying.
- //TODO: remove
- container->update_weight ();
-}
+//-GPL
void
maptile::set_object_flag (int flag, int value)
@@ -275,6 +242,21 @@
INVOKE_OBJECT (RESET, tmp);
}
+void
+maptile::post_load ()
+{
+#if 0
+ if (!spaces)
+ return;
+
+ for (mapspace *ms = spaces + size (); ms-- > spaces; )
+ for (object *tmp = ms->bot; tmp; tmp = tmp->above)
+ ; // nop
+#endif
+}
+
+//+GPL
+
/* link_multipart_objects go through all the objects on the map looking
* for objects whose arch says they are multipart yet according to the
* info we have, they only have the head (as would be expected when
@@ -311,6 +293,8 @@
}
}
+//-GPL
+
/*
* Loads (ands parses) the objects into a given map from the specified
* file pointer.
@@ -439,30 +423,35 @@
return freezer.save (path);
}
-maptile::maptile ()
+void
+maptile::init ()
{
in_memory = MAP_SWAPPED;
/* The maps used to pick up default x and y values from the
* map archetype. Mimic that behaviour.
*/
- width = 16;
- height = 16;
- timeout = 300;
- max_nrof = 1000; // 1000 items of anything
- max_volume = 2000000; // 2m³
+ width = 16;
+ height = 16;
+ timeout = 300;
+ max_items = MAX_ITEM_PER_ACTION;
+ max_volume = 2000000; // 2m³
+ reset_timeout = 0;
+ enter_x = 0;
+ enter_y = 0;
+}
+
+maptile::maptile ()
+{
+ init ();
}
maptile::maptile (int w, int h)
{
- in_memory = MAP_SWAPPED;
+ init ();
- width = w;
- height = h;
- reset_timeout = 0;
- timeout = 300;
- enter_x = 0;
- enter_y = 0;
+ width = w;
+ height = h;
alloc ();
}
@@ -481,6 +470,8 @@
spaces = salloc0 (size ());
}
+//+GPL
+
/* Takes a string from a map definition and outputs a pointer to the array of shopitems
* corresponding to that string. Memory is allocated for this, it must be freed
* at a later date.
@@ -566,34 +557,34 @@
/* 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;
}
+//-GPL
+
/* This loads the header information of the map. The header
* contains things like difficulty, size, timeout, etc.
* this used to be stored in the map object, but with the
@@ -643,12 +634,6 @@
case KW_shopmax: thawer.get (shopmax); break;
case KW_shoprace: thawer.get (shoprace); break;
case KW_outdoor: thawer.get (outdoor); break;
- case KW_temp: thawer.get (temp); break;
- case KW_pressure: thawer.get (pressure); break;
- case KW_humid: thawer.get (humid); break;
- case KW_windspeed: thawer.get (windspeed); break;
- case KW_winddir: thawer.get (winddir); break;
- case KW_sky: thawer.get (sky); break;
case KW_per_player: thawer.get (per_player); break;
case KW_per_party: thawer.get (per_party); break;
@@ -683,7 +668,7 @@
return true;
default:
- if (!thawer.parse_error ("map", 0))
+ if (!thawer.parse_error ("map"))
return false;
break;
}
@@ -694,6 +679,8 @@
abort ();
}
+//+GPL
+
/******************************************************************************
* This is the start of unique map handling code
*****************************************************************************/
@@ -709,10 +696,10 @@
{
object *above = op->above;
- if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
+ if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
unique = 1;
- if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
+ if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
op->destroy ();
op = above;
@@ -720,13 +707,15 @@
}
}
+//-GPL
+
bool
maptile::_save_header (object_freezer &freezer)
{
-#define MAP_OUT(k) freezer.put (KW_ ## k, k)
-#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
+#define MAP_OUT(k) freezer.put (KW(k), k)
+#define MAP_OUT2(k,v) freezer.put (KW(k), v)
- MAP_OUT2 (arch, "map");
+ MAP_OUT2 (arch, CS(map));
if (name) MAP_OUT (name);
MAP_OUT (swap_time);
@@ -736,36 +725,23 @@
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);
MAP_OUT (enter_x);
MAP_OUT (enter_y);
-
- if (msg) freezer.put (KW_msg , KW_endmsg , msg);
- if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
-
+ MAP_OUT (darkness);
MAP_OUT (outdoor);
- MAP_OUT (temp);
- MAP_OUT (pressure);
- MAP_OUT (humid);
- MAP_OUT (windspeed);
- MAP_OUT (winddir);
- MAP_OUT (sky);
+
+ if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
+ if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
MAP_OUT (per_player);
MAP_OUT (per_party);
@@ -776,7 +752,7 @@
if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
freezer.put (this);
- freezer.put (KW_end);
+ freezer.put (KW(end));
return true;
}
@@ -792,6 +768,8 @@
return freezer.save (path);
}
+//+GPL
+
/*
* Remove and free all objects in the given map.
*/
@@ -869,6 +847,7 @@
}
/* decay and destroy perishable items in a map */
+// TODO: should be done regularly, not on map load?
void
maptile::do_decay_objects ()
{
@@ -880,17 +859,17 @@
{
above = op->above;
- bool destroy = 0;
-
// do not decay anything above unique floor tiles (yet :)
- if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
+ if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
break;
- if (QUERY_FLAG (op, FLAG_IS_FLOOR)
- || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
- || QUERY_FLAG (op, FLAG_UNIQUE)
- || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
- || QUERY_FLAG (op, FLAG_UNPAID)
+ bool destroy = 0;
+
+ if (op->flag [FLAG_IS_FLOOR]
+ || op->flag [FLAG_OBJ_ORIGINAL]
+ || op->flag [FLAG_UNIQUE]
+ || op->flag [FLAG_OVERLAY_FLOOR]
+ || op->flag [FLAG_UNPAID]
|| op->is_alive ())
; // do not decay
else if (op->is_weapon ())
@@ -925,7 +904,8 @@
|| (mat & M_GLASS && rndm (1, 2) == 1)
|| ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
|| ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
- || (mat & M_ICE && temp > 32))
+ //|| (mat & M_ICE && temp > 32)
+ )
destroy = 1;
}
@@ -955,13 +935,13 @@
for (mapspace *ms = spaces + size (); ms-- > spaces; )
for (object *op = ms->bot; op; op = op->above)
{
- if (QUERY_FLAG (op, FLAG_MONSTER))
+ if (op->flag [FLAG_MONSTER])
{
total_exp += op->stats.exp;
monster_cnt++;
}
- if (QUERY_FLAG (op, FLAG_GENERATOR))
+ if (op->flag [FLAG_GENERATOR])
{
total_exp += op->stats.exp;
@@ -1026,9 +1006,13 @@
mapspace::update_ ()
{
object *last = 0;
- uint8 flags = P_UPTODATE, anywhere = 0;
+ uint8 flags = P_UPTODATE;
sint8 light = 0;
MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
+ uint64_t volume = 0;
+ uint32_t items = 0;
+ object *anywhere = 0;
+ uint8_t middle_visibility = 0;
//object *middle = 0;
//object *top = 0;
@@ -1038,6 +1022,8 @@
object *&middle = faces_obj[1] = 0;
object *&floor = faces_obj[2] = 0;
+ object::flags_t allflags; // all flags of all objects or'ed together
+
for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
{
// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
@@ -1051,11 +1037,11 @@
*
* Always put the player down for drawing.
*/
- if (!tmp->invisible)
+ if (expect_true (!tmp->invisible))
{
- if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
+ if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
top = tmp;
- else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
+ else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
{
/* If we got a floor, that means middle and top were below it,
* so should not be visible, so we clear them.
@@ -1063,26 +1049,31 @@
middle = 0;
top = 0;
floor = tmp;
+ volume = 0;
+ items = 0;
}
- /* Flag anywhere have high priority */
- else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
+ else
{
- middle = tmp;
- anywhere = 1;
- }
-
- /* Find the highest visible face around. If equal
- * visibilities, we still want the one nearer to the
- * top
- */
- else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
- middle = tmp;
- }
+ if (expect_true (!tmp->flag [FLAG_NO_PICK]))
+ {
+ ++items;
+ volume += tmp->volume ();
+ }
- if (tmp == tmp->above)
- {
- LOG (llevError, "Error in structure of map\n");
- exit (-1);
+ /* Flag anywhere have high priority */
+ if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
+ anywhere = tmp;
+
+ /* Find the highest visible face around. If equal
+ * visibilities, we still want the one nearer to the
+ * top
+ */
+ if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
+ {
+ middle_visibility = ::faces [tmp->face].visibility;
+ middle = tmp;
+ }
+ }
}
move_slow |= tmp->move_slow;
@@ -1091,20 +1082,30 @@
move_off |= tmp->move_off;
move_allow |= tmp->move_allow;
- if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
- if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
- if (tmp->type == PLAYER) flags |= P_PLAYER;
- if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
- if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
- if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
+ allflags |= tmp->flag;
+
+ if (tmp->type == PLAYER) flags |= P_PLAYER;
+ if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
}
+ // FLAG_SEE_ANYWHERE takes precedence
+ if (anywhere)
+ middle = anywhere;
+
+ // ORing all flags together and checking them here is much faster
+ if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
+ if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
+ if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
+ if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
+
this->light = min (light, MAX_LIGHT_RADIUS);
this->flags_ = flags;
this->move_block = move_block & ~move_allow;
this->move_on = move_on;
this->move_off = move_off;
this->move_slow = move_slow;
+ this->volume_ = (volume + 1023) / 1024;
+ this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
/* At this point, we have a floor face (if there is a floor),
* and the floor is set - we are not going to touch it at
@@ -1132,7 +1133,7 @@
for (object *tmp = last; tmp; tmp = tmp->below)
{
/* Once we get to a floor, stop, since we already have a floor object */
- if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
+ if (tmp->flag [FLAG_IS_FLOOR])
break;
/* If two top faces are already set, quit processing */
@@ -1180,17 +1181,6 @@
#endif
}
-uint64
-mapspace::volume () const
-{
- uint64 vol = 0;
-
- for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
- vol += op->volume ();
-
- return vol;
-}
-
maptile *
maptile::tile_available (int dir, bool load)
{
@@ -1436,29 +1426,28 @@
* closest body part of 'op1'
*/
void
-get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
+get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
{
if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
{
/* be conservative and fill in _some_ data */
- retval->distance = 10000;
+ retval->distance = 10000;
retval->distance_x = 10000;
retval->distance_y = 10000;
- retval->direction = 0;
- retval->part = 0;
+ retval->direction = 0;
+ retval->part = 0;
}
else
{
- object *best;
-
retval->distance_x += op2->x - op1->x;
retval->distance_y += op2->y - op1->y;
- best = op1;
+ object *best = op1;
+
/* If this is multipart, find the closest part now */
- if (!(flags & 0x1) && op1->more)
+ if (!(flags & 1) && op1->more)
{
- int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
+ int best_distance = idistance (retval->distance_x, retval->distance_y);
/* we just take the offset of the piece to head to figure
* distance instead of doing all that work above again
@@ -1468,12 +1457,12 @@
*/
for (object *tmp = op1->more; tmp; tmp = tmp->more)
{
- tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
- (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
+ int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
+
if (tmpi < best_distance)
{
best_distance = tmpi;
- best = tmp;
+ best = tmp;
}
}
@@ -1484,9 +1473,9 @@
}
}
- retval->part = best;
- retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
- retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
+ retval->part = best;
+ retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
+ retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
}
}
@@ -1506,20 +1495,20 @@
if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
{
/* be conservative and fill in _some_ data */
- retval->distance = 100000;
+ retval->distance = 100000;
retval->distance_x = 32767;
retval->distance_y = 32767;
- retval->direction = 0;
- retval->part = 0;
+ retval->direction = 0;
+ retval->part = 0;
}
else
{
retval->distance_x += op2->x - x;
retval->distance_y += op2->y - 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);
+ 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);
}
}
@@ -1539,6 +1528,8 @@
return adjacent_map (op1->map, op2->map, &dx, &dy);
}
+//-GPL
+
object *
maptile::insert (object *op, int x, int y, object *originator, int flags)
{
@@ -1560,6 +1551,8 @@
return ::region::default_region ();
}
+//+GPL
+
/* picks a random object from a style map.
*/
object *
@@ -1575,15 +1568,17 @@
{
object *pick = at (gen (width), gen (height)).bot;
- // do not prefer big monsters just because they are big.
+ // must be head: do not prefer big monsters just because they are big.
if (pick && pick->is_head ())
- return pick->head_ ();
+ return pick;
}
// instead of crashing in the unlikely(?) case, try to return *something*
- return archetype::find ("bug");
+ return archetype::find (shstr_bug);
}
+//-GPL
+
void
maptile::play_sound (faceidx sound, int x, int y) const
{
@@ -1619,6 +1614,8 @@
}
}
+dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
+
static void
split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
{
@@ -1683,9 +1680,8 @@
}
maprect *
-maptile::split_to_tiles (int x0, int y0, int x1, int y1)
+maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
{
- static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
buf.clear ();
::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);