--- deliantra/server/common/button.C 2006/09/16 22:24:12 1.11 +++ deliantra/server/common/button.C 2006/12/20 09:14:21 1.17 @@ -41,11 +41,12 @@ for (; ol; ol = ol->next) { - if (!ol->ob || ol->ob->count != ol->id) + if (!ol->ob) { - LOG (llevError, "Internal error in activate_connection_link (%ld).\n", ol->id); + LOG (llevError, "Internal error in activate_connection_link.\n"); continue; } + /* a button link object can become freed when the map is saving. As * a map is saved, objects are removed and freed, and if an object is * on top of a button, this function is eventually called. If a map @@ -206,7 +207,6 @@ * to make sure that all gates and other buttons connected to the * button reacts to the (eventual) change of state. */ - void update_button (object *op) { @@ -220,11 +220,12 @@ if (obp) for (ol = obp->link; ol; ol = ol->next) { - if (!ol->ob || ol->ob->count != ol->id) + if (!ol->ob) { LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); continue; } + tmp = ol->ob; if (tmp->type == BUTTON) { @@ -291,12 +292,13 @@ for (obp = m->buttons; obp; obp = obp->next) for (ol = obp->link; ol; ol = ol->next) { - if (!ol->ob || ol->ob->count != ol->id) + if (!ol->ob) { - LOG (llevError, "Internal error in update_button (%s (%dx%d):%d, connected %ld).\n", - ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, ol->id, obp->value); + LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", + ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); continue; } + if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL) { update_button (ol->ob); @@ -353,10 +355,12 @@ (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) return 1; + if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) return 1; } + return 0; } @@ -616,7 +620,6 @@ SET_FLAG (button, FLAG_IS_LINKED); ol->ob = button; - ol->id = button->count; for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); @@ -652,11 +655,13 @@ LOG (llevError, "remove_button_link() in object without map.\n"); return; } + if (!QUERY_FLAG (op, FLAG_IS_LINKED)) { LOG (llevError, "remove_button_linked() in unlinked object.\n"); return; } + for (obp = op->map->buttons; obp; obp = obp->next) for (olp = &obp->link; (ol = *olp); olp = &ol->next) if (ol->ob == op) @@ -666,9 +671,10 @@ obp->value, op->name, op->map->path); */ *olp = ol->next; - free (ol); + delete ol; return; } + LOG (llevError, "remove_button_linked(): couldn't find object.\n"); CLEAR_FLAG (op, FLAG_IS_LINKED); } @@ -682,6 +688,7 @@ for (oblinkpt * obp = map->buttons; obp; obp = obp->next) if (obp->value == connection) return obp; + return 0; } @@ -697,10 +704,12 @@ if (!button->map) return NULL; + for (obp = button->map->buttons; obp; obp = obp->next) for (ol = obp->link; ol; ol = ol->next) - if (ol->ob == button && ol->id == button->count) + if (ol->ob == button) return obp; + return NULL; } @@ -718,7 +727,7 @@ return 0; for (obp = button->map->buttons; obp; obp = obp->next) for (ol = obp->link; ol; ol = ol->next) - if (ol->ob == button && ol->id == button->count) + if (ol->ob == button) return obp->value; return 0; } @@ -765,10 +774,8 @@ * dereference a null value */ if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) - { - tmp->owner->contr->ranges[range_golem] = NULL; - tmp->owner->contr->golem_count = 0; - } + tmp->owner->contr->ranges[range_golem] = 0; + tmp->owner = 0; } break; @@ -788,17 +795,20 @@ if (op == source) break; /* only if 'connected' */ - for (tmp2 = get_map_ob (source->map, source->x, source->y); /* finding an owner */ + for (tmp2 = GET_MAP_OB (source->map, source->x, source->y); /* finding an owner */ tmp2->type != PLAYER; tmp2 = tmp2->above) if (tmp2->above == NULL) break; if (tmp2->type != PLAYER) break; - set_owner (tmp, tmp2); + + tmp->set_owner (tmp2); SET_FLAG (tmp, FLAG_MONSTER); + tmp->stats.exp = 0; SET_FLAG (tmp, FLAG_FRIENDLY); + add_friendly_object (tmp); tmp->attack_movement = PETMOVE; break; @@ -814,7 +824,6 @@ * race = match object archetype name flag * hp = match object type (excpt type '0'== PLAYER) */ - object * check_inv_recursive (object *op, const object *trig) { @@ -822,7 +831,8 @@ /* First check the object itself. */ if ((trig->stats.hp && (op->type == trig->stats.hp)) - || (trig->slaying && (op->slaying == trig->slaying)) || (trig->race && (op->arch->name == trig->race))) + || (trig->slaying && (op->slaying == trig->slaying)) + || (trig->race && (op->arch->name == trig->race))) return op; for (tmp = op->inv; tmp; tmp = tmp->below) @@ -834,7 +844,8 @@ return ret; } else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) - || (trig->slaying && (tmp->slaying == trig->slaying)) || (trig->race && (tmp->arch->name == trig->race))) + || (trig->slaying && (tmp->slaying == trig->slaying)) + || (trig->race && (tmp->arch->name == trig->race))) return tmp; } return NULL; @@ -847,46 +858,43 @@ * Values are: last_sp = 1/0 obj/no obj triggers * last_heal = 1/0 remove/dont remove obj if triggered * -b.t. (thomas@nomad.astro.psu.edu + * + * Tue Dec 19 15:34:00 CET 2006 elmex: changed the function to ignore op + * because the check-inventory semantic essentially only applies when + * something is above the inventory checker. + * The semantic prior this change was: trigger if something has moved on or off + * and has a matching item. Imagine what happens if someone steps on the inventory + * checker with a matching item, has it, activates the connection, throws the item + * away, and then leaves the inventory checker. That would've caused an always-enabled + * state in the inventory checker. This won't happen anymore now. + * */ void check_inv (object *op, object *trig) { - object *match; + object *match = 0; - if (op->type != PLAYER) - return; - match = check_inv_recursive (op, trig); - if (match && trig->last_sp) - { - if (trig->last_heal) - decrease_ob (match); - use_trigger (trig); - } - else if (!match && !trig->last_sp) - use_trigger (trig); -} + trig->value = 0; // deactivate if none of the following conditions apply + for (object *tmp = trig->above; tmp; tmp = tmp->above) + if (tmp->type == PLAYER) + { + object *match = check_inv_recursive (tmp, trig); -/* This does a minimal check of the button link consistency for object - * map. All it really does it much sure the object id link that is set - * matches what the object has. - */ -void -verify_button_links (const maptile *map) -{ - oblinkpt *obp; - objectlink *ol; + if (match && trig->last_sp) // match == having + { + if (trig->last_heal) + decrease_ob (match); - if (!map) - return; + trig->value = 1; + } + else if (!match && !trig->last_sp) // match == not having + trig->value = 1; - for (obp = map->buttons; obp; obp = obp->next) - { - for (ol = obp->link; ol; ol = ol->next) - { - if (ol->id != ol->ob->count) - LOG (llevError, "verify_button_links: object %s on list is corrupt (%d!=%d)\n", &ol->ob->name, ol->id, ol->ob->count); - } - } + break; + } + + push_button (trig); } +