--- deliantra/server/common/button.C 2006/09/10 16:00:23 1.7 +++ deliantra/server/common/button.C 2006/12/19 15:30:01 1.16 @@ -1,9 +1,3 @@ - -/* - * static char *rcsid_button_c = - * "$Id: button.C,v 1.7 2006/09/10 16:00:23 root Exp $"; - */ - /* CrossFire, A Multiplayer game for X-windows @@ -24,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 */ #include @@ -47,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 @@ -195,7 +190,7 @@ * */ void -activate_connection (mapstruct *map, long connection, bool state) +activate_connection (maptile *map, long connection, bool state) { if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) return; @@ -226,11 +221,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) { @@ -289,7 +285,7 @@ */ void -update_buttons (mapstruct *m) +update_buttons (maptile *m) { objectlink *ol; oblinkpt *obp; @@ -297,12 +293,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); @@ -366,7 +363,6 @@ return 0; } - /* * operate_altar checks if sacrifice was accepted and removes sacrificed * objects. If sacrifice was succeed return 1 else 0. Might be better to @@ -376,11 +372,9 @@ * If this function returns 1, '*sacrifice' is modified to point to the * remaining sacrifice, or is set to NULL if the sacrifice was used up. */ - int operate_altar (object *altar, object **sacrifice) { - if (!altar->map) { LOG (llevError, "BUG: operate_altar(): altar has no map\n"); @@ -403,6 +397,7 @@ /* Round up any sacrifices. Altars don't make change either */ if (NROF_SACRIFICE (altar) % (*sacrifice)->value) number++; + *sacrifice = decrease_ob_nr (*sacrifice, number); } else @@ -410,6 +405,7 @@ if (altar->msg) new_info_map (NDI_BLACK, altar->map, altar->msg); + return 1; } @@ -604,7 +600,7 @@ } void -add_button_link (object *button, mapstruct *map, int connected) +add_button_link (object *button, maptile *map, int connected) { oblinkpt *obp; objectlink *ol = get_objectlink (); @@ -623,7 +619,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); @@ -659,11 +654,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) @@ -673,9 +670,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); } @@ -684,11 +682,12 @@ * Gets the objectlink for this connection from the map. */ oblinkpt * -get_connection_links (mapstruct *map, long connection) +get_connection_links (maptile *map, long connection) { for (oblinkpt * obp = map->buttons; obp; obp = obp->next) if (obp->value == connection) return obp; + return 0; } @@ -704,10 +703,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; } @@ -725,7 +726,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; } @@ -760,59 +761,56 @@ switch (op->last_sp) { - case 0: /* furious--make all monsters mad */ - if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) - CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); - if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) - { - CLEAR_FLAG (tmp, FLAG_FRIENDLY); - remove_friendly_object (tmp); - tmp->attack_movement = 0; - /* lots of checks here, but want to make sure we don't - * 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 = 0; - } - break; - case 1: /* angry -- get neutral monsters mad */ - if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) - CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); - break; - case 2: /* calm -- pacify unfriendly monsters */ - if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) - SET_FLAG (tmp, FLAG_UNAGGRESSIVE); - break; - case 3: /* make all monsters fall asleep */ - if (!QUERY_FLAG (tmp, FLAG_SLEEP)) - SET_FLAG (tmp, FLAG_SLEEP); - break; - case 4: /* charm all monsters */ - if (op == source) - break; /* only if 'connected' */ - - 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; + case 0: /* furious--make all monsters mad */ + if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) + CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); + if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) + { + CLEAR_FLAG (tmp, FLAG_FRIENDLY); + remove_friendly_object (tmp); + tmp->attack_movement = 0; + /* lots of checks here, but want to make sure we don't + * 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] = 0; - if (tmp2->type != PLAYER) + tmp->owner = 0; + } + break; + case 1: /* angry -- get neutral monsters mad */ + if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) + CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); + break; + case 2: /* calm -- pacify unfriendly monsters */ + if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) + SET_FLAG (tmp, FLAG_UNAGGRESSIVE); + break; + case 3: /* make all monsters fall asleep */ + if (!QUERY_FLAG (tmp, FLAG_SLEEP)) + SET_FLAG (tmp, FLAG_SLEEP); + break; + case 4: /* charm all monsters */ + if (op == source) + break; /* only if 'connected' */ + + 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; - set_owner (tmp, tmp2); - SET_FLAG (tmp, FLAG_MONSTER); - tmp->stats.exp = 0; - SET_FLAG (tmp, FLAG_FRIENDLY); - add_friendly_object (tmp); - tmp->attack_movement = PETMOVE; - break; - default: + if (tmp2->type != PLAYER) break; + 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; + default: + break; } } @@ -830,7 +828,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) @@ -842,7 +841,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; @@ -855,46 +855,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 mapstruct *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); } +