--- deliantra/server/common/map.C 2007/08/24 00:53:54 1.119
+++ deliantra/server/common/map.C 2007/11/08 19:43:23 1.132
@@ -1,11 +1,11 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * 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
*
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * 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.
@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
#include
@@ -168,11 +168,11 @@
}
/*
- * Returns true if the given object can't fit in the given spot.
- * This is meant for multi space objects - for single space objecs,
+ * Returns qthe 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 object and makes sure they can be inserted.
+ * of object. This function goes through all the parts of the multipart
+ * object and makes sure they can be inserted.
*
* While this doesn't call out of map, the get_map_flags does.
*
@@ -193,48 +193,33 @@
* code, we need to have actual object to check its move_type
* against the move_block values.
*/
-int
-ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
+bool
+object::blocked (maptile *m, int x, int y) const
{
- archetype *tmp;
- int flag;
- maptile *m1;
- sint16 sx, sy;
-
- if (!ob)
+ for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
{
- flag = get_map_flags (m, &m1, x, y, &sx, &sy);
- if (flag & P_OUT_OF_MAP)
- return P_OUT_OF_MAP;
+ mapxy pos (m, x + tmp->x, y + tmp->y);
- /* don't have object, so don't know what types would block */
- return m1->at (sx, sy).move_block;
- }
-
- for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
- {
- flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
+ if (!pos.normalise ())
+ return 1;
- if (flag & P_OUT_OF_MAP)
- return P_OUT_OF_MAP;
- if (flag & P_IS_ALIVE)
- return P_IS_ALIVE;
+ mapspace &ms = *pos;
- mapspace &ms = m1->at (sx, sy);
+ if (ms.flags () & P_IS_ALIVE)
+ return 1;
- /* find_first_free_spot() calls this function. However, often
- * ob doesn't have any move type (when used to place exits)
+ /* However, often ob doesn't have any move type
+ * (signifying non-moving objects)
* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
*/
-
- if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
+ if (!move_type && ms.move_block != MOVE_ALL)
continue;
/* Note it is intentional that we check ob - the movement type of the
* head of the object should correspond for the entire object.
*/
- if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
- return P_NO_PASS;
+ if (ms.blocks (move_type))
+ return 1;
}
return 0;
@@ -334,7 +319,32 @@
if (op->inv)
sum_weight (op);
- insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
+ 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
+ mapspace &ms = at (op->x, op->y);
+
+ op->flag [FLAG_REMOVED] = false;
+
+ op->above = 0;
+ op->below = ms.top;
+
+ if (ms.top)
+ ms.top->above = op;
+ else
+ ms.bot = op;
+
+ ms.top = op;
+ ms.flags_ = 0;
+ }
+ else
+ {
+ f.parse_warn (format ("object %s out of range", op->debug_desc ()));
+ op->destroy ();
+ }
}
continue;
@@ -385,21 +395,21 @@
for (int i = 0; i < size (); ++i)
{
- int unique = 0;
+ bool unique = 0;
+
for (object *op = spaces [i].bot; op; op = op->above)
{
- if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
- unique = 1;
+ unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
- if (!op->can_map_save ())
+ if (expect_false (!op->can_map_save ()))
continue;
- if (unique || op->flag [FLAG_UNIQUE])
+ if (expect_false (unique || op->flag [FLAG_UNIQUE]))
{
if (flags & IO_UNIQUES)
op->write (f);
}
- else if (flags & IO_OBJECTS)
+ else if (expect_true (flags & IO_OBJECTS))
op->write (f);
}
}
@@ -410,28 +420,6 @@
}
bool
-maptile::_load_objects (const char *path, bool skip_header)
-{
- object_thawer f (path);
-
- if (!f)
- return false;
-
- f.next ();
-
- if (skip_header)
- for (;;)
- {
- keyword kw = f.kw;
- f.skip ();
- if (kw == KW_end)
- break;
- }
-
- return _load_objects (f);
-}
-
-bool
maptile::_save_objects (const char *path, int flags)
{
object_freezer freezer;
@@ -613,8 +601,6 @@
{
for (;;)
{
- thawer.next ();
-
switch (thawer.kw)
{
case KW_msg:
@@ -679,10 +665,11 @@
case KW_tile_path_4: thawer.get (tile_path [3]); break;
case KW_ERROR:
- set_key (thawer.kw_str, thawer.value);
+ set_key_text (thawer.kw_str, thawer.value);
break;
case KW_end:
+ thawer.next ();
return true;
default:
@@ -690,22 +677,13 @@
return false;
break;
}
+
+ thawer.next ();
}
abort ();
}
-bool
-maptile::_load_header (const char *path)
-{
- object_thawer thawer (path);
-
- if (!thawer)
- return false;
-
- return _load_header (thawer);
-}
-
/******************************************************************************
* This is the start of unique map handling code
*****************************************************************************/
@@ -812,17 +790,28 @@
void
maptile::clear ()
{
- sfree (regions, size ()); regions = 0;
- delete [] regionmap; regionmap = 0;
-
if (spaces)
{
for (mapspace *ms = spaces + size (); ms-- > spaces; )
while (object *op = ms->bot)
{
- op = op->head_ ();
- op->destroy_inv (false);
- op->destroy ();
+ // manually remove, as to not trigger anything
+ if (ms->bot = op->above)
+ ms->bot->below = 0;
+
+ op->flag [FLAG_REMOVED] = true;
+
+ object *head = op->head_ ();
+ if (op == head)
+ {
+ op->destroy_inv (false);
+ op->destroy ();
+ }
+ else if (head->map != op->map)
+ {
+ LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
+ head->destroy ();
+ }
}
sfree (spaces, size ()), spaces = 0;
@@ -830,6 +819,9 @@
if (buttons)
free_objectlinkpt (buttons), buttons = 0;
+
+ sfree (regions, size ()); regions = 0;
+ delete [] regionmap; regionmap = 0;
}
void
@@ -891,7 +883,6 @@
if (QUERY_FLAG (op, FLAG_IS_FLOOR)
|| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
- || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
|| QUERY_FLAG (op, FLAG_UNIQUE)
|| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
|| QUERY_FLAG (op, FLAG_UNPAID)
@@ -1360,7 +1351,7 @@
if (!map1 || !map2)
return 0;
- //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
+ //TODO: this doesn't actually check correctly when intermediate maps are not loaded
//fix: compare paths instead (this is likely faster, too!)
if (map1 == map2)
{