--- deliantra/server/common/button.C 2008/05/04 18:24:11 1.46
+++ deliantra/server/common/button.C 2010/04/11 00:34:05 1.66
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
*
- * Deliantra 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 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 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, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -31,10 +32,11 @@
* elmex:
* This function takes a objectlink list with all the objects are going to be activated.
* state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
- * The source argument can be 0 or the source object for this activation.
+ * The activator argument can be 0 or the source object for this activation.
+ * the originator is the player or monster who did something.
*/
-void
-activate_connection_link (objectlink * ol, bool state, object *source = 0)
+static void
+activate_connection_link (objectlink *ol, int state, object *activator, object *originator)
{
for (; ol; ol = ol->next)
{
@@ -52,16 +54,16 @@
* re-loaded. As such, just exit this function if that is the case.
*/
- if (QUERY_FLAG (ol->ob, FLAG_FREED))
+ if (ol->ob->flag [FLAG_FREED])
return;
object *tmp = ol->ob;
/* if the criteria isn't appropriate, don't do anything */
- if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
+ if (state && !tmp->flag [FLAG_ACTIVATE_ON_PUSH])
continue;
- if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
+ if (!state && !tmp->flag [FLAG_ACTIVATE_ON_RELEASE])
continue;
switch (tmp->type)
@@ -76,7 +78,7 @@
tmp->set_speed (0.5);
break;
- case CF_HANDLE:
+ case T_HANDLE:
SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
update_object (tmp, UP_OBJ_FACE);
break;
@@ -84,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++;
}
@@ -107,12 +114,13 @@
break;
case MOOD_FLOOR:
- do_mood_floor (tmp, source);
+ do_mood_floor (tmp, activator);
break;
case TIMED_GATE:
if (!tmp->active)
tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
+
tmp->set_speed (tmp->arch->speed);
tmp->value = tmp->arch->value;
tmp->stats.sp = 1;
@@ -131,13 +139,11 @@
case DIRECTOR:
case FIREWALL:
- if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
+ if (!tmp->flag [FLAG_ANIMATE] && tmp->type == FIREWALL)
move_firewall (tmp);
else
{
- if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
- tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
-
+ tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
animate_turning (tmp);
}
break;
@@ -158,6 +164,10 @@
case DUPLICATOR:
move_duplicator (tmp);
break;
+
+ case MAPSCRIPT:
+ cfperl_mapscript_activate (tmp, state, activator, originator);
+ break;
}
}
}
@@ -175,17 +185,15 @@
*
*/
void
-push_button (object *op)
+push_button (object *op, object *originator)
{
- oblinkpt *obp = get_button_links (op);
-
- if (!obp)
- return;
-
- if (INVOKE_MAP (TRIGGER, op->map, ARG_INT64 (obp->value), ARG_INT (op->value)))
- return;
+ if (oblinkpt *obp = op->find_link ())
+ {
+ if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value), ARG_OBJECT (op), ARG_OBJECT (originator)))
+ return;
- activate_connection_link (obp->link, op->value, op);
+ activate_connection_link (obp->link, op->value, op, originator);
+ }
}
/*
@@ -197,15 +205,13 @@
*
*/
void
-activate_connection (maptile *map, long connection, bool state)
+maptile::trigger (shstr_tmp id, int state, object *activator, object *originator)
{
- if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state)))
+ if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator)))
return;
- oblinkpt *obp = get_connection_links (map, connection);
-
- if (obp)
- activate_connection_link (obp->link, state);
+ if (oblinkpt *obp = find_link (id))
+ activate_connection_link (obp->link, state, activator, originator);
}
/*
@@ -215,15 +221,12 @@
* button reacts to the (eventual) change of state.
*/
void
-update_button (object *op)
+update_button (object *op, object *originator)
{
int any_down = 0, old_value = op->value;
- oblinkpt *obp = 0;
- objectlink *ol;
- obp = get_button_links (op);
- if (obp)
- for (ol = obp->link; ol; ol = ol->next)
+ if (oblinkpt *obp = op->find_link ())
+ for (objectlink *ol = obp->link; ol; ol = ol->next)
{
if (!ol->ob)
{
@@ -253,6 +256,7 @@
}
else if (tmp->type == PEDESTAL)
{
+ bool is_match = is_match_expr (tmp->slaying);
tmp->value = 0;
for (object *ab = tmp->above; ab; ab = ab->above)
@@ -260,11 +264,35 @@
object *head = ab->head_ ();
/* Same note regarding move_type for buttons above apply here. */
- if (((ab->move_type & tmp->move_on) || ab->move_type == 0)
- && (head->race == tmp->slaying
- || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
- || (tmp->slaying == shstr_player && head->type == PLAYER)))
- tmp->value = 1;
+ if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
+ if (is_match
+ ? match (tmp->slaying, head, tmp, originator)
+ : (head->race == tmp->slaying
+ || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
+ || (tmp->slaying == shstr_player && head->type == PLAYER)))
+ {
+ tmp->value = 1;
+ break;
+ }
+ }
+
+ any_down = any_down || tmp->value;
+ }
+ else if (tmp->type == T_MATCH)
+ {
+ tmp->value = 0;
+
+ for (object *ab = tmp->above; ab; ab = ab->above)
+ {
+ object *head = ab->head_ ();
+
+ /* Same note regarding move_type for buttons above apply here. */
+ if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
+ if (match (tmp->slaying, head, tmp, originator))
+ {
+ tmp->value = 1;
+ break;
+ }
}
any_down = any_down || tmp->value;
@@ -281,16 +309,17 @@
{
SET_ANIMATION (op, op->value);
update_object (op, UP_OBJ_FACE);
- push_button (op); /* Make all other buttons the same */
+ push_button (op, originator); /* Make all other buttons the same */
}
}
void
-use_trigger (object *op)
+use_trigger (object *op, object *originator)
{
/* Toggle value */
op->value = !op->value;
- push_button (op);
+
+ push_button (op, originator);
}
/*
@@ -319,12 +348,17 @@
* 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 (const object *altar, const object *sacrifice)
+check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
{
- if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
- && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
+ if (sacrifice->flag [FLAG_UNPAID])
+ return 0;
+
+ if (is_match_expr (ARCH_SACRIFICE (altar)))
+ return match (ARCH_SACRIFICE (altar), altar, originator);
+
+ if (!sacrifice->flag [FLAG_ALIVE]
+ && !sacrifice->flag [FLAG_IS_LINKED]
&& sacrifice->type != PLAYER)
{
if (ARCH_SACRIFICE (altar) == shstr_money
@@ -353,7 +387,7 @@
* remaining sacrifice, or is set to NULL if the sacrifice was used up.
*/
int
-operate_altar (object *altar, object **sacrifice)
+operate_altar (object *altar, object **sacrifice, object *originator)
{
if (!altar->map)
{
@@ -364,7 +398,7 @@
if (!altar->slaying || altar->value)
return 0;
- if (!check_altar_sacrifice (altar, *sacrifice))
+ if (!check_altar_sacrifice (altar, *sacrifice, originator))
return 0;
/* check_altar_sacrifice should have already verified that enough money
@@ -391,19 +425,20 @@
return 1;
}
-void
-trigger_move (object *op, int state) /* 1 down and 0 up */
+static void
+trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */
{
op->stats.wc = state;
+
if (state)
{
- use_trigger (op);
+ use_trigger (op, originator);
op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
op->speed_left = -1;
}
else
{
- use_trigger (op);
+ use_trigger (op, originator);
op->set_speed (0);
}
}
@@ -422,11 +457,11 @@
* TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
*/
int
-check_trigger (object *op, object *cause)
+check_trigger (object *op, object *cause, object *originator)
{
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)
{
@@ -462,7 +497,8 @@
if (in_movement || !push)
return 0;
}
- trigger_move (op, push);
+
+ trigger_move (op, push, cause);
}
return 0;
@@ -476,7 +512,7 @@
/* See comment in TRIGGER_BUTTON about move_types */
if (((head->move_type & op->move_on) || head->move_type == 0)
- && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
+ && (head->race == op->slaying || (op->slaying == shstr_player && head->type == PLAYER)))
{
push = 1;
break;
@@ -500,7 +536,7 @@
return 0;
}
- trigger_move (op, push);
+ trigger_move (op, push, cause);
return 0;
case TRIGGER_ALTAR:
@@ -509,7 +545,7 @@
if (in_movement)
return 0;
- if (operate_altar (op, &cause))
+ if (operate_altar (op, &cause)) /* TODO: originator? */
{
if (NUM_ANIMATIONS (op) > 1)
{
@@ -519,7 +555,8 @@
if (op->last_sp >= 0)
{
- trigger_move (op, 1);
+ trigger_move (op, 1, cause);
+
if (op->last_sp > 0)
op->last_sp = -op->last_sp;
}
@@ -529,7 +566,7 @@
* status (-> +/- value) is "simulated":
*/
op->value = !op->value;
- trigger_move (op, 1);
+ trigger_move (op, 1, cause);
op->last_sp = -op->last_sp;
op->value = !op->value;
}
@@ -553,7 +590,7 @@
* pushed twice: First by sacrifice, second by reset! -AV
*/
if (!op->last_sp)
- trigger_move (op, 0);
+ trigger_move (op, 0, cause);
else
{
op->stats.wc = 0;
@@ -578,7 +615,7 @@
update_object (op, UP_OBJ_FACE);
}
- trigger_move (op, push);
+ trigger_move (op, push, cause);
return 1;
default:
@@ -588,133 +625,118 @@
}
void
-add_button_link (object *button, maptile *map, int connected)
+object::add_link (maptile *map, shstr_tmp id)
{
- oblinkpt *obp;
- objectlink *ol = get_objectlink ();
-
if (!map)
{
LOG (llevError, "Tried to add button-link without map.\n");
return;
}
- button->path_attuned = connected; /* peterm: I need this so I can rebuild
- a connected map from a template map. */
+ flag [FLAG_IS_LINKED] = true;
- SET_FLAG (button, FLAG_IS_LINKED);
-
- ol->ob = button;
+ objectlink *ol = get_objectlink ();
+ ol->ob = this;
- for (obp = map->buttons; obp && obp->value != connected; obp = obp->next)
- ;
+ for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
+ if (obp->id == id)
+ {
+ ol->next = obp->link;
+ obp->link = ol;
+ return;
+ }
- if (obp)
- {
- ol->next = obp->link;
- obp->link = ol;
- }
- else
- {
- obp = get_objectlinkpt ();
- obp->value = connected;
+ oblinkpt *obp = get_objectlinkpt ();
+ obp->id = id;
- obp->next = map->buttons;
- map->buttons = obp;
- obp->link = ol;
- }
+ obp->next = map->buttons;
+ map->buttons = obp;
+ obp->link = ol;
}
/*
* Remove the object from the linked lists of buttons in the map.
* This is only needed by editors.
*/
-
void
-remove_button_link (object *op)
+object::remove_link ()
{
- oblinkpt *obp;
- objectlink **olp, *ol;
-
- if (op->map == NULL)
+ if (!map)
{
LOG (llevError, "remove_button_link() in object without map.\n");
return;
}
- if (!QUERY_FLAG (op, FLAG_IS_LINKED))
+ if (!flag [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)
- {
+ flag [FLAG_IS_LINKED] = false;
-/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
- obp->value, op->name, op->map->path);
-*/
+ for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
+ for (objectlink **olp = &obp->link; *olp; olp = &(*olp)->next)
+ if ((*olp)->ob == this)
+ {
+ objectlink *ol = *olp;
*olp = ol->next;
delete ol;
return;
}
LOG (llevError, "remove_button_linked(): couldn't find object.\n");
- CLEAR_FLAG (op, FLAG_IS_LINKED);
}
/*
- * Gets the objectlink for this connection from the map.
+ * Updates every button on the map (by calling update_button() for them).
*/
-oblinkpt *
-get_connection_links (maptile *map, long connection)
+void
+maptile::update_buttons ()
{
- for (oblinkpt * obp = map->buttons; obp; obp = obp->next)
- if (obp->value == connection)
- return obp;
+ for (oblinkpt *obp = buttons; obp; obp = obp->next)
+ for (objectlink *ol = obp->link; ol; ol = ol->next)
+ {
+ if (!ol->ob)
+ {
+ 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->id);
+ continue;
+ }
- return 0;
+ if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
+ {
+ update_button (ol->ob, 0);
+ break;
+ }
+ }
}
/*
- * Return the first objectlink in the objects linked to this one
+ * Gets the objectlink for this connection from the map.
*/
-
oblinkpt *
-get_button_links (const object *button)
+maptile::find_link (shstr_tmp id)
{
- oblinkpt *obp;
- objectlink *ol;
-
- 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)
- return obp;
+ for (oblinkpt *obp = buttons; obp; obp = obp->next)
+ if (obp->id == id)
+ return obp;
- return NULL;
+ return 0;
}
/*
- * Made as a separate function to increase efficiency
+ * Return the first objectlink in the objects linked to this one
*/
-
-int
-get_button_value (const object *button)
+oblinkpt *
+object::find_link () const
{
- oblinkpt *obp;
- objectlink *ol;
+ if (map)
+ for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
+ for (objectlink *ol = obp->link; ol; ol = ol->next)
+ if (ol->ob == this)
+ return obp;
- if (!button->map)
- return 0;
- for (obp = button->map->buttons; obp; obp = obp->next)
- for (ol = obp->link; ol; ol = ol->next)
- if (ol->ob == button)
- return obp->value;
return 0;
}
@@ -726,7 +748,6 @@
* but the charm floor type).
* by b.t. thomas@nomad.astro.psu.edu
*/
-
void
do_mood_floor (object *op, object *source)
{
@@ -741,7 +762,7 @@
object *tmp;
for (tmp = ms.top; tmp; tmp = tmp->below)
- if (QUERY_FLAG (tmp, FLAG_MONSTER))
+ if (tmp->flag [FLAG_MONSTER])
break;
/* doesn't effect players, and if there is a player on this space, won't also
@@ -754,10 +775,10 @@
switch (op->last_sp)
{
case 0: /* furious--make all monsters mad */
- if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
- CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
+ if (tmp->flag [FLAG_UNAGGRESSIVE])
+ tmp->clr_flag (FLAG_UNAGGRESSIVE);
- if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
+ if (tmp->flag [FLAG_FRIENDLY])
{
tmp->attack_movement = 0;
/* lots of checks here, but want to make sure we don't
@@ -776,16 +797,16 @@
break;
case 1: /* angry -- get neutral monsters mad */
- if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
- CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
+ if (tmp->flag [FLAG_UNAGGRESSIVE] && !tmp->flag [FLAG_FRIENDLY])
+ tmp->clr_flag (FLAG_UNAGGRESSIVE);
break;
case 2: /* calm -- pacify unfriendly monsters */
- SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
+ tmp->set_flag (FLAG_UNAGGRESSIVE);
break;
case 3: /* make all monsters fall asleep */
- SET_FLAG (tmp, FLAG_SLEEP);
+ tmp->set_flag (FLAG_SLEEP);
break;
case 4: /* charm all monsters */
@@ -795,7 +816,7 @@
if (object *pl = source->ms ().player ())
{
tmp->set_owner (pl);
- SET_FLAG (tmp, FLAG_MONSTER);
+ tmp->set_flag (FLAG_MONSTER);
tmp->stats.exp = 0;
@@ -805,7 +826,7 @@
break;
case 6: // kill monsters
- if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
+ if (!tmp->flag [FLAG_FRIENDLY])
break;
// FALL THROUGH
@@ -900,12 +921,12 @@
match->decrease ();
trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
- push_button (trig);
+ push_button (trig, op);
}
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);
+ push_button (trig, op);
}
}