--- deliantra/server/common/object.C 2008/05/06 20:08:37 1.236 +++ deliantra/server/common/object.C 2008/07/14 23:47:06 1.248 @@ -208,7 +208,7 @@ if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) SET_FLAG (ob2, FLAG_BEEN_APPLIED); - if (ob1->arch->name != ob2->arch->name + if (ob1->arch->archname != ob2->arch->archname || ob1->name != ob2->name || ob1->title != ob2->title || ob1->msg != ob2->msg @@ -219,6 +219,7 @@ || ob1->skill != ob2->skill || ob1->value != ob2->value || ob1->animation_id != ob2->animation_id + || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other || ob1->client_type != ob2->client_type || ob1->materialname != ob2->materialname || ob1->lore != ob2->lore @@ -346,7 +347,8 @@ // maybe there is a player standing on the same mapspace // this will catch the case where "this" is a player if (object *pl = ms ().player ()) - if (!pl->container || this == pl->container) + if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) + || this == pl->container) return pl; } } @@ -480,13 +482,13 @@ find_object_name (const char *str) { shstr_cmp str_ (str); - object *op; - for_all_objects (op) - if (op->name == str_) - break; + if (str_) + for_all_objects (op) + if (op->name == str_) + return op; - return op; + return 0; } /* @@ -906,7 +908,7 @@ if (!drop_to_ground || !map || map->in_memory != MAP_ACTIVE - || map->nodrop + || map->no_drop || ms ().move_block == MOVE_ALL) { while (inv) @@ -945,11 +947,12 @@ { freed_map () { - path = ""; - name = "/internal/freed_objects_map"; - width = 3; - height = 3; - nodrop = 1; + path = ""; + name = "/internal/freed_objects_map"; + width = 3; + height = 3; + no_drop = 1; + no_reset = 1; alloc (); in_memory = MAP_ACTIVE; @@ -1059,14 +1062,6 @@ adjust_weight (env, -total_weight ()); - // make sure cmov optimisation is applicable - *(above ? &above->below : &env->inv) = below; - *(below ? &below->above : &above ) = above; // &above is just a dummy - - above = 0; - below = 0; - env = 0; - /* 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. @@ -1075,6 +1070,14 @@ x = env->x; y = env->y; + // make sure cmov optimisation is applicable + *(above ? &above->below : &env->inv) = below; + *(below ? &below->above : &above ) = above; // &above is just a dummy + + above = 0; + below = 0; + env = 0; + /* 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. @@ -1237,6 +1240,8 @@ object * insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) { + op->remove (); + for (object *tmp = op->head_ (); tmp; tmp = tmp->more) { tmp->x = x + tmp->arch->x; @@ -1269,9 +1274,23 @@ object * insert_ob_in_map (object *op, maptile *m, object *originator, int flag) { - assert (!op->flag [FLAG_FREED]); + if (op->is_on_map ()) + { + LOG (llevError, "insert_ob_in_map called for object already on map"); + abort (); + } - op->remove (); + if (op->env) + { + LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); + op->remove (); + } + + if (op->face && !face_info (op->face))//D TODO: remove soon + {//D + LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D + op->face = 1;//D + }//D /* Ideally, the caller figures this out. However, it complicates a lot * of areas of callers (eg, anything that uses find_free_spot would now @@ -1298,7 +1317,7 @@ for (object *tmp = ms.bot; tmp; tmp = tmp->above) if (object::can_merge (op, tmp)) { - // TODO: we atcually want to update tmp, not op, + // TODO: we actually want to update tmp, not op, // but some caller surely breaks when we return tmp // from here :/ op->nrof += tmp->nrof; @@ -1319,28 +1338,24 @@ abort (); } + if (!originator->is_on_map ()) + LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", + op->debug_desc (), originator->debug_desc ()); + op->above = originator; op->below = originator->below; - - if (op->below) - op->below->above = op; - else - ms.bot = op; - - /* since *below* originator, no need to update top */ originator->below = op; + + *(op->below ? &op->below->above : &ms.bot) = op; } else { - object *top, *floor = NULL; - - top = ms.bot; + object *floor = 0; + object *top = ms.top; /* If there are other objects, then */ if (top) { - object *last = 0; - /* * If there are multiple objects on this space, we do some trickier handling. * We've already dealt with merging if appropriate. @@ -1353,24 +1368,21 @@ * when lots of spells are cast in one area. Currently, it is presumed * that flying non pickable objects are spell objects. */ - for (top = ms.bot; top; top = top->above) + for (object *tmp = ms.bot; tmp; tmp = tmp->above) { - if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) - floor = top; + if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) + floor = tmp; - if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) + if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) { /* We insert above top, so we want this object below this */ - top = top->below; + top = tmp->below; break; } - last = top; + top = tmp; } - /* Don't want top to be NULL, so set it to the last valid object */ - top = last; - /* We let update_position deal with figuring out what the space * looks like instead of lots of conditions here. * makes things faster, and effectively the same result. @@ -1386,6 +1398,8 @@ && ms.flags () & P_BLOCKSVIEW && (op->face && !faces [op->face].visibility)) { + object *last; + for (last = top; last != floor; last = last->below) if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) break; @@ -1403,34 +1417,24 @@ if (flag & INS_ABOVE_FLOOR_ONLY) top = floor; - /* Top is the object that our object (op) is going to get inserted above. - */ - - /* First object on this space */ + // insert object above top, or bottom-most if top = 0 if (!top) { - op->above = ms.bot; - - if (op->above) - op->above->below = op; - op->below = 0; + op->above = ms.bot; ms.bot = op; + + *(op->above ? &op->above->below : &ms.top) = op; } else - { /* get inserted into the stack above top */ + { op->above = top->above; - - if (op->above) - op->above->below = op; + top->above = op; op->below = top; - top->above = op; + *(op->above ? &op->above->below : &ms.top) = op; } - - if (!op->above) - ms.top = op; - } /* else not INS_BELOW_ORIGINATOR */ + } if (op->type == PLAYER) { @@ -1540,7 +1544,7 @@ if (nrof) { - adjust_weight (env, -weight * nr); // carrying == 0 + adjust_weight (env, -weight * max (1, nr)); // carrying == 0 if (object *pl = visible_to ()) esrv_update_item (UPD_NROF, pl, this); @@ -2435,12 +2439,13 @@ char info2[256 * 4]; char *p = info; - p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", + p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", count, uuid.c_str (), &name, - title ? "\",title:\"" : "", + title ? ",title:\"" : "", title ? (const char *)title : "", + title ? "\"" : "", flag_desc (flagdesc, 512), type); if (!flag[FLAG_REMOVED] && env)