--- deliantra/server/common/object.C 2007/07/10 07:31:19 1.165
+++ deliantra/server/common/object.C 2008/05/02 20:28:44 1.225
@@ -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,59 @@
* 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;
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 +80,8 @@
sprintf (filename, "%s/uuid", settings.localdir);
+ seq_next_save = 0;
+
FILE *fp;
if (!(fp = fopen (filename, "r")))
@@ -91,8 +89,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,41 +98,47 @@
_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;
@@ -152,28 +156,22 @@
/* 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;
- }
+ if (!has_field)
+ return 0; /* No field with that name. */
/* 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;
- }
+ return 0; /* Values don't match, so this half of the comparison is false. */
/* If we get here, we found a match. Now for the next field in wants. */
}
/* If we get here, every field in wants has a matching field in has. */
- return TRUE;
+ return 1;
}
/* 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,
@@ -204,16 +202,16 @@
|| 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).
+ /* Do not merge objects if nrof would overflow. First part checks
+ * for unsigned overflow (2c), second part checks whether the result
+ * would fit into a 32 bit signed int, which is often used to hold
+ * nrof values.
*/
- if (ob1->nrof + ob2->nrof >= 1UL << 31)
+ if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
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,14 +222,11 @@
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->name != ob2->arch->name
|| 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
@@ -248,21 +243,32 @@
|| 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;
+
+ if ((ob1->flag ^ ob2->flag)
+ .reset (FLAG_INV_LOCKED)
+ .reset (FLAG_CLIENT_SENT)
+ .reset (FLAG_REMOVED)
+ .any ())
return 0;
- /* This is really a spellbook check - really, we should
- * check all objects in the inventory.
+ /* 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,74 +297,142 @@
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;
}
- //TODO: generate an event or call into perl for additional checks
if (ob1->self || ob2->self)
{
ob1->optimise ();
ob2->optimise ();
if (ob1->self || ob2->self)
- 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->type == 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 || this == pl->container)
+ return pl;
+ }
+ }
+
+ return 0;
+}
+
+// adjust weight per container type ("of holding")
+static sint32
+weight_adjust (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);
+ weight = weight_adjust (op, 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 (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 +450,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)
@@ -422,31 +500,24 @@
return op;
}
-void
-free_all_object_data ()
-{
- LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
-}
-
/*
* 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;
}
@@ -537,13 +608,11 @@
object &
object::operator =(const object &src)
{
- bool is_freed = flag [FLAG_FREED];
- bool is_removed = flag [FLAG_REMOVED];
+ remove ();
*(object_copy *)this = src;
- flag [FLAG_FREED] = is_freed;
- flag [FLAG_REMOVED] = is_removed;
+ flag [FLAG_REMOVED] = true;
/* Copy over key_values, if any. */
if (src.key_values)
@@ -588,7 +657,7 @@
*dst = *this;
if (speed < 0)
- dst->speed_left = speed_left - rndm ();
+ dst->speed_left -= rndm ();
dst->set_speed (dst->speed);
}
@@ -597,7 +666,7 @@
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 +686,7 @@
{
object *neu = create ();
copy_to (neu);
+ neu->map = map; // not copied by copy_to
return neu;
}
@@ -677,14 +747,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 +762,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)
{
@@ -766,7 +830,7 @@
void object::link ()
{
assert (!index);//D
- uuid = gen_uuid ();
+ uuid = UUID::gen ();
count = ++object_count;
refcnt_inc ();
@@ -849,7 +913,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,13 +924,13 @@
*/
if (!drop_to_ground
|| !map
- || map->in_memory != MAP_IN_MEMORY
+ || map->in_memory != MAP_ACTIVE
|| map->nodrop
|| ms ().move_block == MOVE_ALL)
{
while (inv)
{
- inv->destroy_inv (drop_to_ground);
+ inv->destroy_inv (false);
inv->destroy ();
}
}
@@ -882,7 +946,7 @@
|| op->type == TRAP
|| op->flag [FLAG_IS_A_TEMPLATE]
|| op->flag [FLAG_DESTROY_ON_DEATH])
- op->destroy ();
+ op->destroy (true);
else
map->insert (op, x, y);
}
@@ -896,21 +960,33 @@
return op;
}
+static struct freed_map : maptile
+{
+ freed_map ()
+ {
+ path = "";
+ name = "/internal/freed_objects_map";
+ width = 3;
+ height = 3;
+ nodrop = 1;
+
+ alloc ();
+ in_memory = MAP_ACTIVE;
+ }
+} 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 +994,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)
{
@@ -959,27 +1019,22 @@
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 (destroy_inventory);
+ return;
+ }
- attachable::destroy ();
-}
+ destroy_inv (!destroy_inventory);
-/*
- * 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);
+ if (is_head ())
+ if (sound_destroy)
+ play_sound (sound_destroy);
+ else if (flag [FLAG_MONSTER])
+ play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
- op->carrying -= weight;
- op = op->env;
- }
+ attachable::destroy ();
}
/* op->remove ():
@@ -995,12 +1050,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 ();
@@ -1010,22 +1066,14 @@
*/
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;
+ *(above ? &above->below : &env->inv) = below;
if (below)
below->above = above;
@@ -1034,27 +1082,46 @@
* 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;
+ 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 ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
+ otmp->update_stats ();
}
else if (map)
{
- if (type == PLAYER)
+ map->dirty = true;
+ mapspace &ms = this->ms ();
+
+ if (object *pl = ms.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 ();
+ if (type == PLAYER) // this == pl(!)
+ {
+ // 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->players;
+ map->touch ();
+ }
+ else if (pl->container == this)
+ {
+ // removing a container should close it
+ close_container ();
+ }
- map->dirty = true;
- mapspace &ms = this->ms ();
+ esrv_del_item (pl->contr, count);
+ }
/* link the object above us */
if (above)
@@ -1085,28 +1152,25 @@
int check_walk_off = !flag [FLAG_NO_APPLY];
+ if (object *pl = ms.player ())
+ {
+ if (pl->container == this)
+ /* If a container that the player is currently using somehow gets
+ * removed (most likely destroyed), update the player view
+ * appropriately.
+ */
+ pl->close_container ();
+
+ //TODO: the floorbox prev/next might need updating
+ esrv_del_item (pl->contr, count);
+ }
+
for (tmp = ms.bot; tmp; tmp = tmp->above)
{
/* No point updating the players look faces if he is the object
* being removed.
*/
- if (tmp->type == PLAYER && tmp != this)
- {
- /* If a container that the player is currently using somehow gets
- * removed (most likely destroyed), update the player view
- * appropriately.
- */
- if (tmp->container == this)
- {
- flag [FLAG_APPLIED] = 0;
- tmp->container = 0;
- }
-
- if (tmp->contr->ns)
- tmp->contr->ns->floorbox_update ();
- }
-
/* See if object moving off should effect something */
if (check_walk_off
&& ((move_type & tmp->move_off)
@@ -1147,25 +1211,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 (1);
+
+ return top;
+ }
return 0;
}
@@ -1234,29 +1298,16 @@
{
assert (!op->flag [FLAG_FREED]);
- object *top, *floor = NULL;
-
op->remove ();
-#if 0
- if (!m->active != !op->active)
- if (m->active)
- op->activate_recursive ();
- else
- op->deactivate_recursive ();
-#endif
-
- if (out_of_map (m, op->x, op->y))
+ /* 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->destroy (1);
+ return 0;
}
if (object *more = op->more)
@@ -1265,13 +1316,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 ();
@@ -1281,8 +1325,11 @@
for (object *tmp = ms.bot; tmp; tmp = tmp->above)
if (object::can_merge (op, tmp))
{
+ // TODO: we atcually want to update tmp, not op,
+ // but some caller surely breaks when we return tmp
+ // from here :/
op->nrof += tmp->nrof;
- tmp->destroy ();
+ tmp->destroy (1);
}
CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
@@ -1312,10 +1359,12 @@
}
else
{
+ object *top, *floor = NULL;
+
top = ms.bot;
/* If there are other objects, then */
- if ((!(flag & INS_MAP_LOAD)) && top)
+ if (top)
{
object *last = 0;
@@ -1378,9 +1427,6 @@
}
} /* If objects on this space */
- if (flag & INS_MAP_LOAD)
- top = ms.top;
-
if (flag & INS_ABOVE_FLOOR_ONLY)
top = floor;
@@ -1422,13 +1468,9 @@
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 (pl->contr->ns)
- pl->contr->ns->floorbox_update ();
+ if (object *pl = ms.player ())
+ //TODO: the floorbox prev/next might need updating
+ esrv_send_item (pl, op);
/* If this object glows, it may affect lighting conditions that are
* visible to others on this map. But update_all_los is really
@@ -1480,168 +1522,87 @@
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 ();
+ tmp->destroy (1);
- 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 (!nr)
+ return true;
- if (i == 0) /* objects with op->nrof require this check */
- return op;
+ nr = min (nr, nrof);
- if (i > op->nrof)
- i = op->nrof;
+ nrof -= nr;
- if (QUERY_FLAG (op, FLAG_REMOVED))
- op->nrof -= i;
- else if (op->env)
+ if (nrof)
{
- /* 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;
- }
+ adjust_weight (env, -weight * 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 (1);
+ 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)
+ {
+ remove ();
+ return this;
+ }
+ else
{
- if (op->type == CONTAINER)
- weight = (signed long) (weight * (100 - op->stats.Str) / 100);
+ decrease (nr);
- op->carrying += weight;
- op = op->env;
+ object *op = object_create_clone (this);
+ op->nrof = nr;
+ return op;
}
}
@@ -1676,82 +1637,63 @@
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);
- otmp = this->in_player ();
- if (otmp && otmp->contr)
- if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
- otmp->update_stats ();
+ adjust_weight (this, op->total_weight ());
+
+ op->destroy (1);
+ op = tmp;
+ goto inserted;
+ }
+
+ 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;
+
+ if (inv)
+ inv->above = op;
+
+ 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 != 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 (op->glow_radius && map && map->darkness)
+ update_all_los (map, x, y);
- /* Client has no idea of ordering so lets not bother ordering it here.
- * It sure simplifies this function...
- */
- if (!inv)
- inv = op;
- else
- {
- op->below = inv;
- op->below->above = op;
- inv = op;
- }
+ // if this is a player's inventory, update stats
+ if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
+ update_stats ();
INVOKE_OBJECT (INSERT, this);
@@ -1976,12 +1918,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);
+ }
}
/*
@@ -1990,12 +1931,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);
+ }
}
/*
@@ -2007,10 +1947,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
@@ -2022,14 +1959,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.
@@ -2039,8 +1992,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 (m, pos.x, pos.y))
+ continue;
+
+ altern [index++] = i;
}
if (!index)
@@ -2059,7 +2026,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;
@@ -2346,7 +2313,6 @@
*
* Add a check so we can't pick up invisible objects (0.93.8)
*/
-
int
can_pick (const object *who, const object *item)
{
@@ -2361,17 +2327,18 @@
object *
object_create_clone (object *asrc)
{
- object *dst = 0, *tmp, *src, *prev, *item;
+ object *dst = 0;
if (!asrc)
return 0;
- src = asrc->head_ ();
+ object *src = asrc->head_ ();
- prev = 0;
+ object *prev = 0;
for (object *part = src; part; part = part->more)
{
- tmp = part->clone ();
+ object *tmp = part->clone ();
+
tmp->x -= src->x;
tmp->y -= src->y;
@@ -2391,7 +2358,7 @@
prev = tmp;
}
- for (item = src->inv; item; item = item->below)
+ for (object *item = src->inv; item; item = item->below)
insert_ob_in_ob (object_create_clone (item), dst);
return dst;
@@ -2607,14 +2574,15 @@
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,flags:[%s],type:%d}",
+ count,
+ uuid.c_str (),
&name,
title ? "\",title:\"" : "",
title ? (const char *)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)
@@ -2654,7 +2622,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;
@@ -2666,11 +2636,17 @@
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"));
}
if (new_container)
@@ -2691,12 +2667,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 *
@@ -2731,4 +2714,21 @@
insert (force);
}
+void
+object::play_sound (faceidx sound)
+{
+ if (!sound)
+ return;
+
+ if (flag [FLAG_REMOVED])
+ return;
+
+ if (env)
+ {
+ if (object *pl = in_player ())
+ pl->contr->play_sound (sound);
+ }
+ else
+ map->play_sound (sound, x, y);
+}