--- deliantra/server/common/button.C 2009/10/21 00:44:39 1.59 +++ deliantra/server/common/button.C 2009/11/10 20:57:56 1.63 @@ -86,8 +86,13 @@ case SIGN: if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) { - tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign")); - new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); + tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("msg_voice")); + + if (originator && originator->contr) + originator->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &tmp->name, &tmp->msg)); + + new_info_map_except (NDI_UNIQUE | NDI_NAVY, tmp->map, originator, tmp->msg); + if (tmp->stats.food) tmp->last_eat++; } @@ -343,7 +348,6 @@ * sacrificed. This fixes a bug of trying to put multiple altars/related * objects on the same space that take the same sacrifice. */ - int check_altar_sacrifice (object *altar, object *sacrifice, object *originator) { @@ -421,7 +425,7 @@ return 1; } -void +static void trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */ { op->stats.wc = state; @@ -457,7 +461,7 @@ { object *tmp; int push = 0, tot = 0; - int in_movement = op->stats.wc || op->speed; + int in_movement = op->stats.wc || op->has_active_speed (); switch (op->type) {