--- deliantra/server/common/object.C 2006/11/17 19:40:53 1.54 +++ deliantra/server/common/object.C 2006/12/20 11:36:38 1.75 @@ -32,6 +32,8 @@ #include #include +#include + int nrofallocobjects = 0; static UUID uuid; const uint64 UUID_SKIP = 1<<19; @@ -106,7 +108,7 @@ uuid.seq = uid; write_uuid (); - LOG (llevDebug, "read UID: %lld\n", uid); + LOG (llevDebug, "read UID: %" PRId64 "\n", uid); fclose (fp); } @@ -185,21 +187,23 @@ * replaces - this is mostly for clarity - a decent compiler should hopefully * reduce this to the same efficiency. * - * Check nrof variable *before* calling CAN_MERGE() + * Check nrof variable *before* calling can_merge() * * Improvements made with merge: Better checking on potion, and also * check weight */ -bool object::can_merge (object *ob1, object *ob2) +bool object::can_merge_slow (object *ob1, object *ob2) { /* A couple quicksanity checks */ - if ((ob1 == ob2) || (ob1->type != ob2->type)) - return 0; - - if (ob1->speed != ob2->speed) + if (ob1 == ob2 + || ob1->type != ob2->type + || ob1->speed != ob2->speed + || ob1->value != ob2->value + || 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). @@ -219,37 +223,31 @@ if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) SET_FLAG (ob2, FLAG_BEEN_APPLIED); - - /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something - * being locked in inventory should prevent merging. - * 0x4 in flags3 is CLIENT_SENT - */ - if ((ob1->arch != ob2->arch) || - (ob1->flags[0] != ob2->flags[0]) || - (ob1->flags[1] != ob2->flags[1]) || - ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || - ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || - (ob1->name != ob2->name) || - (ob1->title != ob2->title) || - (ob1->msg != ob2->msg) || - (ob1->weight != ob2->weight) || - (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || - (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || - (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->client_type != ob2->client_type) || - (ob1->materialname != ob2->materialname) || - (ob1->lore != ob2->lore) || - (ob1->subtype != ob2->subtype) || - (ob1->move_type != ob2->move_type) || - (ob1->move_block != ob2->move_block) || - (ob1->move_allow != ob2->move_allow) || - (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)) + if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () + || ob1->arch != ob2->arch + || 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->client_type != ob2->client_type + || ob1->materialname != ob2->materialname + || ob1->lore != ob2->lore + || ob1->subtype != ob2->subtype + || ob1->move_type != ob2->move_type + || ob1->move_block != ob2->move_block + || ob1->move_allow != ob2->move_allow + || 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) return 0; /* This is really a spellbook check - really, we should @@ -262,7 +260,7 @@ return 0; /* Now check to see if the two inventory objects could merge */ - if (!CAN_MERGE (ob1->inv, ob2->inv)) + if (!object::can_merge (ob1->inv, ob2->inv)) return 0; /* inventory ok - still need to check rest of this object to see @@ -356,21 +354,6 @@ } /* - * Eneq(@csd.uu.se): Since we can have items buried in a character we need - * a better check. We basically keeping traversing up until we can't - * or find a player. - */ - -object * -is_player_inv (object *op) -{ - for (; op != NULL && op->type != PLAYER; op = op->env) - if (op->env == op) - op->env = NULL; - return op; -} - -/* * 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. @@ -528,48 +511,44 @@ casting_time = -1; } -void object::clone (object *destination) -{ - *(object_copy *)destination = *this; - *(object_pod *)destination = *this; - - if (self || cb) - INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); -} - /* - * copy object first frees everything allocated by the second object, - * and then copies the contends of the first object into the second + * 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 -copy_object (object *op2, object *op) +object::copy_to (object *dst) { - bool is_freed = QUERY_FLAG (op, FLAG_FREED); - bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); + bool is_freed = QUERY_FLAG (dst, FLAG_FREED); + bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); + + *(object_copy *)dst = *this; + *(object_pod *)dst = *this; - op2->clone (op); + if (self || cb) + INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); if (is_freed) - SET_FLAG (op, FLAG_FREED); + SET_FLAG (dst, FLAG_FREED); + if (is_removed) - SET_FLAG (op, FLAG_REMOVED); + SET_FLAG (dst, FLAG_REMOVED); - if (op2->speed < 0) - op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; + if (speed < 0) + dst->speed_left = speed_left - RANDOM () % 200 / 100.0; /* Copy over key_values, if any. */ - if (op2->key_values) + if (key_values) { key_value *tail = 0; key_value *i; - op->key_values = 0; + dst->key_values = 0; - for (i = op2->key_values; i; i = i->next) + for (i = key_values; i; i = i->next) { key_value *new_link = new key_value; @@ -578,9 +557,9 @@ new_link->value = i->value; /* Try and be clever here, too. */ - if (!op->key_values) + if (!dst->key_values) { - op->key_values = new_link; + dst->key_values = new_link; tail = new_link; } else @@ -591,7 +570,15 @@ } } - update_ob_speed (op); + update_ob_speed (dst); +} + +object * +object::clone () +{ + object *neu = create (); + copy_to (neu); + return neu; } /* @@ -709,7 +696,7 @@ } /* - * update_object() updates the array which represents the map. + * update_object() updates the the map. * It takes into account invisible objects (and represent squares covered * by invisible objects by whatever is below them (unless it's another * invisible object, etc...) @@ -718,10 +705,6 @@ * updating that window, though, since update_object() is called _often_) * * action is a hint of what the caller believes need to be done. - * For example, if the only thing that has changed is the face (due to - * an animation), we don't need to call update_position until that actually - * comes into view of a player. OTOH, many other things, like addition/removal - * of walls or living creatures may need us to update the flags now. * current action are: * UP_OBJ_INSERT: op was inserted * UP_OBJ_REMOVE: op was removed @@ -729,11 +712,9 @@ * as that is easier than trying to look at what may have changed. * UP_OBJ_FACE: only the objects face has changed. */ - void update_object (object *op, int action) { - int update_now = 0, flags; MoveType move_on, move_off, move_block, move_slow; if (op == NULL) @@ -743,7 +724,7 @@ return; } - if (op->env != NULL) + if (op->env) { /* Animation is currently handled by client, so nothing * to do in this case. @@ -767,63 +748,41 @@ return; } - flags = GET_MAP_FLAGS (op->map, op->x, op->y); - SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); - move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); - move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); - move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); - move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); - - if (action == UP_OBJ_INSERT) - { - if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) - update_now = 1; - - if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) - update_now = 1; - - if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) - update_now = 1; + mapspace &m = op->map->at (op->x, op->y); - if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) - update_now = 1; - - if (op->type == SAFE_GROUND && !(flags & P_SAFE)) - update_now = 1; - - if ((move_on | op->move_on) != move_on) - update_now = 1; - - if ((move_off | op->move_off) != move_off) - update_now = 1; - - /* This isn't perfect, but I don't expect a lot of objects to - * to have move_allow right now. - */ - if (((move_block | op->move_block) & ~op->move_allow) != move_block) - update_now = 1; - - if ((move_slow | op->move_slow) != move_slow) - update_now = 1; - } - /* 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. - */ + if (m.flags_ & P_NEED_UPDATE) + /* nop */; + else if (action == UP_OBJ_INSERT) + { + // 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->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)) + || (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 + /* This isn't perfect, but I don't expect a lot of objects to + * to 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_ = P_NEED_UPDATE; + } + /* 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) - update_now = 1; + m.flags_ = P_NEED_UPDATE; else if (action == UP_OBJ_FACE) /* Nothing to do for that case */ ; else LOG (llevError, "update_object called with invalid action: %d\n", action); - if (update_now) - { - SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); - update_position (op->map, op->x, op->y); - } - - if (op->more != NULL) + if (op->more) update_object (op->more, action); } @@ -841,14 +800,6 @@ delete *i; mortals.erase (i); } - - static int lastmortals = 0;//D - - if (mortals.size() != lastmortals && lastmortals > 100)//D - { - lastmortals = mortals.size ();//D - LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D - } } object::object () @@ -917,7 +868,7 @@ remove_friendly_object (this); if (!QUERY_FLAG (this, FLAG_REMOVED)) - remove_ob (this); + remove (); SET_FLAG (this, FLAG_FREED); @@ -952,11 +903,11 @@ { object *tmp = op->below; - remove_ob (op); + op->remove (); if (QUERY_FLAG (op, FLAG_STARTEQUIP) || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) - free_object (op); + op->destroy (); else { op->x = x; @@ -969,6 +920,26 @@ } } + // 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->allocate (); + } + + map = freed_map; + x = 1; + y = 1; + } + // clear those pointers that likely might have circular references to us owner = 0; enemy = 0; @@ -990,7 +961,6 @@ * 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) { @@ -1004,7 +974,7 @@ } } -/* remove_ob(op): +/* 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 * object will have no environment. If the object previously had an @@ -1012,179 +982,148 @@ * the previous environment. * Beware: This function is called from the editor as well! */ - void -remove_ob (object *op) +object::remove () { object *tmp, *last = 0; object *otmp; int check_walk_off; - maptile *m; - - sint16 x, y; - if (QUERY_FLAG (op, FLAG_REMOVED)) + if (QUERY_FLAG (this, FLAG_REMOVED)) return; - SET_FLAG (op, FLAG_REMOVED); + SET_FLAG (this, FLAG_REMOVED); - if (op->more != NULL) - remove_ob (op->more); + if (more) + more->remove (); /* * In this case, the object to be removed is in someones * inventory. */ - if (op->env != NULL) + if (env) { - if (op->nrof) - sub_weight (op->env, op->weight * op->nrof); + if (nrof) + sub_weight (env, weight * nrof); else - sub_weight (op->env, op->weight + op->carrying); + sub_weight (env, weight + carrying); /* 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 = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) + if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) fix_player (otmp); - if (op->above != NULL) - op->above->below = op->below; + if (above != NULL) + above->below = below; else - op->env->inv = op->below; + env->inv = below; - if (op->below != NULL) - op->below->above = op->above; + if (below != NULL) + below->above = above; /* 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. */ - op->x = op->env->x, op->y = op->env->y; - op->map = op->env->map; - op->above = NULL, op->below = NULL; - op->env = NULL; - } - else if (op->map) - { - x = op->x; - y = op->y; - m = get_map_from_coord (op->map, &x, &y); - - if (!m) - { - LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", - op->map->path, op->x, op->y); - /* in old days, we used to set x and y to 0 and continue. - * it seems if we get into this case, something is probablye - * screwed up and should be fixed. - */ - abort (); - } - - if (op->map != m) - LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", - op->map->path, m->path, op->x, op->y, x, y); - + x = env->x, y = env->y; + map = env->map; + above = 0, below = 0; + env = 0; + } + else if (map) + { /* Re did the following section of code - it looks like it had * lots of logic for things we no longer care about */ /* link the object above us */ - if (op->above) - op->above->below = op->below; + if (above) + above->below = below; else - SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ + map->at (x, y).top = below; /* we were top, set new top */ /* Relink the object below us, if there is one */ - if (op->below) - op->below->above = op->above; + if (below) + below->above = above; else { /* 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 (m, x, y) != op) + if (GET_MAP_OB (map, x, y) != this) { - char *dump = dump_object (op); + char *dump = dump_object (this); LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); free (dump); - dump = dump_object (GET_MAP_OB (m, x, y)); + dump = dump_object (GET_MAP_OB (map, x, y)); LOG (llevError, "%s\n", dump); free (dump); } - SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ + map->at (x, y).bottom = above; /* goes on above it. */ } - op->above = 0; - op->below = 0; + above = 0; + below = 0; - if (op->map->in_memory == MAP_SAVING) + if (map->in_memory == MAP_SAVING) return; - check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); + check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); - for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) + for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) { /* No point updating the players look faces if he is the object * being removed. */ - if (tmp->type == PLAYER && tmp != op) + 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 == op) + if (tmp->container == this) { - CLEAR_FLAG (op, FLAG_APPLIED); - tmp->container = NULL; + CLEAR_FLAG (this, FLAG_APPLIED); + tmp->container = 0; } - tmp->contr->socket.update_look = 1; + tmp->contr->socket->floorbox_update (); } /* See if player moving off should effect something */ if (check_walk_off - && ((op->move_type & tmp->move_off) - && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) + && ((move_type & tmp->move_off) + && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) { - move_apply (tmp, op, NULL); + move_apply (tmp, this, 0); - if (op->destroyed ()) + if (destroyed ()) LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); } /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ if (tmp->above == tmp) - tmp->above = NULL; + tmp->above = 0; last = tmp; } /* last == NULL of there are no objects on this space */ - if (last == NULL) - { - /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, - * we could preserve the flags (GET_MAP_FLAGS), but update_position figures - * those out anyways, and if there are any flags set right now, they won't - * be correct anyways. - */ - SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); - update_position (op->map, op->x, op->y); - } + if (!last) + map->at (x, y).flags_ = P_NEED_UPDATE; else update_object (last, UP_OBJ_REMOVE); - if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) - update_all_los (op->map, op->x, op->y); + if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) + update_all_los (map, x, y); } } @@ -1209,14 +1148,14 @@ { if (top == op) continue; - if (CAN_MERGE (op, top)) + + if (object::can_merge (op, top)) { top->nrof += op->nrof; /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ op->weight = 0; /* Don't want any adjustements now */ - remove_ob (op); - free_object (op); + op->destroy (); return top; } } @@ -1353,11 +1292,10 @@ */ if (op->nrof && !(flag & INS_NO_MERGE)) for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) - if (CAN_MERGE (op, tmp)) + if (object::can_merge (op, tmp)) { op->nrof += tmp->nrof; - remove_ob (tmp); - free_object (tmp); + tmp->destroy (); } CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ @@ -1380,7 +1318,7 @@ if (op->below) op->below->above = op; else - SET_MAP_OB (op->map, op->x, op->y, op); + op->map->at (op->x, op->y).bottom = op; /* since *below* originator, no need to update top */ originator->below = op; @@ -1436,7 +1374,7 @@ * stacking is a bit odd. */ if (!(flag & INS_ON_TOP) && - (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) + (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) { for (last = top; last != floor; last = last->below) if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) @@ -1469,7 +1407,7 @@ op->above->below = op; op->below = NULL; - SET_MAP_OB (op->map, op->x, op->y, op); + op->map->at (op->x, op->y).bottom = op; } else { /* get inserted into the stack above top */ @@ -1483,7 +1421,7 @@ } if (op->above == NULL) - SET_MAP_TOP (op->map, op->x, op->y, op); + op->map->at (op->x, op->y).top = op; } /* else not INS_BELOW_ORIGINATOR */ if (op->type == PLAYER) @@ -1493,9 +1431,8 @@ * it, so save a few ticks and start from there. */ if (!(flag & INS_MAP_LOAD)) - for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) - if (tmp->type == PLAYER) - tmp->contr->socket.update_look = 1; + if (object *pl = op->map->at (op->x, op->y).player ()) + pl->contr->socket->floorbox_update (); /* If this object glows, it may affect lighting conditions that are * visible to others on this map. But update_all_los is really @@ -1513,7 +1450,7 @@ update_object (op, UP_OBJ_INSERT); /* Don't know if moving this to the end will break anything. However, - * we want to have update_look set above before calling this. + * we want to have floorbox_update called before calling this. * * check_move_on() must be after this because code called from * check_move_on() depends on correct map flags (so functions like @@ -1539,27 +1476,19 @@ } /* this function inserts an object in the map, but if it - * finds an object of its own type, it'll remove that one first. - * op is the object to insert it under: supplies x and the map. + * finds an object of its own type, it'll remove that one first. + * op is the object to insert it under: supplies x and the map. */ void replace_insert_ob_in_map (const char *arch_string, object *op) { - object * - tmp; - object * - tmp1; + object *tmp, *tmp1; /* first search for itself and remove any old instances */ for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) - { - if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ - { - remove_ob (tmp); - free_object (tmp); - } - } + if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ + tmp->destroy (); tmp1 = arch_to_object (archetype::find (arch_string)); @@ -1579,10 +1508,8 @@ object * get_split_ob (object *orig_ob, uint32 nr) { - object * - newob; - int - is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); + object *newob; + int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); if (orig_ob->nrof < nr) { @@ -1593,11 +1520,7 @@ newob = object_create_clone (orig_ob); if ((orig_ob->nrof -= nr) < 1) - { - if (!is_removed) - remove_ob (orig_ob); - free_object2 (orig_ob, 1); - } + orig_ob->destroy (1); else if (!is_removed) { if (orig_ob->env != NULL) @@ -1637,12 +1560,12 @@ if (QUERY_FLAG (op, FLAG_REMOVED)) op->nrof -= i; - else if (op->env != NULL) + else if (op->env) { /* is this object in the players inventory, or sub container * therein? */ - tmp = is_player_inv (op->env); + 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 @@ -1653,11 +1576,10 @@ { for (pl = first_player; pl; pl = pl->next) if (pl->ob->container == op->env) - break; - if (pl) - tmp = pl->ob; - else - tmp = NULL; + { + tmp = pl->ob; + break; + } } if (i < op->nrof) @@ -1665,18 +1587,14 @@ sub_weight (op->env, op->weight * i); op->nrof -= i; if (tmp) - { - esrv_send_item (tmp, op); - } + esrv_send_item (tmp, op); } else { - remove_ob (op); + op->remove (); op->nrof = 0; if (tmp) - { - esrv_del_item (tmp->contr, op->count); - } + esrv_del_item (tmp->contr, op->count); } } else @@ -1687,12 +1605,12 @@ op->nrof -= i; else { - remove_ob (op); + op->remove (); op->nrof = 0; } /* Since we just removed op, op->above is null */ - for (tmp = above; tmp != NULL; tmp = tmp->above) + for (tmp = above; tmp; tmp = tmp->above) if (tmp->type == PLAYER) { if (op->nrof) @@ -1706,8 +1624,8 @@ return op; else { - free_object (op); - return NULL; + op->destroy (); + return 0; } } @@ -1729,36 +1647,10 @@ } } -/* - * insert_ob_in_ob(op,environment): - * This function inserts the object op in the linked list - * inside the object environment. - * - * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter - * the inventory at the last position or next to other objects of the same - * type. - * Frank: Now sorted by type, archetype and magic! - * - * The function returns now pointer to inserted item, and return value can - * be != op, if items are merged. -Tero - */ - object * insert_ob_in_ob (object *op, object *where) { - object * - tmp, * - otmp; - - if (!QUERY_FLAG (op, FLAG_REMOVED)) - { - char *dump = dump_object (op); - LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump); - free (dump); - return op; - } - - if (where == NULL) + if (!where) { char *dump = dump_object (op); LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); @@ -1768,10 +1660,30 @@ if (where->head) { - LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); + LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); where = where->head; } + return where->insert (op); +} + +/* + * env->insert (op) + * This function inserts the object op in the linked list + * inside the object environment. + * + * The function returns now pointer to inserted item, and return value can + * be != op, if items are merged. -Tero + */ + +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); @@ -1782,8 +1694,8 @@ CLEAR_FLAG (op, FLAG_REMOVED); if (op->nrof) { - for (tmp = where->inv; tmp != NULL; tmp = tmp->below) - if (CAN_MERGE (tmp, op)) + 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) */ @@ -1791,11 +1703,11 @@ /* Weight handling gets pretty funky. Since we are adding to * tmp->nrof, we need to increase the weight. */ - add_weight (where, op->weight * op->nrof); + add_weight (this, op->weight * op->nrof); SET_FLAG (op, FLAG_REMOVED); - free_object (op); /* free the inserted object */ + op->destroy (); /* free the inserted object */ op = tmp; - remove_ob (op); /* and fix old object's links */ + op->remove (); /* and fix old object's links */ CLEAR_FLAG (op, FLAG_REMOVED); break; } @@ -1806,45 +1718,44 @@ * the weight, so we need to add it in again, since we actually do * the linking below */ - add_weight (where, op->weight * op->nrof); + add_weight (this, op->weight * op->nrof); } else - add_weight (where, (op->weight + op->carrying)); + add_weight (this, (op->weight + op->carrying)); - otmp = is_player_inv (where); - if (otmp && otmp->contr != NULL) - { - if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) - fix_player (otmp); - } - - op->map = NULL; - op->env = where; - op->above = NULL; - op->below = NULL; + otmp = this->in_player (); + if (otmp && otmp->contr) + if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) + fix_player (otmp); + + op->map = 0; + op->env = this; + op->above = 0; + op->below = 0; op->x = 0, op->y = 0; /* reset the light list and los of the players on the map */ - if ((op->glow_radius != 0) && where->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 (where->map)) - update_all_los (where->map, where->x, where->y); + if (MAP_DARKNESS (map)) + 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 (where->inv == NULL) - where->inv = op; + if (!inv) + inv = op; else { - op->below = where->inv; + op->below = inv; op->below->above = op; - where->inv = op; + inv = op; } + return op; } @@ -2167,11 +2078,13 @@ * to only the spaces immediately surrounding the target area, and * won't look 2 spaces south of the target space. */ - else if ((flag & AB_NO_PASS) && maxfree[i] < stop) + else if ((flag & P_NO_PASS) && maxfree[i] < stop) stop = maxfree[i]; } + if (!index) return -1; + return altern[RANDOM () % index]; } @@ -2289,34 +2202,27 @@ ny = y + freearr_y[i]; mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); + if (mflags & P_OUT_OF_MAP) - { - max = maxfree[i]; - } + max = maxfree[i]; else { blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); if ((move_type & blocked) == move_type) - { - max = maxfree[i]; - } + max = maxfree[i]; else if (mflags & P_IS_ALIVE) { - for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) - { - if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) - { - break; - } - } + for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) + if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) + break; + if (tmp) - { - return freedir[i]; - } + return freedir[i]; } } } + return 0; } @@ -2328,8 +2234,7 @@ int distance (const object *ob1, const object *ob2) { - int - i; + int i; i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); return i; @@ -2344,8 +2249,7 @@ int find_dir_2 (int x, int y) { - int - q; + int q; if (y) q = x * 100 / y; @@ -2481,14 +2385,11 @@ * can see a direct way to get it * Modified to be map tile aware -.MSW */ - - int can_see_monsterP (maptile *m, int x, int y, int dir) { sint16 dx, dy; - int - mflags; + int mflags; if (dir < 0) return 0; /* exit condition: invalid direction */ @@ -2511,11 +2412,11 @@ /* yes, can see. */ if (dir < 9) return 1; - return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | - can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); -} - + return can_see_monsterP (m, x, y, reduction_dir[dir][0]) + | can_see_monsterP (m, x, y, reduction_dir[dir][1]) + | can_see_monsterP (m, x, y, reduction_dir[dir][2]); +} /* * can_pick(picker, item): finds out if an object is possible to be @@ -2536,41 +2437,41 @@ !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); } - /* * create clone from object to another */ object * object_create_clone (object *asrc) { - object * - dst = NULL, *tmp, *src, *part, *prev, *item; + object *dst = 0, *tmp, *src, *part, *prev, *item; if (!asrc) - return NULL; + return 0; + src = asrc; if (src->head) src = src->head; - prev = NULL; + prev = 0; for (part = src; part; part = part->more) { - tmp = get_object (); - copy_object (part, tmp); + tmp = part->clone (); tmp->x -= src->x; tmp->y -= src->y; + if (!part->head) { dst = tmp; - tmp->head = NULL; + tmp->head = 0; } else - { - tmp->head = dst; - } - tmp->more = NULL; + tmp->head = dst; + + tmp->more = 0; + if (prev) prev->more = tmp; + prev = tmp; } @@ -2606,7 +2507,7 @@ fprintf (tempfile, obstr); fclose (tempfile); - op = get_object (); + op = object::create (); object_thawer thawer (filename);