--- deliantra/server/common/object.C 2007/08/15 04:57:48 1.179
+++ deliantra/server/common/object.C 2008/12/27 04:09:58 1.272
@@ -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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2001,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,63 +18,60 @@
* 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
*/
-/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
- sub/add_weight will transcend the environment updating the carrying
- variable. */
#include
#include
#include
#include
#include
-#include
#include
#include
#include
-int nrofallocobjects = 0;
-static UUID uuid;
-const uint64 UUID_SKIP = 1<<19;
+UUID UUID::cur;
+static uint64_t seq_next_save;
+static const uint64 UUID_GAP = 1<<19;
+uint32_t mapspace::smellcount = 10000;
objectvec objects;
activevec actives;
-short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
- 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
+short freearr_x[SIZEOFFREE] = {
+ 0,
+ 0, 1, 1, 1, 0, -1, -1, -1,
+ 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
+ 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
};
-short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
- -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
+short freearr_y[SIZEOFFREE] = {
+ 0,
+ -1, -1, 0, 1, 1, 1, 0, -1,
+ -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
+ -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
};
-int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,
- 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
+int maxfree[SIZEOFFREE] = {
+ 0,
+ 9, 10, 13, 14, 17, 18, 21, 22,
+ 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
};
int freedir[SIZEOFFREE] = {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
- 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
+ 0,
+ 1, 2, 3, 4, 5, 6, 7, 8,
+ 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
+ 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
};
static void
-write_uuid (void)
+write_uuid (uval64 skip, bool sync)
{
- char filename1[MAX_BUF], filename2[MAX_BUF];
-
- sprintf (filename1, "%s/uuid", settings.localdir);
- sprintf (filename2, "%s/uuid~", settings.localdir);
-
- FILE *fp;
-
- if (!(fp = fopen (filename2, "w")))
- {
- LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
- return;
- }
-
- fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
- fclose (fp);
- rename (filename2, filename1);
+ CALL_BEGIN (2);
+ CALL_ARG_SV (newSVval64 (skip));
+ CALL_ARG_SV (boolSV (sync));
+ CALL_CALL ("cf::write_uuid", G_DISCARD);
+ CALL_END;
}
static void
@@ -84,6 +81,8 @@
sprintf (filename, "%s/uuid", settings.localdir);
+ seq_next_save = 0;
+
FILE *fp;
if (!(fp = fopen (filename, "r")))
@@ -91,8 +90,8 @@
if (errno == ENOENT)
{
LOG (llevInfo, "RESET uid to 1\n");
- uuid.seq = 0;
- write_uuid ();
+ UUID::cur.seq = 0;
+ write_uuid (UUID_GAP, true);
return;
}
@@ -100,86 +99,72 @@
_exit (1);
}
- int version;
- unsigned long long uid;
- if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
+ UUID::BUF buf;
+ buf[0] = 0;
+ fgets (buf, sizeof (buf), fp);
+
+ if (!UUID::cur.parse (buf))
{
- LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
+ LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
_exit (1);
}
- uuid.seq = uid;
- write_uuid ();
- LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
+ LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
+
+ write_uuid (UUID_GAP, true);
fclose (fp);
}
UUID
-gen_uuid ()
+UUID::gen ()
{
UUID uid;
- uid.seq = ++uuid.seq;
+ uid.seq = ++cur.seq;
+
+ if (expect_false (cur.seq >= seq_next_save))
+ {
+ seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
+ write_uuid (UUID_GAP, false);
+ }
- if (!(uuid.seq & (UUID_SKIP - 1)))
- write_uuid ();
return uid;
}
void
-init_uuid ()
+UUID::init ()
{
read_uuid ();
}
/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
-static int
+static bool
compare_ob_value_lists_one (const object *wants, const object *has)
{
- key_value *wants_field;
-
- /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
+ /* n-squared behaviour (see kv_get), but I'm hoping both
* objects with lists are rare, and lists stay short. If not, use a
* different structure or at least keep the lists sorted...
*/
/* For each field in wants, */
- for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
- {
- key_value *has_field;
-
- /* Look for a field in has with the same key. */
- has_field = get_ob_key_link (has, wants_field->key);
-
- if (has_field == NULL)
- {
- /* No field with that name. */
- return FALSE;
- }
-
- /* Found the matching field. */
- if (has_field->value != wants_field->value)
- {
- /* Values don't match, so this half of the comparison is false. */
- return FALSE;
- }
-
- /* If we get here, we found a match. Now for the next field in wants. */
- }
+ for (key_value *kv = wants->key_values; kv; kv = kv->next)
+ if (has->kv_get (kv->key) != kv->value)
+ return false;
/* If we get here, every field in wants has a matching field in has. */
- return TRUE;
+ return true;
}
/* Returns TRUE if ob1 has the same key_values as ob2. */
-static int
+static bool
compare_ob_value_lists (const object *ob1, const object *ob2)
{
/* However, there may be fields in has which aren't partnered in wants,
* so we need to run the comparison *twice*. :(
*/
- return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);
+ return compare_ob_value_lists_one (ob1, ob2)
+ && compare_ob_value_lists_one (ob2, ob1);
}
/* Function examines the 2 objects given to it, and returns true if
@@ -204,16 +189,13 @@
|| ob1->name != ob2->name)
return 0;
- //TODO: this ain't working well, use nicer and correct overflow check
- /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
- * value could not be stored in a sint32 (which unfortunately sometimes is
- * used to store nrof).
- */
- if (ob1->nrof + ob2->nrof >= 1UL << 31)
+ /* Do not merge objects if nrof would overflow, assume nrof
+ * is always 0 .. 2**31-1 */
+ if (ob1->nrof > 0x7fffffff - ob2->nrof)
return 0;
/* If the objects have been identified, set the BEEN_APPLIED flag.
- * This is to the comparison of the flags below will be OK. We
+ * This is to the comparison of the flags below will be OK. We
* just can't ignore the been applied or identified flags, as they
* are not equal - just if it has been identified, the been_applied
* flags lose any meaning.
@@ -224,20 +206,18 @@
if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
SET_FLAG (ob2, FLAG_BEEN_APPLIED);
- if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
- || ob1->arch != ob2->arch
+ if (ob1->arch->archname != ob2->arch->archname
|| ob1->name != ob2->name
|| ob1->title != ob2->title
|| ob1->msg != ob2->msg
|| ob1->weight != ob2->weight
- || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
- || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
|| ob1->attacktype != ob2->attacktype
|| ob1->magic != ob2->magic
|| ob1->slaying != ob2->slaying
|| ob1->skill != ob2->skill
|| ob1->value != ob2->value
|| ob1->animation_id != ob2->animation_id
+ || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
|| ob1->client_type != ob2->client_type
|| ob1->materialname != ob2->materialname
|| ob1->lore != ob2->lore
@@ -248,21 +228,31 @@
|| ob1->move_on != ob2->move_on
|| ob1->move_off != ob2->move_off
|| ob1->move_slow != ob2->move_slow
- || ob1->move_slow_penalty != ob2->move_slow_penalty)
+ || ob1->move_slow_penalty != ob2->move_slow_penalty
+ || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
+ || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
return 0;
- /* This is really a spellbook check - really, we should
- * check all objects in the inventory.
+ if ((ob1->flag ^ ob2->flag)
+ .reset (FLAG_INV_LOCKED)
+ .reset (FLAG_REMOVED)
+ .any ())
+ return 0;
+
+ /* This is really a spellbook check - we should in general
+ * not merge objects with real inventories, as splitting them
+ * is hard.
*/
if (ob1->inv || ob2->inv)
{
- /* if one object has inventory but the other doesn't, not equiv */
- if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
- return 0;
+ if (!(ob1->inv && ob2->inv))
+ return 0; /* inventories differ in length */
+
+ if (ob1->inv->below || ob2->inv->below)
+ return 0; /* more than one object in inv */
- /* Now check to see if the two inventory objects could merge */
if (!object::can_merge (ob1->inv, ob2->inv))
- return 0;
+ return 0; /* inventory objects differ */
/* inventory ok - still need to check rest of this object to see
* if it is valid.
@@ -291,13 +281,13 @@
break;
}
- if (ob1->key_values != NULL || ob2->key_values != NULL)
+ if (ob1->key_values || ob2->key_values)
{
/* At least one of these has key_values. */
- if ((ob1->key_values == NULL) != (ob2->key_values == NULL))
- /* One has fields, but the other one doesn't. */
- return 0;
- else if (!compare_ob_value_lists (ob1, ob2))
+ if ((!ob1->key_values) != (!ob2->key_values))
+ return 0; /* One has fields, but the other one doesn't. */
+
+ if (!compare_ob_value_lists (ob1, ob2))
return 0;
}
@@ -307,58 +297,130 @@
ob2->optimise ();
if (ob1->self || ob2->self)
- if (!cfperl_can_merge (ob1, ob2))
- return 0;
+ {
+ int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
+ int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
+
+ if (k1 != k2)
+ return 0;
+
+ if (k1 == 0)
+ return 1;
+
+ if (!cfperl_can_merge (ob1, ob2))
+ return 0;
+ }
}
/* Everything passes, must be OK. */
return 1;
}
+// find player who can see this object
+object *
+object::visible_to () const
+{
+ if (client_visible () && !flag [FLAG_REMOVED])
+ {
+ // see if we are in a container of sorts
+ if (env)
+ {
+ // the player inventory itself is always visible
+ if (env->is_player ())
+ return env;
+
+ // else a player could have our env open
+ object *envest = env->outer_env ();
+
+ // the player itself is always on a map, so we will find him here
+ // even if our inv is in a player.
+ if (envest->is_on_map ())
+ if (object *pl = envest->ms ().player ())
+ if (pl->container == env)
+ return pl;
+ }
+ else
+ {
+ // maybe there is a player standing on the same mapspace
+ // this will catch the case where "this" is a player
+ if (object *pl = ms ().player ())
+ if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
+ || this == pl->container)
+ return pl;
+ }
+ }
+
+ return 0;
+}
+
+// adjust weight per container type ("of holding")
+static sint32
+weight_adjust_for (object *op, sint32 weight)
+{
+ return op->type == CONTAINER
+ ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
+ : weight;
+}
+
/*
- * sum_weight() is a recursive function which calculates the weight
- * an object is carrying. It goes through in figures out how much
- * containers are carrying, and sums it up.
+ * adjust_weight(object, weight) adds the specified weight to an object,
+ * and also updates how much the environment(s) is/are carrying.
*/
-long
-sum_weight (object *op)
+static void
+adjust_weight (object *op, sint32 weight)
{
- long sum;
- object *inv;
-
- for (sum = 0, inv = op->inv; inv; inv = inv->below)
+ while (op)
{
- if (inv->inv)
- sum_weight (inv);
+ // adjust by actual difference to account for rounding errors
+ // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
+ weight = weight_adjust_for (op, op->carrying)
+ - weight_adjust_for (op, op->carrying - weight);
- sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
- }
+ if (!weight)
+ return;
- if (op->type == CONTAINER && op->stats.Str)
- sum = (sum * (100 - op->stats.Str)) / 100;
+ op->carrying += weight;
- if (op->carrying != sum)
- op->carrying = sum;
+ if (object *pl = op->visible_to ())
+ if (pl != op) // player is handled lazily
+ esrv_update_item (UPD_WEIGHT, pl, op);
- return sum;
+ op = op->env;
+ }
}
-/**
- * Return the outermost environment object for a given object.
+/*
+ * this is a recursive function which calculates the weight
+ * an object is carrying. It goes through op and figures out how much
+ * containers are carrying, and sums it up.
*/
-
-object *
-object_get_env_recursive (object *op)
+void
+object::update_weight ()
{
- while (op->env != NULL)
- op = op->env;
- return op;
+ sint32 sum = 0;
+
+ for (object *op = inv; op; op = op->below)
+ {
+ if (op->inv)
+ op->update_weight ();
+
+ sum += op->total_weight ();
+ }
+
+ sum = weight_adjust_for (this, sum);
+
+ if (sum != carrying)
+ {
+ carrying = sum;
+
+ if (object *pl = visible_to ())
+ if (pl != this) // player is handled lazily
+ esrv_update_item (UPD_WEIGHT, pl, this);
+ }
}
/*
- * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
- * Some error messages.
- * The result of the dump is stored in the static global errmsg array.
+ * Used by: Server DM commands: dumpbelow, dump. Some error messages.
*/
char *
dump_object (object *op)
@@ -376,23 +438,27 @@
* multi-object 1 which is closest to the second object.
* If it's not a multi-object, it is returned.
*/
-
object *
get_nearest_part (object *op, const object *pl)
{
object *tmp, *closest;
int last_dist, i;
- if (op->more == NULL)
+ if (!op->more)
return op;
- for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
+
+ for (last_dist = distance (op, pl), closest = op, tmp = op->more;
+ tmp;
+ tmp = tmp->more)
if ((i = distance (tmp, pl)) < last_dist)
closest = tmp, last_dist = i;
+
return closest;
}
/*
* Returns the object which has the count-variable equal to the argument.
+ * VERRRY slow.
*/
object *
find_object (tag_t i)
@@ -413,40 +479,33 @@
find_object_name (const char *str)
{
shstr_cmp str_ (str);
- object *op;
-
- for_all_objects (op)
- if (op->name == str_)
- break;
- return op;
-}
+ if (str_)
+ for_all_objects (op)
+ if (op->name == str_)
+ return op;
-void
-free_all_object_data ()
-{
- LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
+ return 0;
}
/*
* Sets the owner and sets the skill and exp pointers to owner's current
* skill and experience objects.
+ * ACTUALLY NO! investigate! TODO
*/
void
object::set_owner (object *owner)
{
- if (!owner)
- return;
+ // allow objects which own objects
+ if (owner)
+ while (owner->owner)
+ owner = owner->owner;
- /* next line added to allow objects which own objects */
- /* Add a check for ownercounts in here, as I got into an endless loop
- * with the fireball owning a poison cloud which then owned the
- * fireball. I believe that was caused by one of the objects getting
- * freed and then another object replacing it. Since the ownercounts
- * didn't match, this check is valid and I believe that cause is valid.
- */
- while (owner->owner)
- owner = owner->owner;
+ if (flag [FLAG_FREED])
+ {
+ LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
+ return;
+ }
this->owner = owner;
}
@@ -534,35 +593,39 @@
op->key_values = 0;
}
-object &
-object::operator =(const object &src)
+/*
+ * copy_to first frees everything allocated by the dst object,
+ * and then copies the contents of itself into the second
+ * object, allocating what needs to be allocated. Basically, any
+ * data that is malloc'd needs to be re-malloc/copied. Otherwise,
+ * if the first object is freed, the pointers in the new object
+ * will point at garbage.
+ */
+void
+object::copy_to (object *dst)
{
- bool is_freed = flag [FLAG_FREED];
- bool is_removed = flag [FLAG_REMOVED];
-
- *(object_copy *)this = src;
-
- flag [FLAG_FREED] = is_freed;
- flag [FLAG_REMOVED] = is_removed;
+ dst->remove ();
+ *(object_copy *)dst = *this;
+ dst->flag [FLAG_REMOVED] = true;
/* Copy over key_values, if any. */
- if (src.key_values)
+ if (key_values)
{
key_value *tail = 0;
- key_values = 0;
+ dst->key_values = 0;
- for (key_value *i = src.key_values; i; i = i->next)
+ for (key_value *i = key_values; i; i = i->next)
{
key_value *new_link = new key_value;
- new_link->next = 0;
- new_link->key = i->key;
+ new_link->next = 0;
+ new_link->key = i->key;
new_link->value = i->value;
/* Try and be clever here, too. */
- if (!key_values)
+ if (!dst->key_values)
{
- key_values = new_link;
+ dst->key_values = new_link;
tail = new_link;
}
else
@@ -572,32 +635,18 @@
}
}
}
-}
-
-/*
- * copy_to first frees everything allocated by the dst object,
- * and then copies the contents of itself into the second
- * object, allocating what needs to be allocated. Basically, any
- * data that is malloc'd needs to be re-malloc/copied. Otherwise,
- * if the first object is freed, the pointers in the new object
- * will point at garbage.
- */
-void
-object::copy_to (object *dst)
-{
- *dst = *this;
if (speed < 0)
- dst->speed_left = speed_left - rndm ();
+ dst->speed_left -= rndm ();
- dst->set_speed (dst->speed);
+ dst->activate ();
}
void
object::instantiate ()
{
if (!uuid.seq) // HACK
- uuid = gen_uuid ();
+ uuid = UUID::gen ();
speed_left = -0.1f;
/* copy the body_info to the body_used - this is only really
@@ -617,6 +666,7 @@
{
object *neu = create ();
copy_to (neu);
+ neu->map = map; // not copied by copy_to
return neu;
}
@@ -677,14 +727,14 @@
void
update_object (object *op, int action)
{
- if (op == NULL)
+ if (!op)
{
/* this should never happen */
- LOG (llevDebug, "update_object() called for NULL object.\n");
+ LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
return;
}
- if (op->env)
+ if (!op->is_on_map ())
{
/* Animation is currently handled by client, so nothing
* to do in this case.
@@ -692,12 +742,6 @@
return;
}
- /* If the map is saving, don't do anything as everything is
- * going to get freed anyways.
- */
- if (!op->map || op->map->in_memory == MAP_SAVING)
- return;
-
/* make sure the object is within map boundaries */
if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
{
@@ -717,7 +761,7 @@
// this is likely overkill, TODO: revisit (schmorp)
if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
- || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
+ || (op->is_player () && !(m.flags_ & P_PLAYER))
|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
@@ -725,18 +769,18 @@
|| (m.move_off | op->move_off ) != m.move_off
|| (m.move_slow | op->move_slow) != m.move_slow
/* This isn't perfect, but I don't expect a lot of objects to
- * to have move_allow right now.
+ * have move_allow right now.
*/
|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
- m.flags_ = 0;
+ m.invalidate ();
}
/* if the object is being removed, we can't make intelligent
* decisions, because remove_ob can't really pass the object
* that is being removed.
*/
else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
- m.flags_ = 0;
+ m.invalidate ();
else if (action == UP_OBJ_FACE)
/* Nothing to do for that case */ ;
else
@@ -766,7 +810,7 @@
void object::link ()
{
assert (!index);//D
- uuid = gen_uuid ();
+ uuid = UUID::gen ();
count = ++object_count;
refcnt_inc ();
@@ -789,6 +833,9 @@
if (active)
return;
+ if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
+ if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
+
if (has_active_speed ())
actives.insert (this);
}
@@ -849,7 +896,7 @@
// need to check first, because the checks below might segfault
// as we might be on an invalid mapspace and crossfire code
// is too buggy to ensure that the inventory is empty.
- // corollary: if you create arrows etc. with stuff in tis inventory,
+ // corollary: if you create arrows etc. with stuff in its inventory,
// cf will crash below with off-map x and y
if (!inv)
return;
@@ -860,15 +907,12 @@
*/
if (!drop_to_ground
|| !map
- || map->in_memory != MAP_IN_MEMORY
- || map->nodrop
+ || map->in_memory != MAP_ACTIVE
+ || map->no_drop
|| ms ().move_block == MOVE_ALL)
{
while (inv)
- {
- inv->destroy_inv (drop_to_ground);
- inv->destroy ();
- }
+ inv->destroy ();
}
else
{ /* Put objects in inventory onto this space */
@@ -896,21 +940,39 @@
return op;
}
+static struct freed_map : maptile
+{
+ freed_map ()
+ {
+ path = "";
+ name = "/internal/freed_objects_map";
+ width = 3;
+ height = 3;
+ no_drop = 1;
+ no_reset = 1;
+
+ alloc ();
+ in_memory = MAP_ACTIVE;
+ }
+
+ ~freed_map ()
+ {
+ destroy ();
+ }
+} freed_map; // freed objects are moved here to avoid crashes
+
void
object::do_destroy ()
{
- attachable::do_destroy ();
-
if (flag [FLAG_IS_LINKED])
remove_button_link (this);
if (flag [FLAG_FRIENDLY])
remove_friendly_object (this);
- if (!flag [FLAG_REMOVED])
- remove ();
+ remove ();
- destroy_inv (true);
+ attachable::do_destroy ();
deactivate ();
unlink ();
@@ -918,25 +980,9 @@
flag [FLAG_FREED] = 1;
// hack to ensure that freed objects still have a valid map
- {
- static maptile *freed_map; // freed objects are moved here to avoid crashes
-
- if (!freed_map)
- {
- freed_map = new maptile;
-
- freed_map->name = "/internal/freed_objects_map";
- freed_map->width = 3;
- freed_map->height = 3;
-
- freed_map->alloc ();
- freed_map->in_memory = MAP_IN_MEMORY;
- }
-
- map = freed_map;
- x = 1;
- y = 1;
- }
+ map = &freed_map;
+ x = 1;
+ y = 1;
if (more)
{
@@ -954,13 +1000,19 @@
}
void
-object::destroy (bool destroy_inventory)
+object::destroy ()
{
if (destroyed ())
return;
- if (destroy_inventory)
- destroy_inv (false);
+ if (!is_head () && !head->destroyed ())
+ {
+ LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
+ head->destroy ();
+ return;
+ }
+
+ destroy_inv (false);
if (is_head ())
if (sound_destroy)
@@ -971,23 +1023,6 @@
attachable::destroy ();
}
-/*
- * sub_weight() recursively (outwards) subtracts a number from the
- * weight of an object (and what is carried by it's environment(s)).
- */
-void
-sub_weight (object *op, signed long weight)
-{
- while (op != NULL)
- {
- if (op->type == CONTAINER)
- weight = (signed long) (weight * (100 - op->stats.Str) / 100);
-
- op->carrying -= weight;
- op = op->env;
- }
-}
-
/* op->remove ():
* This function removes the object op from the linked list of objects
* which it is currently tied to. When this function is done, the
@@ -1001,12 +1036,13 @@
object *tmp, *last = 0;
object *otmp;
- if (QUERY_FLAG (this, FLAG_REMOVED))
+ if (flag [FLAG_REMOVED])
return;
- SET_FLAG (this, FLAG_REMOVED);
INVOKE_OBJECT (REMOVE, this);
+ flag [FLAG_REMOVED] = true;
+
if (more)
more->remove ();
@@ -1016,76 +1052,83 @@
*/
if (env)
{
- if (nrof)
- sub_weight (env, weight * nrof);
- else
- sub_weight (env, weight + carrying);
+ flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
+ if (object *pl = visible_to ())
+ esrv_del_item (pl->contr, count);
+ flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
- /* NO_FIX_PLAYER is set when a great many changes are being
- * made to players inventory. If set, avoiding the call
- * to save cpu time.
- */
- if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
- otmp->update_stats ();
+ adjust_weight (env, -total_weight ());
- if (above)
- above->below = below;
- else
- env->inv = below;
-
- if (below)
- below->above = above;
+ object *pl = in_player ();
/* we set up values so that it could be inserted into
* the map, but we don't actually do that - it is up
* to the caller to decide what we want to do.
*/
- x = env->x, y = env->y;
- map = env->map;
- above = 0, below = 0;
- env = 0;
+ map = env->map;
+ x = env->x;
+ y = env->y;
+
+ // make sure cmov optimisation is applicable
+ *(above ? &above->below : &env->inv) = below;
+ *(below ? &below->above : &above ) = above; // &above is just a dummy
+
+ above = 0;
+ below = 0;
+ env = 0;
+
+ /* NO_FIX_PLAYER is set when a great many changes are being
+ * made to players inventory. If set, avoiding the call
+ * to save cpu time.
+ */
+ if (pl)
+ if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
+ {
+ pl->update_stats ();
+
+ if (glow_radius && pl->is_on_map ())
+ update_all_los (pl->map, pl->x, pl->y);
+ }
}
else if (map)
{
- if (type == PLAYER)
- {
- // leaving a spot always closes any open container on the ground
- if (container && !container->env)
- // this causes spurious floorbox updates, but it ensures
- // that the CLOSE event is being sent.
- close_container ();
-
- --map->players;
- map->touch ();
- }
-
map->dirty = true;
mapspace &ms = this->ms ();
- /* link the object above us */
- if (above)
- above->below = below;
- else
- ms.top = below; /* we were top, set new top */
-
- /* Relink the object below us, if there is one */
- if (below)
- below->above = above;
- else
+ if (object *pl = ms.player ())
{
- /* Nothing below, which means we need to relink map object for this space
- * use translated coordinates in case some oddness with map tiling is
- * evident
- */
- if (GET_MAP_OB (map, x, y) != this)
- LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
+ if (is_player ())
+ {
+ ms.smell = ++mapspace::smellcount; // remember the smell of the player
+
+ // leaving a spot always closes any open container on the ground
+ if (container && !container->env)
+ // this causes spurious floorbox updates, but it ensures
+ // that the CLOSE event is being sent.
+ close_container ();
- ms.bot = above; /* goes on above it. */
+ --map->players;
+ map->touch ();
+ }
+ else if (pl->container == this)
+ {
+ // removing a container should close it
+ close_container ();
+ }
+
+ esrv_del_item (pl->contr, count);
}
+ /* link the object above us */
+ // re-link, make sure compiler can easily use cmove
+ *(above ? &above->below : &ms.top) = below;
+ *(below ? &below->above : &ms.bot) = above;
+
above = 0;
below = 0;
+ ms.invalidate ();
+
if (map->in_memory == MAP_SAVING)
return;
@@ -1100,7 +1143,11 @@
*/
pl->close_container ();
- pl->contr->ns->floorbox_update ();
+ //TODO: the floorbox prev/next might need updating
+ //esrv_del_item (pl->contr, count);
+ //TODO: update floorbox to preserve ordering
+ if (pl->contr->ns)
+ pl->contr->ns->floorbox_update ();
}
for (tmp = ms.bot; tmp; tmp = tmp->above)
@@ -1123,14 +1170,7 @@
last = tmp;
}
- /* last == NULL if there are no objects on this space */
- //TODO: this makes little sense, why only update the topmost object?
- if (!last)
- map->at (x, y).flags_ = 0;
- else
- update_object (last, UP_OBJ_REMOVE);
-
- if (flag [FLAG_BLOCKSVIEW] || glow_radius)
+ if (affects_los ())
update_all_los (map, x, y);
}
}
@@ -1149,25 +1189,25 @@
if (!op->nrof)
return 0;
- if (top)
+ if (!top)
for (top = op; top && top->above; top = top->above)
;
for (; top; top = top->below)
- {
- if (top == op)
- continue;
+ if (object::can_merge (op, top))
+ {
+ top->nrof += op->nrof;
- if (object::can_merge (op, top))
- {
- top->nrof += op->nrof;
+ if (object *pl = top->visible_to ())
+ esrv_update_item (UPD_NROF, pl, top);
-/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
- op->weight = 0; /* Don't want any adjustements now */
- op->destroy ();
- return top;
- }
- }
+ op->weight = 0; // cancel the addition above
+ op->carrying = 0; // must be 0 already
+
+ op->destroy ();
+
+ return top;
+ }
return 0;
}
@@ -1202,6 +1242,8 @@
object *
insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
{
+ op->remove ();
+
for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
{
tmp->x = x + tmp->arch->x;
@@ -1234,23 +1276,21 @@
object *
insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
{
- assert (!op->flag [FLAG_FREED]);
-
- object *top, *floor = NULL;
-
op->remove ();
- if (out_of_map (m, op->x, op->y))
+ if (m == &freed_map)//D TODO: remove soon
+ {//D
+ LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
+ }//D
+
+ /* Ideally, the caller figures this out. However, it complicates a lot
+ * of areas of callers (eg, anything that uses find_free_spot would now
+ * need extra work
+ */
+ if (!xy_normalise (m, op->x, op->y))
{
- LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
-#ifdef MANY_CORES
- /* Better to catch this here, as otherwise the next use of this object
- * is likely to cause a crash. Better to find out where it is getting
- * improperly inserted.
- */
- abort ();
-#endif
- return op;
+ op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
+ return 0;
}
if (object *more = op->more)
@@ -1259,13 +1299,6 @@
CLEAR_FLAG (op, FLAG_REMOVED);
- /* Ideally, the caller figures this out. However, it complicates a lot
- * of areas of callers (eg, anything that uses find_free_spot would now
- * need extra work
- */
- if (!xy_normalise (m, op->x, op->y))
- return 0;
-
op->map = m;
mapspace &ms = op->ms ();
@@ -1275,6 +1308,9 @@
for (object *tmp = ms.bot; tmp; tmp = tmp->above)
if (object::can_merge (op, tmp))
{
+ // TODO: we actually want to update tmp, not op,
+ // but some caller surely breaks when we return tmp
+ // from here :/
op->nrof += tmp->nrof;
tmp->destroy ();
}
@@ -1293,26 +1329,24 @@
abort ();
}
+ if (!originator->is_on_map ())
+ LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
+ op->debug_desc (), originator->debug_desc ());
+
op->above = originator;
op->below = originator->below;
-
- if (op->below)
- op->below->above = op;
- else
- ms.bot = op;
-
- /* since *below* originator, no need to update top */
originator->below = op;
+
+ *(op->below ? &op->below->above : &ms.bot) = op;
}
else
{
- top = ms.bot;
+ object *floor = 0;
+ object *top = ms.top;
/* If there are other objects, then */
- if ((!(flag & INS_MAP_LOAD)) && top)
+ if (top)
{
- object *last = 0;
-
/*
* If there are multiple objects on this space, we do some trickier handling.
* We've already dealt with merging if appropriate.
@@ -1325,24 +1359,21 @@
* when lots of spells are cast in one area. Currently, it is presumed
* that flying non pickable objects are spell objects.
*/
- for (top = ms.bot; top; top = top->above)
+ for (object *tmp = ms.bot; tmp; tmp = tmp->above)
{
- if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
- floor = top;
+ if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
+ floor = tmp;
- if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
+ if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
{
/* We insert above top, so we want this object below this */
- top = top->below;
+ top = tmp->below;
break;
}
- last = top;
+ top = tmp;
}
- /* Don't want top to be NULL, so set it to the last valid object */
- top = last;
-
/* We let update_position deal with figuring out what the space
* looks like instead of lots of conditions here.
* makes things faster, and effectively the same result.
@@ -1358,6 +1389,8 @@
&& ms.flags () & P_BLOCKSVIEW
&& (op->face && !faces [op->face].visibility))
{
+ object *last;
+
for (last = top; last != floor; last = last->below)
if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
break;
@@ -1371,42 +1404,30 @@
top = last->below;
}
} /* If objects on this space */
- if (flag & INS_MAP_LOAD)
- top = ms.top;
if (flag & INS_ABOVE_FLOOR_ONLY)
top = floor;
- /* Top is the object that our object (op) is going to get inserted above.
- */
-
- /* First object on this space */
+ // insert object above top, or bottom-most if top = 0
if (!top)
{
- op->above = ms.bot;
-
- if (op->above)
- op->above->below = op;
-
op->below = 0;
+ op->above = ms.bot;
ms.bot = op;
+
+ *(op->above ? &op->above->below : &ms.top) = op;
}
else
- { /* get inserted into the stack above top */
+ {
op->above = top->above;
-
- if (op->above)
- op->above->below = op;
+ top->above = op;
op->below = top;
- top->above = op;
+ *(op->above ? &op->above->below : &ms.top) = op;
}
+ }
- if (!op->above)
- ms.top = op;
- } /* else not INS_BELOW_ORIGINATOR */
-
- if (op->type == PLAYER)
+ if (op->is_player ())
{
op->contr->do_los = 1;
++op->map->players;
@@ -1415,11 +1436,11 @@
op->map->dirty = true;
- /* If we have a floor, we know the player, if any, will be above
- * it, so save a few ticks and start from there.
- */
- if (!(flag & INS_MAP_LOAD))
- if (object *pl = ms.player ())
+ if (object *pl = ms.player ())
+ //TODO: the floorbox prev/next might need updating
+ //esrv_send_item (pl, op);
+ //TODO: update floorbox to preserve ordering
+ if (pl->contr->ns)
pl->contr->ns->floorbox_update ();
/* If this object glows, it may affect lighting conditions that are
@@ -1431,8 +1452,11 @@
* or just updating the P_UPTODATE for spaces within this area
* of effect may be sufficient.
*/
- if (op->map->darkness && (op->glow_radius != 0))
- update_all_los (op->map, op->x, op->y);
+ if (op->affects_los ())
+ {
+ op->ms ().invalidate ();
+ update_all_los (op->map, op->x, op->y);
+ }
/* updates flags (blocked, alive, no magic, etc) for this map space */
update_object (op, UP_OBJ_INSERT);
@@ -1472,168 +1496,86 @@
void
replace_insert_ob_in_map (const char *arch_string, object *op)
{
- object *tmp, *tmp1;
-
/* first search for itself and remove any old instances */
- for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
+ for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
tmp->destroy ();
- tmp1 = arch_to_object (archetype::find (arch_string));
+ object *tmp = arch_to_object (archetype::find (arch_string));
- tmp1->x = op->x;
- tmp1->y = op->y;
- insert_ob_in_map (tmp1, op->map, op, 0);
-}
+ tmp->x = op->x;
+ tmp->y = op->y;
-object *
-object::insert_at (object *where, object *originator, int flags)
-{
- return where->map->insert (this, where->x, where->y, originator, flags);
+ insert_ob_in_map (tmp, op->map, op, 0);
}
-/*
- * get_split_ob(ob,nr) splits up ob into two parts. The part which
- * is returned contains nr objects, and the remaining parts contains
- * the rest (or is removed and freed if that number is 0).
- * On failure, NULL is returned, and the reason put into the
- * global static errmsg array.
- */
object *
-get_split_ob (object *orig_ob, uint32 nr)
+object::insert_at (object *where, object *originator, int flags)
{
- object *newob;
- int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
-
- if (orig_ob->nrof < nr)
- {
- sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
- return NULL;
- }
-
- newob = object_create_clone (orig_ob);
-
- if ((orig_ob->nrof -= nr) < 1)
- orig_ob->destroy (1);
- else if (!is_removed)
- {
- if (orig_ob->env != NULL)
- sub_weight (orig_ob->env, orig_ob->weight * nr);
- if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
- {
- strcpy (errmsg, "Tried to split object whose map is not in memory.");
- LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
- return NULL;
- }
- }
-
- newob->nrof = nr;
-
- return newob;
+ if (where->env)
+ return where->env->insert (this);
+ else
+ return where->map->insert (this, where->x, where->y, originator, flags);
}
/*
- * decrease_ob_nr(object, number) decreases a specified number from
- * the amount of an object. If the amount reaches 0, the object
+ * decrease(object, number) decreases a specified number from
+ * the amount of an object. If the amount reaches 0, the object
* is subsequently removed and freed.
*
* Return value: 'op' if something is left, NULL if the amount reached 0
*/
-object *
-decrease_ob_nr (object *op, uint32 i)
+bool
+object::decrease (sint32 nr)
{
- object *tmp;
-
- if (i == 0) /* objects with op->nrof require this check */
- return op;
+ if (!nr)
+ return true;
- if (i > op->nrof)
- i = op->nrof;
+ nr = min (nr, nrof);
- if (QUERY_FLAG (op, FLAG_REMOVED))
- op->nrof -= i;
- else if (op->env)
+ if (nrof > nr)
{
- /* is this object in the players inventory, or sub container
- * therein?
- */
- tmp = op->in_player ();
- /* nope. Is this a container the player has opened?
- * If so, set tmp to that player.
- * IMO, searching through all the players will mostly
- * likely be quicker than following op->env to the map,
- * and then searching the map for a player.
- */
- if (!tmp)
- for_all_players (pl)
- if (pl->ob->container == op->env)
- {
- tmp = pl->ob;
- break;
- }
+ nrof -= nr;
+ adjust_weight (env, -weight * max (1, nr)); // carrying == 0
- if (i < op->nrof)
- {
- sub_weight (op->env, op->weight * i);
- op->nrof -= i;
- if (tmp)
- esrv_send_item (tmp, op);
- }
- else
- {
- op->remove ();
- op->nrof = 0;
- if (tmp)
- esrv_del_item (tmp->contr, op->count);
- }
- }
- else
- {
- object *above = op->above;
+ if (object *pl = visible_to ())
+ esrv_update_item (UPD_NROF, pl, this);
- if (i < op->nrof)
- op->nrof -= i;
- else
- {
- op->remove ();
- op->nrof = 0;
- }
-
- /* Since we just removed op, op->above is null */
- for (tmp = above; tmp; tmp = tmp->above)
- if (tmp->type == PLAYER)
- {
- if (op->nrof)
- esrv_send_item (tmp, op);
- else
- esrv_del_item (tmp->contr, op->count);
- }
+ return true;
}
-
- if (op->nrof)
- return op;
else
{
- op->destroy ();
- return 0;
+ destroy ();
+ return false;
}
}
/*
- * add_weight(object, weight) adds the specified weight to an object,
- * and also updates how much the environment(s) is/are carrying.
+ * split(ob,nr) splits up ob into two parts. The part which
+ * is returned contains nr objects, and the remaining parts contains
+ * the rest (or is removed and returned if that number is 0).
+ * On failure, NULL is returned.
*/
-void
-add_weight (object *op, signed long weight)
+object *
+object::split (sint32 nr)
{
- while (op != NULL)
+ int have = number_of ();
+
+ if (have < nr)
+ return 0;
+ else if (have == nr)
{
- if (op->type == CONTAINER)
- weight = (signed long) (weight * (100 - op->stats.Str) / 100);
+ remove ();
+ return this;
+ }
+ else
+ {
+ decrease (nr);
- op->carrying += weight;
- op = op->env;
+ object *op = deep_clone ();
+ op->nrof = nr;
+ return op;
}
}
@@ -1668,82 +1610,65 @@
object *
object::insert (object *op)
{
- object *tmp, *otmp;
-
- if (!QUERY_FLAG (op, FLAG_REMOVED))
- op->remove ();
-
if (op->more)
{
LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
return op;
}
- CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
- CLEAR_FLAG (op, FLAG_REMOVED);
+ op->remove ();
+
+ op->flag [FLAG_OBJ_ORIGINAL] = 0;
+
if (op->nrof)
- {
- for (tmp = inv; tmp != NULL; tmp = tmp->below)
- if (object::can_merge (tmp, op))
- {
- /* return the original object and remove inserted object
- (client needs the original object) */
- tmp->nrof += op->nrof;
- /* Weight handling gets pretty funky. Since we are adding to
- * tmp->nrof, we need to increase the weight.
- */
- add_weight (this, op->weight * op->nrof);
- SET_FLAG (op, FLAG_REMOVED);
- op->destroy (); /* free the inserted object */
- op = tmp;
- op->remove (); /* and fix old object's links */
- CLEAR_FLAG (op, FLAG_REMOVED);
- break;
- }
+ for (object *tmp = inv; tmp; tmp = tmp->below)
+ if (object::can_merge (tmp, op))
+ {
+ /* return the original object and remove inserted object
+ (client needs the original object) */
+ tmp->nrof += op->nrof;
- /* I assume combined objects have no inventory
- * We add the weight - this object could have just been removed
- * (if it was possible to merge). calling remove_ob will subtract
- * the weight, so we need to add it in again, since we actually do
- * the linking below
- */
- add_weight (this, op->weight * op->nrof);
- }
- else
- add_weight (this, (op->weight + op->carrying));
+ if (object *pl = tmp->visible_to ())
+ esrv_update_item (UPD_NROF, pl, tmp);
+
+ adjust_weight (this, op->total_weight ());
+
+ op->destroy ();
+ op = tmp;
+ goto inserted;
+ }
- otmp = this->in_player ();
- if (otmp && otmp->contr)
- if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
- otmp->update_stats ();
+ op->owner = 0; // it's his/hers now. period.
+ op->map = 0;
+ op->x = 0;
+ op->y = 0;
- op->map = 0;
- op->env = this;
op->above = 0;
- op->below = 0;
- op->x = 0, op->y = 0;
+ op->below = inv;
+ op->env = this;
- /* reset the light list and los of the players on the map */
- if ((op->glow_radius != 0) && map)
- {
-#ifdef DEBUG_LIGHTS
- LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
-#endif /* DEBUG_LIGHTS */
- if (map->darkness)
- update_all_los (map, x, y);
- }
+ if (inv)
+ inv->above = op;
- /* Client has no idea of ordering so lets not bother ordering it here.
- * It sure simplifies this function...
- */
- if (!inv)
- inv = op;
- else
+ inv = op;
+
+ op->flag [FLAG_REMOVED] = 0;
+
+ if (object *pl = op->visible_to ())
+ esrv_send_item (pl, op);
+
+ adjust_weight (this, op->total_weight ());
+
+inserted:
+ /* reset the light list and los of the players on the map */
+ if (op->glow_radius && is_on_map ())
{
- op->below = inv;
- op->below->above = op;
- inv = op;
+ update_stats ();
+ update_all_los (map, x, y);
}
+ else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
+ // if this is a player's inventory, update stats
+ update_stats ();
INVOKE_OBJECT (INSERT, this);
@@ -1836,7 +1761,7 @@
float
diff = tmp->move_slow_penalty * fabs (op->speed);
- if (op->type == PLAYER)
+ if (op->is_player ())
if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
diff /= 4.0;
@@ -1881,7 +1806,7 @@
}
for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
- if (tmp->arch == at)
+ if (tmp->arch->archname == at->archname)
return tmp;
return NULL;
@@ -1955,8 +1880,8 @@
object *
present_arch_in_ob (const archetype *at, const object *op)
{
- for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
- if (tmp->arch == at)
+ for (object *tmp = op->inv; tmp; tmp = tmp->below)
+ if (tmp->arch->archname == at->archname)
return tmp;
return NULL;
@@ -1968,12 +1893,11 @@
void
flag_inv (object *op, int flag)
{
- if (op->inv)
- for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
- {
- SET_FLAG (tmp, flag);
- flag_inv (tmp, flag);
- }
+ for (object *tmp = op->inv; tmp; tmp = tmp->below)
+ {
+ SET_FLAG (tmp, flag);
+ flag_inv (tmp, flag);
+ }
}
/*
@@ -1982,12 +1906,11 @@
void
unflag_inv (object *op, int flag)
{
- if (op->inv)
- for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
- {
- CLEAR_FLAG (tmp, flag);
- unflag_inv (tmp, flag);
- }
+ for (object *tmp = op->inv; tmp; tmp = tmp->below)
+ {
+ CLEAR_FLAG (tmp, flag);
+ unflag_inv (tmp, flag);
+ }
}
/*
@@ -1999,10 +1922,7 @@
* start and stop are where to start relative to the free_arr array (1,9
* does all 4 immediate directions). This returns the index into the
* array of the free spot, -1 if no spot available (dir 0 = x,y)
- * Note - this only checks to see if there is space for the head of the
- * object - if it is a multispace object, this should be called for all
- * pieces.
- * Note2: This function does correctly handle tiled maps, but does not
+ * Note: This function does correctly handle tiled maps, but does not
* inform the caller. However, insert_ob_in_map will update as
* necessary, so the caller shouldn't need to do any special work.
* Note - updated to take an object instead of archetype - this is necessary
@@ -2014,14 +1934,30 @@
int
find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
{
- int index = 0, flag;
int altern[SIZEOFFREE];
+ int index = 0, flag;
for (int i = start; i < stop; i++)
{
- flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
- if (!flag)
- altern [index++] = i;
+ mapxy pos (m, x, y); pos.move (i);
+
+ if (!pos.normalise ())
+ continue;
+
+ mapspace &ms = *pos;
+
+ if (ms.flags () & P_IS_ALIVE)
+ continue;
+
+ /* However, often
+ * ob doesn't have any move type (when used to place exits)
+ * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
+ */
+ if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
+ {
+ altern [index++] = i;
+ continue;
+ }
/* Basically, if we find a wall on a space, we cut down the search size.
* In this way, we won't return spaces that are on another side of a wall.
@@ -2031,8 +1967,22 @@
* to only the spaces immediately surrounding the target area, and
* won't look 2 spaces south of the target space.
*/
- else if ((flag & P_NO_PASS) && maxfree[i] < stop)
- stop = maxfree[i];
+ if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
+ {
+ stop = maxfree[i];
+ 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))
+ continue;
+
+ if (ob->blocked (pos.m, pos.x, pos.y))
+ continue;
+
+ altern [index++] = i;
}
if (!index)
@@ -2051,7 +2001,7 @@
find_first_free_spot (const object *ob, maptile *m, int x, int y)
{
for (int i = 0; i < SIZEOFFREE; i++)
- if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
+ if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
return i;
return -1;
@@ -2147,7 +2097,7 @@
else if (mflags & P_IS_ALIVE)
{
for (tmp = ms.bot; tmp; tmp = tmp->above)
- if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
+ if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
break;
@@ -2343,47 +2293,30 @@
{
return /*QUERY_FLAG(who,FLAG_WIZ)|| */
(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
- !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
+ !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
}
/*
* create clone from object to another
*/
object *
-object_create_clone (object *asrc)
+object::deep_clone ()
{
- object *dst = 0, *tmp, *src, *prev, *item;
-
- if (!asrc)
- return 0;
+ assert (("deep_clone called on non-head object", is_head ()));
- src = asrc->head_ ();
+ object *dst = clone ();
- prev = 0;
- for (object *part = src; part; part = part->more)
+ object *prev = dst;
+ for (object *part = this->more; part; part = part->more)
{
- tmp = part->clone ();
- tmp->x -= src->x;
- tmp->y -= src->y;
-
- if (!part->head)
- {
- dst = tmp;
- tmp->head = 0;
- }
- else
- tmp->head = dst;
-
- tmp->more = 0;
-
- if (prev)
- prev->more = tmp;
-
+ object *tmp = part->clone ();
+ tmp->head = dst;
+ prev->more = tmp;
prev = tmp;
}
- for (item = src->inv; item; item = item->below)
- insert_ob_in_ob (object_create_clone (item), dst);
+ for (object *item = inv; item; item = item->below)
+ insert_ob_in_ob (item->deep_clone (), dst);
return dst;
}
@@ -2402,143 +2335,46 @@
return 0;
}
-/* If ob has a field named key, return the link from the list,
- * otherwise return NULL.
- *
- * key must be a passed in shared string - otherwise, this won't
- * do the desired thing.
- */
-key_value *
-get_ob_key_link (const object *ob, const char *key)
-{
- for (key_value *link = ob->key_values; link; link = link->next)
- if (link->key == key)
- return link;
-
- return 0;
-}
-
-/*
- * Returns the value of op has an extra_field for key, or NULL.
- *
- * The argument doesn't need to be a shared string.
- *
- * The returned string is shared.
- */
-const char *
-get_ob_key_value (const object *op, const char *const key)
+const shstr &
+object::kv_get (const shstr &key) const
{
- key_value *link;
- shstr_cmp canonical_key (key);
+ for (key_value *kv = key_values; kv; kv = kv->next)
+ if (kv->key == key)
+ return kv->value;
- if (!canonical_key)
- {
- /* 1. There being a field named key on any object
- * implies there'd be a shared string to find.
- * 2. Since there isn't, no object has this field.
- * 3. Therefore, *this* object doesn't have this field.
- */
- return 0;
- }
-
- /* This is copied from get_ob_key_link() above -
- * only 4 lines, and saves the function call overhead.
- */
- for (link = op->key_values; link; link = link->next)
- if (link->key == canonical_key)
- return link->value;
-
- return 0;
+ return shstr_null;
}
-/*
- * Updates the canonical_key in op to value.
- *
- * canonical_key is a shared string (value doesn't have to be).
- *
- * Unless add_key is TRUE, it won't add fields, only change the value of existing
- * keys.
- *
- * Returns TRUE on success.
- */
-int
-set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
+void
+object::kv_set (const shstr &key, const shstr &value)
{
- key_value *field = NULL, *last = NULL;
-
- for (field = op->key_values; field != NULL; field = field->next)
- {
- if (field->key != canonical_key)
- {
- last = field;
- continue;
- }
-
- if (value)
- field->value = value;
- else
- {
- /* Basically, if the archetype has this key set,
- * we need to store the null value so when we save
- * it, we save the empty value so that when we load,
- * we get this value back again.
- */
- if (get_ob_key_link (op->arch, canonical_key))
- field->value = 0;
- else
- {
- if (last)
- last->next = field->next;
- else
- op->key_values = field->next;
-
- delete field;
- }
- }
- return TRUE;
- }
- /* IF we get here, key doesn't exist */
-
- /* No field, we'll have to add it. */
-
- if (!add_key)
- return FALSE;
-
- /* There isn't any good reason to store a null
- * value in the key/value list. If the archetype has
- * this key, then we should also have it, so shouldn't
- * be here. If user wants to store empty strings,
- * should pass in ""
- */
- if (value == NULL)
- return TRUE;
+ for (key_value *kv = key_values; kv; kv = kv->next)
+ if (kv->key == key)
+ {
+ kv->value = value;
+ return;
+ }
- field = new key_value;
+ key_value *kv = new key_value;
- field->key = canonical_key;
- field->value = value;
- /* Usual prepend-addition. */
- field->next = op->key_values;
- op->key_values = field;
+ kv->next = key_values;
+ kv->key = key;
+ kv->value = value;
- return TRUE;
+ key_values = kv;
}
-/*
- * Updates the key in op to value.
- *
- * If add_key is FALSE, this will only update existing keys,
- * and not add new ones.
- * In general, should be little reason FALSE is ever passed in for add_key
- *
- * Returns TRUE on success.
- */
-int
-set_ob_key_value (object *op, const char *key, const char *value, int add_key)
+void
+object::kv_del (const shstr &key)
{
- shstr key_ (key);
-
- return set_ob_key_value_s (op, key_, value, add_key);
+ for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
+ if ((*kvp)->key == key)
+ {
+ key_value *kv = *kvp;
+ *kvp = (*kvp)->next;
+ delete kv;
+ return;
+ }
}
object::depth_iterator::depth_iterator (object *container)
@@ -2598,14 +2434,16 @@
char info2[256 * 4];
char *p = info;
- p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
- count, uuid.seq,
+ p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
+ count,
+ uuid.c_str (),
&name,
- title ? "\",title:\"" : "",
+ title ? ",title:\"" : "",
title ? (const char *)title : "",
+ title ? "\"" : "",
flag_desc (flagdesc, 512), type);
- if (env)
+ if (!flag[FLAG_REMOVED] && env)
p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
if (map)
@@ -2645,7 +2483,9 @@
if (container == new_container)
return;
- if (object *old_container = container)
+ object *old_container = container;
+
+ if (old_container)
{
if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
return;
@@ -2657,10 +2497,15 @@
closer->destroy ();
#endif
- old_container->flag [FLAG_APPLIED] = 0;
+ // make sure the container is available
+ esrv_send_item (this, old_container);
+
+ old_container->flag [FLAG_APPLIED] = false;
container = 0;
+ // client needs item update to make it work, client bug requires this to be separate
esrv_update_item (UPD_FLAGS, this, old_container);
+
new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
play_sound (sound_find ("chest_close"));
}
@@ -2683,13 +2528,19 @@
new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
- new_container->flag [FLAG_APPLIED] = 1;
+ // make sure the container is available, client bug requires this to be separate
+ esrv_send_item (this, new_container);
+
+ new_container->flag [FLAG_APPLIED] = true;
container = new_container;
+ // client needs flag change
esrv_update_item (UPD_FLAGS, this, new_container);
esrv_send_inventory (this, new_container);
play_sound (sound_find ("chest_open"));
}
+// else if (!old_container->env && contr && contr->ns)
+// contr->ns->floorbox_reset ();
}
object *
@@ -2705,7 +2556,7 @@
return 0;
}
-void
+object *
object::force_add (const shstr name, int duration)
{
if (object *force = force_find (name))
@@ -2721,11 +2572,11 @@
force->flag [FLAG_IS_USED_UP] = true;
force->flag [FLAG_APPLIED] = true;
- insert (force);
+ return insert (force);
}
void
-object::play_sound (faceidx sound) const
+object::play_sound (faceidx sound)
{
if (!sound)
return;
@@ -2742,3 +2593,36 @@
map->play_sound (sound, x, y);
}
+void
+object::make_noise ()
+{
+ // we do not model noise in the map, so instead put
+ // a temporary light into the noise source
+ // could use the map instead, but that's less reliable for our
+ // goal, which is to make invisibility a bit harder to exploit
+
+ // currently only works sensibly for players
+ if (!is_player ())
+ return;
+
+ // find old force, or create new one
+ object *force = force_find (shstr_noise_force);
+
+ if (force)
+ force->speed_left = -1.f; // patch old speed up
+ else
+ {
+ force = archetype::get (shstr_noise_force);
+
+ force->slaying = shstr_noise_force;
+ force->stats.food = 1;
+ force->speed_left = -1.f;
+
+ force->set_speed (1.f / 4.f);
+ force->flag [FLAG_IS_USED_UP] = true;
+ force->flag [FLAG_APPLIED] = true;
+
+ insert (force);
+ }
+}
+