--- deliantra/server/common/object.C 2006/12/11 21:32:16 1.61 +++ deliantra/server/common/object.C 2006/12/19 05:12:52 1.70 @@ -32,6 +32,8 @@ #include #include +#include + int nrofallocobjects = 0; static UUID uuid; const uint64 UUID_SKIP = 1<<19; @@ -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 @@ -528,49 +526,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; @@ -579,9 +572,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 @@ -592,7 +585,15 @@ } } - update_ob_speed (op); + update_ob_speed (dst); +} + +object * +object::clone () +{ + object *neu = create (); + copy_to (neu); + return neu; } /* @@ -911,7 +912,7 @@ remove_friendly_object (this); if (!QUERY_FLAG (this, FLAG_REMOVED)) - remove_ob (this); + remove (); SET_FLAG (this, FLAG_FREED); @@ -946,11 +947,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; @@ -1017,7 +1018,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 @@ -1137,7 +1138,7 @@ tmp->container = 0; } - tmp->contr->socket.update_look = 1; + tmp->contr->socket->floorbox_update (); } /* See if player moving off should effect something */ @@ -1199,14 +1200,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; } } @@ -1343,11 +1344,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 */ @@ -1485,7 +1485,7 @@ 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; + tmp->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 @@ -1503,7 +1503,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 @@ -1543,13 +1543,8 @@ /* 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)); @@ -1569,10 +1564,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) { @@ -1583,11 +1576,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) @@ -1661,7 +1650,7 @@ } else { - remove_ob (op); + op->remove (); op->nrof = 0; if (tmp) { @@ -1677,7 +1666,7 @@ op->nrof -= i; else { - remove_ob (op); + op->remove (); op->nrof = 0; } @@ -1696,7 +1685,7 @@ return op; else { - free_object (op); + op->destroy (); return NULL; } } @@ -1767,7 +1756,7 @@ if (op->nrof) { for (tmp = inv; tmp != NULL; tmp = tmp->below) - if (CAN_MERGE (tmp, op)) + if (object::can_merge (tmp, op)) { /* return the original object and remove inserted object (client needs the original object) */ @@ -2526,34 +2515,37 @@ 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->more = 0; + if (prev) prev->more = tmp; + prev = tmp; } @@ -2589,7 +2581,7 @@ fprintf (tempfile, obstr); fclose (tempfile); - op = get_object (); + op = object::create (); object_thawer thawer (filename);