ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/button.C
(Generate patch)

Comparing deliantra/server/common/button.C (file contents):
Revision 1.52 by root, Thu Jan 8 04:35:03 2009 UTC vs.
Revision 1.60 by root, Mon Oct 26 03:43:22 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
33 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set. 34 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
34 * The activator argument can be 0 or the source object for this activation. 35 * The activator argument can be 0 or the source object for this activation.
35 * the originator is the player or monster who did something. 36 * the originator is the player or monster who did something.
36 */ 37 */
37static void 38static void
38activate_connection_link (objectlink *ol, bool state, object *activator, object *originator) 39activate_connection_link (objectlink *ol, int state, object *activator, object *originator)
39{ 40{
40 for (; ol; ol = ol->next) 41 for (; ol; ol = ol->next)
41 { 42 {
42 if (!ol->ob) 43 if (!ol->ob)
43 { 44 {
… …
75 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole")); 76 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
76 tmp->value = tmp->stats.maxsp ? !state : state; 77 tmp->value = tmp->stats.maxsp ? !state : state;
77 tmp->set_speed (0.5); 78 tmp->set_speed (0.5);
78 break; 79 break;
79 80
80 case CF_HANDLE: 81 case T_HANDLE:
81 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 82 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
82 update_object (tmp, UP_OBJ_FACE); 83 update_object (tmp, UP_OBJ_FACE);
83 break; 84 break;
84 85
85 case SIGN: 86 case SIGN:
86 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 87 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
87 { 88 {
88 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign")); 89 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("msg_voice"));
90
91 if (originator && originator->contr)
92 originator->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &tmp->name, &tmp->msg));
93
89 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 94 new_info_map_except (NDI_UNIQUE | NDI_NAVY, tmp->map, originator, tmp->msg);
95
90 if (tmp->stats.food) 96 if (tmp->stats.food)
91 tmp->last_eat++; 97 tmp->last_eat++;
92 } 98 }
93 break; 99 break;
94 100
… …
135 case FIREWALL: 141 case FIREWALL:
136 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 142 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
137 move_firewall (tmp); 143 move_firewall (tmp);
138 else 144 else
139 { 145 {
140 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 146 tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
141 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
142
143 animate_turning (tmp); 147 animate_turning (tmp);
144 } 148 }
145 break; 149 break;
146 150
147 case TELEPORTER: 151 case TELEPORTER:
… …
199 * the connection was 'state' or 'released'. So that you can activate objects 203 * the connection was 'state' or 'released'. So that you can activate objects
200 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 204 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
201 * 205 *
202 */ 206 */
203void 207void
204maptile::trigger (shstr_tmp id, bool state, object *activator, object *originator) 208maptile::trigger (shstr_tmp id, int state, object *activator, object *originator)
205{ 209{
206 if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator))) 210 if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator)))
207 return; 211 return;
208 212
209 if (oblinkpt *obp = find_link (id)) 213 if (oblinkpt *obp = find_link (id))
… …
250 254
251 any_down = any_down || tmp->value; 255 any_down = any_down || tmp->value;
252 } 256 }
253 else if (tmp->type == PEDESTAL) 257 else if (tmp->type == PEDESTAL)
254 { 258 {
259 bool is_match = is_match_expr (tmp->slaying);
255 tmp->value = 0; 260 tmp->value = 0;
256 261
257 for (object *ab = tmp->above; ab; ab = ab->above) 262 for (object *ab = tmp->above; ab; ab = ab->above)
258 { 263 {
259 object *head = ab->head_ (); 264 object *head = ab->head_ ();
260 265
261 /* Same note regarding move_type for buttons above apply here. */ 266 /* Same note regarding move_type for buttons above apply here. */
262 if (((ab->move_type & tmp->move_on) || ab->move_type == 0) 267 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
268 if (is_match
269 ? match (tmp->slaying, head, tmp, originator)
263 && (head->race == tmp->slaying 270 : (head->race == tmp->slaying
264 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying) 271 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
265 || (tmp->slaying == shstr_player && head->type == PLAYER))) 272 || (tmp->slaying == shstr_player && head->type == PLAYER)))
273 {
266 tmp->value = 1; 274 tmp->value = 1;
275 break;
276 }
277 }
278
279 any_down = any_down || tmp->value;
280 }
281 else if (tmp->type == T_MATCH)
282 {
283 tmp->value = 0;
284
285 for (object *ab = tmp->above; ab; ab = ab->above)
286 {
287 object *head = ab->head_ ();
288
289 /* Same note regarding move_type for buttons above apply here. */
290 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
291 if (match (tmp->slaying, head, tmp, originator))
292 {
293 tmp->value = 1;
294 break;
295 }
267 } 296 }
268 297
269 any_down = any_down || tmp->value; 298 any_down = any_down || tmp->value;
270 } 299 }
271 } 300 }
… …
319 * sacrificed. This fixes a bug of trying to put multiple altars/related 348 * sacrificed. This fixes a bug of trying to put multiple altars/related
320 * objects on the same space that take the same sacrifice. 349 * objects on the same space that take the same sacrifice.
321 */ 350 */
322 351
323int 352int
324check_altar_sacrifice (const object *altar, const object *sacrifice) 353check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
325{ 354{
355 if (sacrifice->flag [FLAG_UNPAID])
356 return 0;
357
358 if (is_match_expr (ARCH_SACRIFICE (altar)))
359 return match (ARCH_SACRIFICE (altar), altar, originator);
360
326 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) 361 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
327 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 362 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
328 && sacrifice->type != PLAYER) 363 && sacrifice->type != PLAYER)
329 { 364 {
330 if (ARCH_SACRIFICE (altar) == shstr_money 365 if (ARCH_SACRIFICE (altar) == shstr_money
… …
351 * 386 *
352 * If this function returns 1, '*sacrifice' is modified to point to the 387 * If this function returns 1, '*sacrifice' is modified to point to the
353 * remaining sacrifice, or is set to NULL if the sacrifice was used up. 388 * remaining sacrifice, or is set to NULL if the sacrifice was used up.
354 */ 389 */
355int 390int
356operate_altar (object *altar, object **sacrifice) 391operate_altar (object *altar, object **sacrifice, object *originator)
357{ 392{
358 if (!altar->map) 393 if (!altar->map)
359 { 394 {
360 LOG (llevError, "BUG: operate_altar(): altar has no map\n"); 395 LOG (llevError, "BUG: operate_altar(): altar has no map\n");
361 return 0; 396 return 0;
362 } 397 }
363 398
364 if (!altar->slaying || altar->value) 399 if (!altar->slaying || altar->value)
365 return 0; 400 return 0;
366 401
367 if (!check_altar_sacrifice (altar, *sacrifice)) 402 if (!check_altar_sacrifice (altar, *sacrifice, originator))
368 return 0; 403 return 0;
369 404
370 /* check_altar_sacrifice should have already verified that enough money 405 /* check_altar_sacrifice should have already verified that enough money
371 * has been dropped. 406 * has been dropped.
372 */ 407 */
… …
421 * TRIGGER: Returns 1 if handle could be moved, 0 if not. 456 * TRIGGER: Returns 1 if handle could be moved, 0 if not.
422 * 457 *
423 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0. 458 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
424 */ 459 */
425int 460int
426check_trigger (object *op, object *cause) 461check_trigger (object *op, object *cause, object *originator)
427{ 462{
428 object *tmp; 463 object *tmp;
429 int push = 0, tot = 0; 464 int push = 0, tot = 0;
430 int in_movement = op->stats.wc || op->speed; 465 int in_movement = op->stats.wc || op->speed;
431 466
… …
509 if (cause) 544 if (cause)
510 { 545 {
511 if (in_movement) 546 if (in_movement)
512 return 0; 547 return 0;
513 548
514 if (operate_altar (op, &cause)) 549 if (operate_altar (op, &cause)) /* TODO: originator? */
515 { 550 {
516 if (NUM_ANIMATIONS (op) > 1) 551 if (NUM_ANIMATIONS (op) > 1)
517 { 552 {
518 SET_ANIMATION (op, 1); 553 SET_ANIMATION (op, 1);
519 update_object (op, UP_OBJ_FACE); 554 update_object (op, UP_OBJ_FACE);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines