--- deliantra/server/common/button.C 2007/01/09 22:14:29 1.25 +++ deliantra/server/common/button.C 2007/04/28 17:51:57 1.30 @@ -1,26 +1,26 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - 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, A Multiplayer game + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002 Mark Wedel & Crossfire Development Team + * Copyright (C) 1992 Frank Tore Johansen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * 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 + */ #include #include @@ -707,19 +707,24 @@ void do_mood_floor (object *op, object *source) { - object *tmp; - object *tmp2; - if (!source) source = op; - for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) + mapspace &ms = op->ms (); + + if (!(ms.flags () & P_IS_ALIVE)) + return; + + object *tmp; + + for (tmp = ms.top; tmp; tmp = tmp->below) if (QUERY_FLAG (tmp, FLAG_MONSTER)) break; /* doesn't effect players, and if there is a player on this space, won't also * be a monster here. */ + //TODO: have players really FLAG_MONSTER? kept it for safety if (!tmp || tmp->type == PLAYER) return; @@ -728,51 +733,65 @@ 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) + if (tmp->type == GOLEM + && tmp->owner + && tmp->owner->type == PLAYER + && tmp->owner->contr->ranges[range_golem] == tmp) tmp->owner->contr->ranges[range_golem] = 0; tmp->owner = 0; + + remove_friendly_object (tmp); } 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); + SET_FLAG (tmp, FLAG_UNAGGRESSIVE); break; + case 3: /* make all monsters fall asleep */ - if (!QUERY_FLAG (tmp, FLAG_SLEEP)) - SET_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; + if (object *pl = source->ms ().player ()) + { + tmp->set_owner (pl); + SET_FLAG (tmp, FLAG_MONSTER); - if (tmp2->type != PLAYER) - break; + tmp->stats.exp = 0; - tmp->set_owner (tmp2); - SET_FLAG (tmp, FLAG_MONSTER); + add_friendly_object (tmp); + tmp->attack_movement = PETMOVE; + } + break; - tmp->stats.exp = 0; + case 6: // kill monsters + if (!QUERY_FLAG (tmp, FLAG_FRIENDLY)) + break; - add_friendly_object (tmp); - tmp->attack_movement = PETMOVE; + // FALL THROUGH + case 5: // kill all alives + if (!tmp->flag [FLAG_PRECIOUS]) + { + get_archetype ("burnout")->insert_at (tmp, source); + tmp->destroy (); + } break; default: @@ -830,27 +849,40 @@ * 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. * + * Wed Jan 10 11:34:26 CET 2007 elmex: fixed this function, we now check + * whether op is on this mapspace or not, because the value (1|0) depends + * on this information. also make sure to only push_button if op has + * a matching item (because when we do a push_button with value=0 timed gates + * will still open)! (i hope i got the semantics right this time) + * */ void check_inv (object *op, object *trig) { trig->value = 0; // deactivate if none of the following conditions apply - if (object *pl = trig->ms ().player ()) - { - object *match = check_inv_recursive (pl, trig); + object *pl = trig->ms ().player (); + object *match = check_inv_recursive (op, trig); - if (match && trig->last_sp) // match == having - { - if (trig->last_heal) - decrease_ob (match); + // elmex: a note about (pl == op): + // if pl == 0 then the player has left this space + // if pl != 0 then a player is on this mapspace, but then + // we still have to check whether it's the player that triggered + // this inv-checker, because if not, then the op left this inv-checker + // and we have to set the value to 0 - trig->value = 1; - } - else if (!match && !trig->last_sp) // match == not having - trig->value = 1; - } + if (match && trig->last_sp) // match == having + { + if (trig->last_heal) + decrease_ob (match); - push_button (trig); + trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left + push_button (trig); + } + else if (!match && !trig->last_sp) // match == not having + { + trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left + push_button (trig); + } }