--- deliantra/server/common/object.C 2010/04/02 03:41:24 1.317 +++ deliantra/server/common/object.C 2010/05/06 21:45:49 1.337 @@ -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] = { @@ -268,11 +274,11 @@ * are not equal - just if it has been identified, the been_applied * flags lose any meaning. */ - if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) - SET_FLAG (ob1, FLAG_BEEN_APPLIED); + if (ob1->flag [FLAG_IDENTIFIED]) + ob1->set_flag (FLAG_BEEN_APPLIED); - if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) - SET_FLAG (ob2, FLAG_BEEN_APPLIED); + if (ob2->flag [FLAG_IDENTIFIED]) + ob2->set_flag (FLAG_BEEN_APPLIED); if (ob1->arch->archname != ob2->arch->archname || ob1->name != ob2->name @@ -331,14 +337,14 @@ * it is possible for most any character to have more than one of * some items equipped, and we don't want those to merge. */ - if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) + if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) return 0; /* Note sure why the following is the case - either the object has to * be animated or have a very low speed. Is this an attempted monster * check? */ - if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) + if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) return 0; switch (ob1->type) @@ -422,37 +428,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 +473,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,55 +581,6 @@ this->owner = owner; } -int -object::slottype () const -{ - if (type == SKILL) - { - if (IS_COMBAT_SKILL (subtype)) return slot_combat; - if (IS_RANGED_SKILL (subtype)) return slot_ranged; - } - else - { - if (slot [body_combat].info) return slot_combat; - if (slot [body_range ].info) return slot_ranged; - } - - return slot_none; -} - -bool -object::change_weapon (object *ob) -{ - if (current_weapon == ob) - return true; - - if (current_weapon && current_weapon->flag [FLAG_APPLIED]) - { - manual_apply (this, current_weapon, AP_UNAPPLY); - - if (current_weapon && !current_weapon->flag [FLAG_APPLIED])//D - LOG (llevError, "FATAL: did not clear current_weapon (%s)\n", current_weapon->debug_desc ()); - - if (current_weapon && current_weapon->flag [FLAG_APPLIED]) - return false; - } - - current_weapon = 0; - - if (ob && !ob->flag [FLAG_APPLIED]) - { - manual_apply (this, ob, AP_APPLY); - - if (ob->flag [FLAG_APPLIED]) - current_weapon = ob; - else - return false; - } - - return true; -} - /* Zero the key_values on op, decrementing the shared-string * refcounts and freeing the links. */ @@ -734,7 +690,7 @@ void update_turn_face (object *op) { - if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) + if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) return; SET_ANIMATION (op, op->direction); @@ -810,12 +766,12 @@ { #if 0 // 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)) + if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) + || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC)) || (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)) + || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE)) + || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) || (m.move_on | op->move_on ) != m.move_on || (m.move_off | op->move_off ) != m.move_off || (m.move_slow | op->move_slow) != m.move_slow @@ -846,7 +802,7 @@ object::object () { - SET_FLAG (this, FLAG_REMOVED); + this->set_flag (FLAG_REMOVED); //expmul = 1.0; declared const for the time being face = blank_face; @@ -860,16 +816,16 @@ free_key_values (this); } -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 () @@ -877,6 +833,8 @@ if (!index) return; + ++destroy_count; + objects.erase (this); refcnt_dec (); } @@ -990,25 +948,97 @@ } } -object *object::create () +/* + * Remove and free all objects in the inventory of the given object. + * Unlike destroy_inv, this assumes the *this is destroyed as well + * well, so we can (and have to!) take shortcuts. + */ +void +object::destroy_inv_fast () { - object *op = new object; + while (object *op = inv) + { + // remove from object the fast way + op->flag [FLAG_REMOVED] = true; + op->env = 0; + if ((inv = inv->below)) + inv->above = 0; + + // then destroy + op->destroy (); + } +} + +void +object::freelist_free (int count) +{ + 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; } @@ -1069,7 +1099,7 @@ return; } - destroy_inv (false); + destroy_inv_fast (); if (is_head ()) if (sound_destroy) @@ -1111,7 +1141,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 (); @@ -1179,8 +1209,8 @@ // removing a container should close it close_container (); } - - esrv_del_item (pl->contr, count); + else + esrv_del_item (pl->contr, count); } /* link the object above us */ @@ -1376,11 +1406,11 @@ tmp->destroy (); } - CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ - CLEAR_FLAG (op, FLAG_INV_LOCKED); + op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ + op->clr_flag (FLAG_INV_LOCKED); - if (!QUERY_FLAG (op, FLAG_ALIVE)) - CLEAR_FLAG (op, FLAG_NO_STEAL); + if (!op->flag [FLAG_ALIVE]) + op->clr_flag (FLAG_NO_STEAL); if (flag & INS_BELOW_ORIGINATOR) { @@ -1425,10 +1455,10 @@ */ for (object *tmp = ms.bot; tmp; tmp = tmp->above) { - if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) + if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR]) floor = tmp; - if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) + if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR]) { /* We insert above top, so we want this object below this */ top = tmp->below; @@ -1456,7 +1486,7 @@ object *last; for (last = top; last != floor; last = last->below) - if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) + if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT)) break; /* Check to see if we found the object that blocks view, @@ -1539,14 +1569,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; } @@ -1597,10 +1627,10 @@ return true; if (originator && originator->is_player ()) - originator->contr->failmsg (format ( + originator->contr->failmsgf ( "No matter how hard you try, you just cannot put the %s here H", query_name () - )); + ); return false; } @@ -1622,12 +1652,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 @@ -1711,13 +1744,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; @@ -1743,7 +1780,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 */ @@ -1782,9 +1819,9 @@ * on top. */ int -check_move_on (object *op, object *originator) +check_move_on (object *op, object *originator, int flags) { - if (QUERY_FLAG (op, FLAG_NO_APPLY)) + if (op->flag [FLAG_NO_APPLY]) return 0; object *tmp; @@ -1831,7 +1868,7 @@ * space doesn't slow down swimming (for example), if you can't actually * swim on that space, can't use it to avoid the penalty. */ - if (!QUERY_FLAG (op, FLAG_WIZPASS)) + if (!op->flag [FLAG_WIZPASS]) { if ((!op->move_type && tmp->move_slow & MOVE_WALK) || ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) @@ -1851,6 +1888,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 ()) @@ -1972,7 +2014,7 @@ { for (object *tmp = op->inv; tmp; tmp = tmp->below) { - SET_FLAG (tmp, flag); + tmp->set_flag (flag); flag_inv (tmp, flag); } } @@ -1985,7 +2027,7 @@ { for (object *tmp = op->inv; tmp; tmp = tmp->below) { - CLEAR_FLAG (tmp, flag); + tmp->clr_flag (flag); unflag_inv (tmp, flag); } } @@ -2185,45 +2227,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 } /* @@ -2233,13 +2314,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: @@ -2355,9 +2432,9 @@ int can_pick (const object *who, const object *item) { - return /*QUERY_FLAG(who,FLAG_WIZ)|| */ - (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && - !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); + return /*who->flag [FLAG_WIZ]|| */ + (item->weight > 0 && !item->flag [FLAG_NO_PICK] && + !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); } /* @@ -2707,3 +2784,18 @@ 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; +} +