--- deliantra/server/common/map.C 2008/04/02 11:13:52 1.133
+++ deliantra/server/common/map.C 2011/05/05 18:59:43 1.207
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 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,2011 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,11 +25,11 @@
#include
#include "global.h"
-#include "funcpoint.h"
+#include "path.h"
-#include "loader.h"
+//+GPL
-#include "path.h"
+sint8 maptile::outdoor_darkness;
/* This rolls up wall, blocks_magic, blocks_view, etc, all into
* one function that just returns a P_.. value (see map.h)
@@ -73,33 +74,28 @@
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.
*/
if (OUT_OF_REAL_MAP (m, sx, sy))
{
- LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
+ LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
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
* things we need to do for players.
*/
- if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
+ 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
@@ -116,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
@@ -225,45 +216,47 @@
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.
- */
+//-GPL
+
void
-fix_container (object *container)
+maptile::set_object_flag (int flag, int value)
{
- object *tmp = container->inv, *next;
+ if (!spaces)
+ return;
- container->inv = 0;
- while (tmp)
- {
- next = tmp->below;
- if (tmp->inv)
- fix_container (tmp);
+ for (mapspace *ms = spaces + size (); ms-- > spaces; )
+ for (object *tmp = ms->bot; tmp; tmp = tmp->above)
+ tmp->flag [flag] = value;
+}
- insert_ob_in_ob (tmp, container);
- tmp = next;
- }
+void
+maptile::post_load_original ()
+{
+ if (!spaces)
+ return;
- /* sum_weight will go through and calculate what all the containers are
- * carrying.
- */
- sum_weight (container);
+ set_object_flag (FLAG_OBJ_ORIGINAL);
+
+ for (mapspace *ms = spaces + size (); ms-- > spaces; )
+ for (object *tmp = ms->bot; tmp; tmp = tmp->above)
+ INVOKE_OBJECT (RESET, tmp);
}
void
-maptile::set_object_flag (int flag, int value)
+maptile::post_load ()
{
+#if 0
if (!spaces)
return;
for (mapspace *ms = spaces + size (); ms-- > spaces; )
for (object *tmp = ms->bot; tmp; tmp = tmp->above)
- tmp->flag [flag] = value;
+ ; // 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
@@ -300,6 +293,8 @@
}
}
+//-GPL
+
/*
* Loads (ands parses) the objects into a given map from the specified
* file pointer.
@@ -316,15 +311,19 @@
case KW_arch:
if (object *op = object::read (f, this))
{
+ // TODO: why?
if (op->inv)
- sum_weight (op);
+ {
+ op->carrying = 0;
+ op->update_weight ();
+ }
if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
{
// we insert manually because
// a) its way faster
// b) we remove manually, too, and there are good reasons for that
- // c) its correct
+ // c) it's correct
mapspace &ms = at (op->x, op->y);
op->flag [FLAG_REMOVED] = false;
@@ -332,10 +331,7 @@
op->above = 0;
op->below = ms.top;
- if (ms.top)
- ms.top->above = op;
- else
- ms.bot = op;
+ *(ms.top ? &ms.top->above : &ms.bot) = op;
ms.top = op;
ms.flags_ = 0;
@@ -367,19 +363,27 @@
void
maptile::activate ()
{
- if (spaces)
- for (mapspace *ms = spaces + size (); ms-- > spaces; )
- for (object *op = ms->bot; op; op = op->above)
- op->activate_recursive ();
+ if (state != MAP_INACTIVE)
+ return;
+
+ for (mapspace *ms = spaces + size (); ms-- > spaces; )
+ for (object *op = ms->bot; op; op = op->above)
+ op->activate_recursive ();
+
+ state = MAP_ACTIVE;
}
void
maptile::deactivate ()
{
- if (spaces)
- for (mapspace *ms = spaces + size (); ms-- > spaces; )
- for (object *op = ms->bot; op; op = op->above)
- op->deactivate_recursive ();
+ if (state != MAP_ACTIVE)
+ return;
+
+ for (mapspace *ms = spaces + size (); ms-- > spaces; )
+ for (object *op = ms->bot; op; op = op->above)
+ op->deactivate_recursive ();
+
+ state = MAP_INACTIVE;
}
bool
@@ -430,30 +434,35 @@
return freezer.save (path);
}
-maptile::maptile ()
+void
+maptile::init ()
{
- in_memory = MAP_SWAPPED;
+ state = 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 ();
}
@@ -472,6 +481,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.
@@ -557,34 +568,40 @@
/* 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 ();
+ bool first = true;
- strcpy (output_string, "");
- for (i = 0; i < m->shopitems[0].index; i++)
+ for (int i = 0; i < m->shopitems[0].index; i++)
{
+ if (!first)
+ buf << ';';
+
+ first = false;
+
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
@@ -607,7 +624,7 @@
thawer.get_ml (KW_endmsg, msg);
break;
- case KW_lore: // CF+ extension
+ case KW_lore: // deliantra extension
thawer.get_ml (KW_endlore, maplore);
break;
@@ -634,18 +651,13 @@
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;
case KW_no_reset: thawer.get (no_reset); break;
+ case KW_no_drop: thawer.get (no_drop); break;
- case KW_region: default_region = region::find (thawer.get_str ()); break;
+ case KW_region: thawer.get (default_region); break;
case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
// old names new names
@@ -663,6 +675,8 @@
case KW_tile_path_2: thawer.get (tile_path [1]); break;
case KW_tile_path_3: thawer.get (tile_path [2]); break;
case KW_tile_path_4: thawer.get (tile_path [3]); break;
+ case KW_tile_path_5: thawer.get (tile_path [4]); break;
+ case KW_tile_path_6: thawer.get (tile_path [5]); break;
case KW_ERROR:
set_key_text (thawer.kw_str, thawer.value);
@@ -673,7 +687,7 @@
return true;
default:
- if (!thawer.parse_error ("map", 0))
+ if (!thawer.parse_error ("map"))
return false;
break;
}
@@ -684,6 +698,8 @@
abort ();
}
+//+GPL
+
/******************************************************************************
* This is the start of unique map handling code
*****************************************************************************/
@@ -699,27 +715,26 @@
{
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))
- {
- op->destroy_inv (false);
- op->destroy ();
- }
+ if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
+ op->destroy ();
op = above;
}
}
}
+//-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);
@@ -727,37 +742,25 @@
MAP_OUT (reset_timeout);
MAP_OUT (fixed_resettime);
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);
@@ -766,9 +769,11 @@
if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
+ if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
+ if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
freezer.put (this);
- freezer.put (KW_end);
+ freezer.put (KW(end));
return true;
}
@@ -784,6 +789,8 @@
return freezer.save (path);
}
+//+GPL
+
/*
* Remove and free all objects in the given map.
*/
@@ -803,10 +810,7 @@
object *head = op->head_ ();
if (op == head)
- {
- op->destroy_inv (false);
- op->destroy ();
- }
+ op->destroy ();
else if (head->map != op->map)
{
LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
@@ -814,13 +818,13 @@
}
}
- sfree (spaces, size ()), spaces = 0;
+ sfree0 (spaces, size ());
}
if (buttons)
free_objectlinkpt (buttons), buttons = 0;
- sfree (regions, size ()); regions = 0;
+ sfree0 (regions, size ());
delete [] regionmap; regionmap = 0;
}
@@ -833,7 +837,7 @@
shoprace = 0;
delete [] shopitems, shopitems = 0;
- for (int i = 0; i < 4; i++)
+ for (int i = 0; i < array_length (tile_path); i++)
tile_path [i] = 0;
}
@@ -850,7 +854,7 @@
* tiling can be asymetric, we just can not look to see which
* maps this map tiles with and clears those.
*/
- for (int i = 0; i < 4; i++)
+ for (int i = 0; i < array_length (tile_path); i++)
if (tile_map[i] == m)
tile_map[i] = 0;
}
@@ -864,6 +868,7 @@
}
/* decay and destroy perishable items in a map */
+// TODO: should be done regularly, not on map load?
void
maptile::do_decay_objects ()
{
@@ -875,17 +880,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 ())
@@ -920,7 +925,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;
}
@@ -931,38 +937,14 @@
}
/*
- * Updates every button on the map (by calling update_button() for them).
- */
-void
-maptile::update_buttons ()
-{
- for (oblinkpt *obp = buttons; obp; obp = obp->next)
- for (objectlink *ol = obp->link; ol; ol = ol->next)
- {
- if (!ol->ob)
- {
- LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
- ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
- continue;
- }
-
- if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
- {
- update_button (ol->ob);
- break;
- }
- }
-}
-
-/*
* This routine is supposed to find out the difficulty of the map.
* difficulty does not have a lot to do with character level,
* but does have a lot to do with treasure on the map.
*
- * Difficulty can now be set by the map creature. If the value stored
- * in the map is zero, then use this routine. Maps should really
- * have a difficulty set than using this function - human calculation
- * is much better than this functions guesswork.
+ * Difficulty can now be set by the map creator. If the value stored
+ * in the map is zero, then use this routine. Maps should really
+ * have a difficulty set rather than using this function - human calculation
+ * is much better than this function's guesswork.
*/
int
maptile::estimate_difficulty () const
@@ -974,20 +956,27 @@
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;
- if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
- total_exp += at->stats.exp * 8;
+ if (archetype *at = op->other_arch)
+ {
+ total_exp += at->stats.exp * 8;
+ monster_cnt++;
+ }
- monster_cnt++;
+ for (object *inv = op->inv; inv; inv = inv->below)
+ {
+ total_exp += op->stats.exp * 8;
+ monster_cnt++;
+ }
}
}
@@ -1010,10 +999,8 @@
int
maptile::change_map_light (int change)
{
- int new_level = darkness + change;
-
/* Nothing to do */
- if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))
+ if (!change)
return 0;
/* inform all players on the map */
@@ -1022,20 +1009,11 @@
else
new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
- /* Do extra checking. since darkness is a unsigned value,
- * we need to be extra careful about negative values.
- * In general, the checks below are only needed if change
- * is not +/-1
- */
- if (new_level < 0)
- darkness = 0;
- else if (new_level >= MAX_DARKNESS)
- darkness = MAX_DARKNESS;
- else
- darkness = new_level;
+ darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
/* All clients need to get re-updated for the change */
update_all_map_los (this);
+
return 1;
}
@@ -1048,9 +1026,14 @@
void
mapspace::update_ ()
{
- object *tmp, *last = 0;
- uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
+ object *last = 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;
@@ -1060,15 +1043,12 @@
object *&middle = faces_obj[1] = 0;
object *&floor = faces_obj[2] = 0;
- for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
+ object::flags_t allflags; // all flags of all objects or'ed together
+
+ for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
{
- /* This could be made additive I guess (two lights better than
- * one). But if so, it shouldn't be a simple additive - 2
- * light bulbs do not illuminate twice as far as once since
- * it is a dissapation factor that is cubed.
- */
- if (tmp->glow_radius > light)
- light = tmp->glow_radius;
+ // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
+ light += tmp->glow_radius;
/* This call is needed in order to update objects the player
* is standing in that have animations (ie, grass, fire, etc).
@@ -1078,11 +1058,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.
@@ -1090,25 +1070,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;
@@ -1117,20 +1103,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;
}
- this->light = light;
+ // 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
@@ -1155,10 +1151,10 @@
* 3) neither middle or top is set - need to set both.
*/
- for (tmp = last; tmp; tmp = tmp->below)
+ 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 */
@@ -1206,28 +1202,19 @@
#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;
-}
-
-bool
+maptile *
maptile::tile_available (int dir, bool load)
{
- if (!tile_path[dir])
- return 0;
-
- if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
- return 1;
-
- if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
- return 1;
+ if (tile_path[dir])
+ {
+ // map is there and we don't need to load it OR it's loaded => return what we have
+ if (tile_map[dir] && (!load || tile_map[dir]->linkable ()))
+ return tile_map[dir];
+
+ // well, try to locate it then, if possible - maybe it's there already
+ if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
+ return tile_map[dir];
+ }
return 0;
}
@@ -1346,7 +1333,7 @@
* map1 to map2 in dx/dy.
*/
int
-adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
+adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
{
if (!map1 || !map2)
return 0;
@@ -1358,65 +1345,65 @@
*dx = 0;
*dy = 0;
}
- else if (map1->tile_map[0] == map2)
- { /* up */
+ else if (map1->tile_available (TILE_NORTH, false) == map2)
+ {
*dx = 0;
*dy = -map2->height;
}
- else if (map1->tile_map[1] == map2)
- { /* right */
+ else if (map1->tile_available (TILE_EAST , false) == map2)
+ {
*dx = map1->width;
*dy = 0;
}
- else if (map1->tile_map[2] == map2)
- { /* down */
+ else if (map1->tile_available (TILE_SOUTH, false) == map2)
+ {
*dx = 0;
*dy = map1->height;
}
- else if (map1->tile_map[3] == map2)
- { /* left */
+ else if (map1->tile_available (TILE_WEST , false) == map2)
+ {
*dx = -map2->width;
*dy = 0;
}
- else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
+ else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
{ /* up right */
- *dx = map1->tile_map[0]->width;
- *dy = -map1->tile_map[0]->height;
+ *dx = +map1->tile_map[TILE_NORTH]->width;
+ *dy = -map1->tile_map[TILE_NORTH]->height;
}
- else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
+ else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
{ /* up left */
*dx = -map2->width;
- *dy = -map1->tile_map[0]->height;
+ *dy = -map1->tile_map[TILE_NORTH]->height;
}
- else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
+ else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
{ /* right up */
- *dx = map1->width;
+ *dx = +map1->width;
*dy = -map2->height;
}
- else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
+ else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
{ /* right down */
- *dx = map1->width;
- *dy = map1->tile_map[1]->height;
+ *dx = +map1->width;
+ *dy = +map1->tile_map[TILE_EAST]->height;
}
- else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
+ else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
{ /* down right */
- *dx = map1->tile_map[2]->width;
- *dy = map1->height;
+ *dx = +map1->tile_map[TILE_SOUTH]->width;
+ *dy = +map1->height;
}
- else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
+ else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
{ /* down left */
*dx = -map2->width;
- *dy = map1->height;
+ *dy = +map1->height;
}
- else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
+ else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
{ /* left up */
- *dx = -map1->tile_map[3]->width;
+ *dx = -map1->tile_map[TILE_WEST]->width;
*dy = -map2->height;
}
- else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
+ else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
{ /* left down */
- *dx = -map1->tile_map[3]->width;
- *dy = map1->tile_map[3]->height;
+ *dx = -map1->tile_map[TILE_WEST]->width;
+ *dy = +map1->tile_map[TILE_WEST]->height;
}
else
return 0;
@@ -1462,29 +1449,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
@@ -1494,12 +1480,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;
}
}
@@ -1510,9 +1496,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);
}
}
@@ -1527,25 +1513,25 @@
* field of the rv_vector is set to NULL.
*/
void
-get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
+get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
{
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 = NULL;
- retval->distance = idistance (retval->distance_x, 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);
}
}
@@ -1565,12 +1551,11 @@
return adjacent_map (op1->map, op2->map, &dx, &dy);
}
+//-GPL
+
object *
maptile::insert (object *op, int x, int y, object *originator, int flags)
{
- if (!op->flag [FLAG_REMOVED])
- op->remove ();
-
return insert_ob_in_map_at (op, this, originator, flags, x, y);
}
@@ -1589,12 +1574,12 @@
return ::region::default_region ();
}
+//+GPL
+
/* picks a random object from a style map.
- * Redone by MSW so it should be faster and not use static
- * variables to generate tables.
*/
object *
-maptile::pick_random_object () const
+maptile::pick_random_object (rand_gen &gen) const
{
/* while returning a null object will result in a crash, that
* is actually preferable to an infinite loop. That is because
@@ -1604,34 +1589,130 @@
*/
for (int i = 1000; --i;)
{
- object *pick = at (rndm (width), rndm (height)).bot;
+ object *pick = at (gen (width), gen (height)).bot;
- // do not prefer big monsters just because they are big.
- if (pick && pick->head_ () == pick)
- return pick->head_ ();
+ // must be head: do not prefer big monsters just because they are big.
+ if (pick && pick->is_head ())
+ return pick;
}
// instead of crashing in the unlikely(?) case, try to return *something*
- return get_archetype ("blocked");
+ return archetype::find (shstr_bug);
}
+//-GPL
+
void
maptile::play_sound (faceidx sound, int x, int y) const
{
if (!sound)
return;
+ for_all_players_on_map (pl, this)
+ if (client *ns = pl->ns)
+ {
+ int dx = x - pl->ob->x;
+ int dy = y - pl->ob->y;
+
+ int distance = idistance (dx, dy);
+
+ if (distance <= MAX_SOUND_DISTANCE)
+ ns->play_sound (sound, dx, dy);
+ }
+}
+
+void
+maptile::say_msg (const char *msg, int x, int y) const
+{
for_all_players (pl)
- if (pl->ob->map == this)
- if (client *ns = pl->ns)
- {
- int dx = x - pl->ob->x;
- int dy = y - pl->ob->y;
+ if (client *ns = pl->ns)
+ {
+ int dx = x - pl->ob->x;
+ int dy = y - pl->ob->y;
- int distance = idistance (dx, dy);
+ int distance = idistance (dx, dy);
- if (distance <= MAX_SOUND_DISTANCE)
- ns->play_sound (sound, dx, dy);
- }
+ if (distance <= MAX_SOUND_DISTANCE)
+ ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
+ }
+}
+
+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)
+{
+ // clip to map to the left
+ if (x0 < 0)
+ {
+ if (maptile *tile = m->tile_available (TILE_WEST, 1))
+ split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
+
+ if (x1 < 0) // entirely to the left
+ return;
+
+ x0 = 0;
+ }
+
+ // clip to map to the right
+ if (x1 > m->width)
+ {
+ if (maptile *tile = m->tile_available (TILE_EAST, 1))
+ split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
+
+ if (x0 > m->width) // entirely to the right
+ return;
+
+ x1 = m->width;
+ }
+
+ // clip to map above
+ if (y0 < 0)
+ {
+ if (maptile *tile = m->tile_available (TILE_NORTH, 1))
+ split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
+
+ if (y1 < 0) // entirely above
+ return;
+
+ y0 = 0;
+ }
+
+ // clip to map below
+ if (y1 > m->height)
+ {
+ if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
+ split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
+
+ if (y0 > m->height) // entirely below
+ return;
+
+ y1 = m->height;
+ }
+
+ // if we get here, the rect is within the current map
+ maprect *r = (maprect *)buf.alloc (sizeof (maprect));
+
+ r->m = m;
+ r->x0 = x0;
+ r->y0 = y0;
+ r->x1 = x1;
+ r->y1 = y1;
+ r->dx = dx;
+ r->dy = dy;
+}
+
+maprect *
+maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
+{
+ buf.clear ();
+
+ ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
+
+ // add end marker
+ maprect *r = (maprect *)buf.alloc (sizeof (maprect));
+ r->m = 0;
+
+ return (maprect *)buf.linearise ();
}