--- deliantra/server/common/button.C 2006/12/19 15:30:01 1.16 +++ deliantra/server/common/button.C 2006/12/20 09:14:21 1.17 @@ -207,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) { @@ -356,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; } @@ -794,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; + 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; @@ -820,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) {