--- deliantra/server/common/object.C 2006/09/12 18:15:34 1.35 +++ deliantra/server/common/object.C 2006/12/12 21:39:56 1.64 @@ -1,4 +1,3 @@ - /* CrossFire, A Multiplayer game for X-windows @@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - The authors can be reached via e-mail at crossfire-devel@real-time.com + The authors can be reached via e-mail at */ /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. @@ -34,8 +33,9 @@ #include int nrofallocobjects = 0; +static UUID uuid; +const uint64 UUID_SKIP = 1<<19; -object *objects; /* Pointer to the list of used objects */ object *active_objects; /* List of active objects that need to be processed */ 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, @@ -52,6 +52,83 @@ 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) +{ + 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); +} + +static void +read_uuid (void) +{ + char filename[MAX_BUF]; + + sprintf (filename, "%s/uuid", settings.localdir); + + FILE *fp; + + if (!(fp = fopen (filename, "r"))) + { + if (errno == ENOENT) + { + LOG (llevInfo, "RESET uid to 1\n"); + uuid.seq = 0; + write_uuid (); + return; + } + + LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); + _exit (1); + } + + int version; + unsigned long long uid; + if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) + { + LOG (llevError, "FATAL: error reading uid from %s!\n", filename); + _exit (1); + } + + uuid.seq = uid; + write_uuid (); + LOG (llevDebug, "read UID: %" PRId64 "\n", uid); + fclose (fp); +} + +UUID +gen_uuid () +{ + UUID uid; + + uid.seq = ++uuid.seq; + + if (!(uuid.seq & (UUID_SKIP - 1))) + write_uuid (); + + return uid; +} + +void +init_uuid () +{ + read_uuid (); +} + /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ static int compare_ob_value_lists_one (const object *wants, const object *has) @@ -256,10 +333,13 @@ sum_weight (inv); sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); } + if (op->type == CONTAINER && op->stats.Str) sum = (sum * (100 - op->stats.Str)) / 100; + if (op->carrying != sum) op->carrying = sum; + return sum; } @@ -296,82 +376,15 @@ * The result of the dump is stored in the static global errmsg array. */ -void -dump_object2 (object *op) -{ - errmsg[0] = 0; - return; - //TODO//D#d# -#if 0 - char *cp; - -/* object *tmp;*/ - - if (op->arch != NULL) - { - strcat (errmsg, "arch "); - strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); - strcat (errmsg, "\n"); - if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) - strcat (errmsg, cp); -# if 0 - /* Don't dump player diffs - they are too long, mostly meaningless, and - * will overflow the buffer. - * Changed so that we don't dump inventory either. This may - * also overflow the buffer. - */ - if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) - strcat (errmsg, cp); - for (tmp = op->inv; tmp; tmp = tmp->below) - dump_object2 (tmp); -# endif - strcat (errmsg, "end\n"); - } - else - { - strcat (errmsg, "Object "); - if (op->name == NULL) - strcat (errmsg, "(null)"); - else - strcat (errmsg, op->name); - strcat (errmsg, "\n"); -# if 0 - if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) - strcat (errmsg, cp); - for (tmp = op->inv; tmp; tmp = tmp->below) - dump_object2 (tmp); -# endif - strcat (errmsg, "end\n"); - } -#endif -} - -/* - * Dumps an object. Returns output in the static global errmsg array. - */ - -void +char * dump_object (object *op) { - if (op == NULL) - { - strcpy (errmsg, "[NULL pointer]"); - return; - } - errmsg[0] = '\0'; - dump_object2 (op); -} - -void -dump_all_objects (void) -{ - object *op; + if (!op) + return strdup ("[NULLOBJ]"); - for (op = objects; op != NULL; op = op->next) - { - dump_object (op); - fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); - } + object_freezer freezer; + save_object (freezer, op, 3); + return freezer.as_string (); } /* @@ -401,12 +414,11 @@ object * find_object (tag_t i) { - object *op; - - for (op = objects; op != NULL; op = op->next) + for (object *op = object::first; op; op = op->next) if (op->count == i) - break; - return op; + return op; + + return 0; } /* @@ -421,7 +433,7 @@ shstr_cmp str_ (str); object *op; - for (op = objects; op != NULL; op = op->next) + for (op = object::first; op != NULL; op = op->next) if (op->name == str_) break; @@ -435,27 +447,6 @@ } /* - * Returns the object which this object marks as being the owner. - * A id-scheme is used to avoid pointing to objects which have been - * freed and are now reused. If this is detected, the owner is - * set to NULL, and NULL is returned. - * Changed 2004-02-12 - if the player is setting at the play again - * prompt, he is removed, and we don't want to treat him as an owner of - * anything, so check removed flag. I don't expect that this should break - * anything - once an object is removed, it is basically dead anyways. - */ -object * -object::get_owner () -{ - if (!owner - || QUERY_FLAG (owner, FLAG_FREED) - || QUERY_FLAG (owner, FLAG_REMOVED)) - owner = 0; - - return owner; -} - -/* * Sets the owner and sets the skill and exp pointers to owner's current * skill and experience objects. */ @@ -532,54 +523,49 @@ expmul = 1.0; face = blank_face; - attacked_by_count = -1; if (settings.casting_time) 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); - op2->clone (op); + *(object_copy *)dst = *this; + *(object_pod *)dst = *this; + + 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; @@ -588,9 +574,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 @@ -601,7 +587,7 @@ } } - update_ob_speed (op); + update_ob_speed (dst); } /* @@ -816,6 +802,7 @@ 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. @@ -837,23 +824,20 @@ update_object (op->more, action); } -static unordered_vector mortals; -static std::vector freed; +object::vector object::mortals; +object::vector object::objects; // not yet used +object *object::first; void object::free_mortals () { - for (unordered_vector::iterator i = mortals.begin (); i != mortals.end ();) + for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) if ((*i)->refcnt) ++i; // further delay freeing else { - freed.push_back (*i);//D - //delete *i; + delete *i; mortals.erase (i); } - - if (mortals.size() && 0)//D - LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D } object::object () @@ -862,7 +846,6 @@ expmul = 1.0; face = blank_face; - attacked_by_count = -1; } object::~object () @@ -873,52 +856,33 @@ void object::link () { count = ++ob_count; + uuid = gen_uuid (); prev = 0; - next = objects; + next = object::first; - if (objects) - objects->prev = this; + if (object::first) + object::first->prev = this; - objects = this; + object::first = this; } void object::unlink () { - count = 0; + if (this == object::first) + object::first = next; /* Remove this object from the list of used objects */ - if (prev) - { - prev->next = next; - prev = 0; - } + if (prev) prev->next = next; + if (next) next->prev = prev; - if (next) - { - next->prev = prev; - next = 0; - } - - if (this == objects) - objects = next; + prev = 0; + next = 0; } object *object::create () { - object *op; - - if (freed.empty ()) - op = new object; - else - { - // highly annoying, but the only way to get it stable right now - op = freed.back (); - freed.pop_back (); - op->~object (); - new ((void *) op) object; - } - + object *op = new object; op->link (); return op; } @@ -930,10 +894,10 @@ * The object must have been removed by remove_ob() first for * this function to succeed. * - * If free_inventory is set, free inventory as well. Else drop items in + * If destroy_inventory is set, free inventory as well. Else drop items in * inventory to the ground. */ -void object::free (bool free_inventory) +void object::destroy (bool destroy_inventory) { if (QUERY_FLAG (this, FLAG_FREED)) return; @@ -942,13 +906,13 @@ remove_friendly_object (this); if (!QUERY_FLAG (this, FLAG_REMOVED)) - remove_ob (this); + remove (); SET_FLAG (this, FLAG_FREED); if (more) { - more->free (free_inventory); + more->destroy (destroy_inventory); more = 0; } @@ -958,14 +922,14 @@ * if some form of movement is allowed, let objects * drop on that space. */ - if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) + if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) { object *op = inv; while (op) { object *tmp = op->below; - op->free (free_inventory); + op->destroy (destroy_inventory); op = tmp; } } @@ -977,11 +941,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; @@ -994,7 +958,33 @@ } } - owner = 0; + // 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; + attacked_by = 0; + + // only relevant for players(?), but make sure of it anyways + contr = 0; /* Remove object from the active list */ speed = 0; @@ -1009,22 +999,20 @@ * 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); - } + weight = (signed long) (weight * (100 - op->stats.Str) / 100); + op->carrying -= weight; op = op->env; } } -/* 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 @@ -1032,187 +1020,156 @@ * the previous environment. * Beware: This function is called from the editor as well! */ - void -remove_ob (object *op) +object::remove () { - object * - tmp, * - last = NULL; - object * - otmp; + object *tmp, *last = 0; + object *otmp; - tag_t - tag; - int - check_walk_off; - mapstruct * - m; - - sint16 - x, - y; + int check_walk_off; - 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 = is_player_inv (env)) != NULL && 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; + x = env->x, y = env->y; + map = env->map; + above = 0, below = 0; + env = 0; } - else if (op->map) + else if (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); - /* 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 */ + SET_MAP_TOP (map, x, y, 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) { - 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", errmsg); - dump_object (GET_MAP_OB (m, x, y)); - LOG (llevError, "%s\n", errmsg); + "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 (map, x, y)); + LOG (llevError, "%s\n", dump); + free (dump); } - SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ + SET_MAP_OB (map, x, y, 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; - tag = op->count; - 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; } /* 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)) + if (check_walk_off + && ((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 (was_destroyed (op, tag)) - { - LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); - } + 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) + if (!last) { /* 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); + SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); + update_position (map, x, y); } 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); } } @@ -1224,7 +1181,6 @@ * If top is NULL, it is calculated. * Returns pointer to object if it succeded in the merge, otherwise NULL */ - object * merge_ob (object *op, object *top) { @@ -1244,13 +1200,12 @@ /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ op->weight = 0; /* Don't want any adjustements now */ - remove_ob (op); - free_object (op); + op->destroy (); return top; } } - return NULL; + return 0; } /* @@ -1258,7 +1213,7 @@ * job preparing multi-part monsters */ object * -insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) +insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) { object *tmp; @@ -1296,7 +1251,7 @@ */ object * -insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) +insert_ob_in_map (object *op, maptile *m, object *originator, int flag) { object *tmp, *top, *floor = NULL; sint16 x, y; @@ -1309,15 +1264,16 @@ if (m == NULL) { - dump_object (op); - LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); + char *dump = dump_object (op); + LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); + free (dump); return op; } if (out_of_map (m, op->x, op->y)) { - dump_object (op); - LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); + char *dump = dump_object (op); + LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); #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 @@ -1325,13 +1281,15 @@ */ abort (); #endif + free (dump); return op; } if (!QUERY_FLAG (op, FLAG_REMOVED)) { - dump_object (op); - LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); + char *dump = dump_object (op); + LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); + free (dump); return op; } @@ -1382,8 +1340,7 @@ if (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 */ @@ -1579,15 +1536,10 @@ /* 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 (find_archetype (arch_string)); + tmp1 = arch_to_object (archetype::find (arch_string)); tmp1->x = op->x; tmp1->y = op->y; @@ -1605,10 +1557,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) { @@ -1619,11 +1569,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) @@ -1697,7 +1643,7 @@ } else { - remove_ob (op); + op->remove (); op->nrof = 0; if (tmp) { @@ -1713,7 +1659,7 @@ op->nrof -= i; else { - remove_ob (op); + op->remove (); op->nrof = 0; } @@ -1732,7 +1678,7 @@ return op; else { - free_object (op); + op->destroy (); return NULL; } } @@ -1755,46 +1701,42 @@ } } +object * +insert_ob_in_ob (object *op, object *where) +{ + if (!where) + { + char *dump = dump_object (op); + LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); + free (dump); + return op; + } + + if (where->head) + { + LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); + where = where->head; + } + + return where->insert (op); +} + /* - * insert_ob_in_ob(op,environment): + * env->insert (op) * 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::insert (object *op) { - object * - tmp, * - otmp; + object *tmp, *otmp; if (!QUERY_FLAG (op, FLAG_REMOVED)) - { - dump_object (op); - LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); - return op; - } - - if (where == NULL) - { - dump_object (op); - LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); - return op; - } - - if (where->head) - { - LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); - where = where->head; - } + op->remove (); if (op->more) { @@ -1806,7 +1748,7 @@ CLEAR_FLAG (op, FLAG_REMOVED); if (op->nrof) { - for (tmp = where->inv; tmp != NULL; tmp = tmp->below) + for (tmp = inv; tmp != NULL; tmp = tmp->below) if (CAN_MERGE (tmp, op)) { /* return the original object and remove inserted object @@ -1815,11 +1757,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; } @@ -1830,45 +1772,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); - } + otmp = is_player_inv (this); + if (otmp && otmp->contr) + if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) + fix_player (otmp); op->map = NULL; - op->env = where; + op->env = this; op->above = NULL; op->below = NULL; 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; } @@ -1896,25 +1837,15 @@ int check_move_on (object *op, object *originator) { - object * - tmp; - tag_t - tag; - mapstruct * - m = op->map; - int - x = op->x, y = op->y; + object *tmp; + maptile *m = op->map; + int x = op->x, y = op->y; - MoveType - move_on, - move_slow, - move_block; + MoveType move_on, move_slow, move_block; if (QUERY_FLAG (op, FLAG_NO_APPLY)) return 0; - tag = op->count; - move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); @@ -1984,7 +1915,7 @@ { move_apply (tmp, op, originator); - if (was_destroyed (op, tag)) + if (op->destroyed ()) return 1; /* what the person/creature stepped onto has moved the object @@ -2006,7 +1937,7 @@ */ object * -present_arch (const archetype *at, mapstruct *m, int x, int y) +present_arch (const archetype *at, maptile *m, int x, int y) { object * tmp; @@ -2029,7 +1960,7 @@ */ object * -present (unsigned char type, mapstruct *m, int x, int y) +present (unsigned char type, maptile *m, int x, int y) { object * tmp; @@ -2179,7 +2110,7 @@ */ int -find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) +find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) { int i, @@ -2210,14 +2141,14 @@ } /* - * find_first_free_spot(archetype, mapstruct, x, y) works like + * find_first_free_spot(archetype, maptile, x, y) works like * find_free_spot(), but it will search max number of squares. * But it will return the first available spot, not a random choice. * Changed 0.93.2: Have it return -1 if there is no free spot available. */ int -find_first_free_spot (const object *ob, mapstruct *m, int x, int y) +find_first_free_spot (const object *ob, maptile *m, int x, int y) { int i; @@ -2291,7 +2222,7 @@ */ int -find_dir (mapstruct *m, int x, int y, object *exclude) +find_dir (maptile *m, int x, int y, object *exclude) { int i, @@ -2300,7 +2231,7 @@ sint16 nx, ny; object * tmp; - mapstruct * + maptile * mp; MoveType blocked, move_type; @@ -2518,7 +2449,7 @@ int -can_see_monsterP (mapstruct *m, int x, int y, int dir) +can_see_monsterP (maptile *m, int x, int y, int dir) { sint16 dx, dy; int @@ -2577,89 +2508,74 @@ 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 = object::create (); + part->copy_to (tmp); 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->more = 0; + if (prev) prev->more = tmp; + prev = tmp; } - /*** copy inventory ***/ for (item = src->inv; item; item = item->below) - { - (void) insert_ob_in_ob (object_create_clone (item), dst); - } + insert_ob_in_ob (object_create_clone (item), dst); return dst; } -/* return true if the object was destroyed, 0 otherwise */ -int -was_destroyed (const object *op, tag_t old_tag) -{ - /* checking for FLAG_FREED isn't necessary, but makes this function more - * robust */ - return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); -} - /* GROS - Creates an object using a string representing its content. */ - /* Basically, we save the content of the string to a temp file, then call */ - /* load_object on it. I admit it is a highly inefficient way to make things, */ - /* but it was simple to make and allows reusing the load_object function. */ - /* Remember not to use load_object_str in a time-critical situation. */ - /* Also remember that multiparts objects are not supported for now. */ object * load_object_str (const char *obstr) { - object * - op; - char - filename[MAX_BUF]; + object *op; + char filename[MAX_BUF]; sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); - FILE * - tempfile = fopen (filename, "w"); + FILE *tempfile = fopen (filename, "w"); if (tempfile == NULL) { LOG (llevError, "Error - Unable to access load object temp file\n"); return NULL; - }; + } + fprintf (tempfile, obstr); fclose (tempfile); - op = get_object (); + op = object::create (); object_thawer thawer (filename); @@ -2679,8 +2595,7 @@ object * find_obj_by_type_subtype (const object *who, int type, int subtype) { - object * - tmp; + object *tmp; for (tmp = who->inv; tmp; tmp = tmp->below) if (tmp->type == type && tmp->subtype == subtype) @@ -2698,16 +2613,11 @@ key_value * get_ob_key_link (const object *ob, const char *key) { - key_value * - link; + key_value *link; for (link = ob->key_values; link != NULL; link = link->next) - { - if (link->key == key) - { - return link; - } - } + if (link->key == key) + return link; return NULL; } @@ -2859,3 +2769,32 @@ item = item->env; } +// return a suitable string describing an objetc in enough detail to find it +const char * +object::debug_desc (char *info) const +{ + char info2[256 * 3]; + char *p = info; + + p += snprintf (p, 256, "%d=\"%s%s%s\"", + count, + &name, + title ? " " : "", + title ? (const char *)title : ""); + + if (env) + p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); + + if (map) + p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); + + return info; +} + +const char * +object::debug_desc () const +{ + static char info[256 * 3]; + return debug_desc (info); +} +