--- deliantra/server/common/object.C 2010/04/11 23:56:09 1.323 +++ deliantra/server/common/object.C 2011/05/07 20:03:27 1.348 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2001 Mark Wedel & Crossfire Development Team * Copyright (©) 1992 Frank Tore Johansen * @@ -39,6 +39,12 @@ objectvec objects; activevec actives; +freelist_item *object::freelist; +uint32_t object::object_count; +uint32_t object::free_count; +uint32_t object::create_count; +uint32_t object::destroy_count; + //+GPL short freearr_x[SIZEOFFREE] = { @@ -67,6 +73,25 @@ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 }; +const char *wall_suffix[16] = { + "0", + "1_3", + "1_4", + "2_1_2", + "1_2", + "2_2_4", + "2_2_1", + "3_1", + "1_1", + "2_2_3", + "2_2_2", + "3_3", + "2_1_1", + "3_4", + "3_2", + "4" +}; + static void write_uuid (uval64 skip, bool sync) { @@ -210,14 +235,14 @@ static bool compare_ob_value_lists_one (const object *wants, const object *has) { - /* n-squared behaviour (see kv_get), 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 (key_value *kv = wants->key_values; kv; kv = kv->next) - if (has->kv_get (kv->key) != kv->value) + for (key_value *kv = wants->kv.first; 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. */ @@ -251,9 +276,10 @@ { /* A couple quick sanity checks */ if (ob1 == ob2 - || ob1->type != ob2->type - || ob1->value != ob2->value - || ob1->name != ob2->name + || ob1->type != ob2->type + || ob1->value != ob2->value + || ob1->name != ob2->name + || ob1->custom_name != ob2->custom_name || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) return 0; @@ -349,10 +375,10 @@ break; } - if (ob1->key_values || ob2->key_values) + if (!ob1->kv.empty () || !ob2->kv.empty ()) { /* At least one of these has key_values. */ - if ((!ob1->key_values) != (!ob2->key_values)) + if (ob1->kv.empty () != ob2->kv.empty ()) return 0; /* One has fields, but the other one doesn't. */ if (!compare_ob_value_lists (ob1, ob2)) @@ -422,37 +448,35 @@ } // adjust weight per container type ("of holding") -static sint32 -weight_adjust_for (object *op, sint32 weight) +static uint32 +weight_adjust_for (object *op, uint32 weight) { return op->type == CONTAINER - ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) + ? weight - weight * op->stats.Str / 100 : weight; } /* - * adjust_weight(object, weight) adds the specified weight to an object, + * subtracts, then adds, the specified weight to an object, * and also updates how much the environment(s) is/are carrying. */ static void -adjust_weight (object *op, sint32 weight) +adjust_weight (object *op, sint32 sub, sint32 add) { while (op) { - // 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); - - if (!weight) - return; + sint32 ocarrying = op->carrying; - op->carrying += weight; + op->carrying -= weight_adjust_for (op, sub); + op->carrying += weight_adjust_for (op, add); if (object *pl = op->visible_to ()) if (pl != op) // player is handled lazily esrv_update_item (UPD_WEIGHT, pl, op); + sub = ocarrying; + add = op->carrying; + op = op->env; } } @@ -469,16 +493,17 @@ for (object *op = inv; op; op = op->below) { - if (op->inv) - op->update_weight (); + op->update_weight (); - sum += op->total_weight (); + sum += weight_adjust_for (this, op->total_weight ()); } - sum = weight_adjust_for (this, sum); - if (sum != carrying) { + if (carrying != sum && carrying)//D + LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n", + (long long)sum, (long long)carrying, debug_desc ()); + carrying = sum; if (object *pl = visible_to ()) @@ -576,23 +601,6 @@ this->owner = owner; } -/* Zero the key_values on op, decrementing the shared-string - * refcounts and freeing the links. - */ -static void -free_key_values (object *op) -{ - for (key_value *i = op->key_values; i; ) - { - key_value *next = i->next; - delete i; - - i = next; - } - - op->key_values = 0; -} - /* * copy_to first frees everything allocated by the dst object, * and then copies the contents of itself into the second @@ -606,36 +614,11 @@ { dst->remove (); *(object_copy *)dst = *this; - dst->flag [FLAG_REMOVED] = true; - /* Copy over key_values, if any. */ - if (key_values) - { - key_value *tail = 0; - dst->key_values = 0; - - 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->value = i->value; - - /* Try and be clever here, too. */ - if (!dst->key_values) - { - dst->key_values = new_link; - tail = new_link; - } - else - { - tail->next = new_link; - tail = new_link; - } - } - } + // maybe move to object_copy? + dst->kv = kv; + dst->flag [FLAG_REMOVED] = true; dst->activate (); } @@ -645,7 +628,7 @@ if (!uuid.seq) // HACK uuid = UUID::gen (); - // TODO: unclean state changes, should nt be done in copy_to AND instantiate + // TODO: unclean state changes, should not be done in copy_to AND instantiate if (flag [FLAG_RANDOM_SPEED] && speed) speed_left = - speed - rndm (); // TODO animation else @@ -756,7 +739,7 @@ mapspace &m = op->ms (); if (!(m.flags_ & P_UPTODATE)) - /* nop */; + m.update_up (); // nothing to do except copy up else if (action == UP_OBJ_INSERT) { #if 0 @@ -787,7 +770,7 @@ else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) m.invalidate (); else if (action == UP_OBJ_FACE) - /* Nothing to do for that case */ ; + m.update_up (); // nothing to do for that case, except copy up else LOG (llevError, "update_object called with invalid action: %d\n", action); @@ -808,19 +791,19 @@ { unlink (); - free_key_values (this); + kv.clear (); } -static int object_count; - void object::link () { assert (!index);//D uuid = UUID::gen (); - count = ++object_count; refcnt_inc (); objects.insert (this); + + ++create_count; + } void object::unlink () @@ -828,6 +811,8 @@ if (!index) return; + ++destroy_count; + objects.erase (this); refcnt_dec (); } @@ -915,7 +900,7 @@ */ if (!drop_to_ground || !map - || map->in_memory != MAP_ACTIVE + || !map->linkable () || map->no_drop || ms ().move_block == MOVE_ALL) { @@ -962,26 +947,77 @@ } } -object *object::create () +void +object::freelist_free (int count) { - object *op = new object; + while (count-- && freelist) + { + freelist_item *next = freelist->next; + // count is being "destroyed" + + sfree ((char *)freelist, sizeof (object)); + + freelist = next; + --free_count; + } +} + +object * +object::create () +{ + object *op; + + if (freelist) + { + freelist_item li = *freelist; + memset (freelist, 0, sizeof (object)); + + op = new (freelist) object; + op->count = li.count; + + freelist = li.next; + --free_count; + } + else + { + void *ni = salloc0 (sizeof (object)); + + op = new(ni) object; + + op->count = ++object_count; + } + op->link (); + return op; } +void +object::do_delete () +{ + uint32_t count = this->count; + + this->~object (); + + freelist_item *li = (freelist_item *)this; + li->next = freelist; + li->count = count; + + freelist = li; + ++free_count; +} + static struct freed_map : maptile { freed_map () + : maptile (3, 3) { path = ""; name = "/internal/freed_objects_map"; - width = 3; - height = 3; no_drop = 1; no_reset = 1; - alloc (); - in_memory = MAP_ACTIVE; + state = MAP_ACTIVE; } ~freed_map () @@ -1083,7 +1119,7 @@ esrv_del_item (pl->contr, count); flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed - adjust_weight (env, -total_weight ()); + adjust_weight (env, total_weight (), 0); object *pl = in_player (); @@ -1107,14 +1143,14 @@ { if (expect_false (pl->contr->combat_ob == this)) { - pl->apply (pl->contr->combat_ob, AP_UNAPPLY); + pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE); pl->contr->combat_ob = 0; if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); } if (expect_false (pl->contr->ranged_ob == this)) { - pl->apply (pl->contr->ranged_ob, AP_UNAPPLY); + pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE); pl->contr->ranged_ob = 0; if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); } @@ -1165,9 +1201,6 @@ ms.invalidate (); - if (map->in_memory == MAP_SAVING) - return; - int check_walk_off = !flag [FLAG_NO_APPLY]; if (object *pl = ms.player ()) @@ -1311,7 +1344,7 @@ 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 + LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D }//D /* Ideally, the caller figures this out. However, it complicates a lot @@ -1511,14 +1544,14 @@ /* if this is not the head or flag has been passed, don't check walk on status */ if (!(flag & INS_NO_WALK_ON) && op->is_head ()) { - if (check_move_on (op, originator)) + if (check_move_on (op, originator, flag)) return 0; - /* If we are a multi part object, lets work our way through the check + /* If we are a multi part object, let's work our way through the check * walk on's. */ for (object *tmp = op->more; tmp; tmp = tmp->more) - if (check_move_on (tmp, originator)) + if (check_move_on (tmp, originator, flag)) return 0; } @@ -1594,12 +1627,15 @@ if (nrof > nr) { + sint64 oweight = total_weight (); + nrof -= nr; - adjust_weight (env, -weight * max (1, nr)); // carrying == 0 if (object *pl = visible_to ()) esrv_update_item (UPD_NROF, pl, this); + adjust_weight (env, oweight, total_weight ()); + return true; } else @@ -1683,13 +1719,17 @@ if (object::can_merge (tmp, op)) { /* return the original object and remove inserted object - (client needs the original object) */ + (client prefers the original object) */ + + // carring must be 0 for mergable objects + sint64 oweight = tmp->weight * tmp->nrof; + tmp->nrof += op->nrof; if (object *pl = tmp->visible_to ()) esrv_update_item (UPD_NROF, pl, tmp); - adjust_weight (this, op->total_weight ()); + adjust_weight (this, oweight, tmp->weight * tmp->nrof); op->destroy (); op = tmp; @@ -1715,7 +1755,7 @@ if (object *pl = op->visible_to ()) esrv_send_item (pl, op); - adjust_weight (this, op->total_weight ()); + adjust_weight (this, 0, op->total_weight ()); inserted: /* reset the light list and los of the players on the map */ @@ -1754,7 +1794,7 @@ * on top. */ int -check_move_on (object *op, object *originator) +check_move_on (object *op, object *originator, int flags) { if (op->flag [FLAG_NO_APPLY]) return 0; @@ -1823,6 +1863,11 @@ if ((!op->move_type && tmp->move_on & MOVE_WALK) || ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) { + if ((flags & INS_NO_AUTO_EXIT) + && (tmp->type == EXIT || tmp->type == TELEPORTER + || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead + continue; + move_apply (tmp, op, originator); if (op->destroyed ()) @@ -2157,45 +2202,84 @@ } /* - * find_dir_2(delta-x,delta-y) will return a direction in which - * an object which has subtracted the x and y coordinates of another - * object, needs to travel toward it. + * find_dir_2(delta-x,delta-y) will return a direction value + * for running into direct [dx, dy]. + * (the opposite of crossfire's find_dir_2!) */ int find_dir_2 (int x, int y) { +#if 1 // new algorithm + // this works by putting x, y into 16 sectors, which + // are not equal sized, but are a better approximation + // then the old algorithm, and then using a mapping + // table to map it into a direction value. + // basically, it maps these comparisons to each bit + // bit #3: x < 0 + // bit #2: y < 0 + // bit #1: x > y + // bit #0: x > 2y + + static const uint8 dir[16] = { + 4, 5, 4, 3, + 2, 1, 2, 3, + 6, 5, 6, 7, + 8, 1, 8, 7, + }; + int sector = 0; + + // this is a bit ugly, but more likely to result in branchless code + sector |= x < 0 ? 8 : 0; + x = x < 0 ? -x : x; // abs + + sector |= y < 0 ? 4 : 0; + y = y < 0 ? -y : y; // abs + + if (x > y) + { + sector |= 2; + + if (x > y * 2) + sector |= 1; + } + else + { + if (y > x * 2) + sector |= 1; + else if (!y) + return 0; // x == 0 here + } + + return dir [sector]; +#else // old algorithm int q; if (y) - q = x * 100 / y; + q = 128 * x / y; else if (x) - q = -300 * x; + q = -512 * x; // to make it > 309 else return 0; if (y > 0) { - if (q < -242) - return 3; - if (q < -41) - return 2; - if (q < 41) - return 1; - if (q < 242) - return 8; - return 7; - } + if (q < -309) return 7; + if (q < -52) return 6; + if (q < 52) return 5; + if (q < 309) return 4; - if (q < -242) - return 7; - if (q < -41) - return 6; - if (q < 41) - return 5; - if (q < 242) - return 4; + return 3; + } + else + { + if (q < -309) return 3; + if (q < -52) return 2; + if (q < 52) return 1; + if (q < 309) return 8; - return 3; + return 7; + } +#endif } /* @@ -2205,13 +2289,9 @@ int dirdiff (int dir1, int dir2) { - int d; - - d = abs (dir1 - dir2); - if (d > 4) - d = 8 - d; + int d = abs (dir1 - dir2); - return d; + return d > 4 ? 8 - d : d; } /* peterm: @@ -2371,10 +2451,26 @@ return 0; } +/* Zero the key_values on op, decrementing the shared-string + * refcounts and freeing the links. + */ +void +key_values::clear () +{ + for (key_value *kvp = first; kvp; ) + { + key_value *next = kvp->next; + delete kvp; + kvp = next; + } + + first = 0; +} + shstr_tmp -object::kv_get (shstr_tmp key) const +key_values::get (shstr_tmp key) const { - for (key_value *kv = key_values; kv; kv = kv->next) + for (key_value *kv = first; kv; kv = kv->next) if (kv->key == key) return kv->value; @@ -2382,28 +2478,34 @@ } void -object::kv_set (shstr_tmp key, shstr_tmp value) +key_values::add (shstr_tmp key, shstr_tmp value) +{ + key_value *kv = new key_value; + + kv->next = first; + kv->key = key; + kv->value = value; + + first = kv; +} + +void +key_values::set (shstr_tmp key, shstr_tmp value) { - for (key_value *kv = key_values; kv; kv = kv->next) + for (key_value *kv = first; kv; kv = kv->next) if (kv->key == key) { kv->value = value; return; } - key_value *kv = new key_value; - - kv->next = key_values; - kv->key = key; - kv->value = value; - - key_values = kv; + add (key, value); } void -object::kv_del (shstr_tmp key) +key_values::del (shstr_tmp key) { - for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) + for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next) if ((*kvp)->key == key) { key_value *kv = *kvp; @@ -2413,6 +2515,34 @@ } } +void +key_values::reverse () +{ + key_value *prev = 0; + key_value *head = first; + + while (head) + { + key_value *node = head; + head = head->next; + node->next = prev; + prev = node; + } + + first = prev; +} + +key_values & +key_values::operator =(const key_values &kv) +{ + clear (); + + for (key_value *kvp = kv.first; kvp; kvp = kvp->next) + add (kvp->key, kvp->value); + + reverse (); +} + object::depth_iterator::depth_iterator (object *container) : iterator_base (container) { @@ -2600,7 +2730,7 @@ if (object *force = force_find (name)) force->destroy (); - object *force = get_archetype (FORCE_NAME); + object *force = archetype::get (FORCE_NAME); force->slaying = name; force->force_set_timer (duration); @@ -2679,3 +2809,28 @@ move_type = mt; } +/* object should be a player. + * we return the object the player has marked with the 'mark' command + * below. If no match is found (or object has changed), we return + * NULL. We leave it up to the calling function to print messages if + * nothing is found. + */ +object * +object::mark () const +{ + if (contr && contr->mark && contr->mark->env == this) + return contr->mark; + else + return 0; +} + +// put marked object first in the inventory +// this is used by identify-like spells so players can influence +// the order a bit. +void +object::splay_marked () +{ + if (object *marked = mark ()) + splay (marked); +} +