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.53 by root, Thu Jan 8 19:23:43 2009 UTC vs.
Revision 1.58 by root, Thu Oct 15 21:40:42 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>
… …
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:
… …
248 249
249 any_down = any_down || tmp->value; 250 any_down = any_down || tmp->value;
250 } 251 }
251 else if (tmp->type == PEDESTAL) 252 else if (tmp->type == PEDESTAL)
252 { 253 {
254 bool is_match = is_match_expr (tmp->slaying);
253 tmp->value = 0; 255 tmp->value = 0;
254 256
255 for (object *ab = tmp->above; ab; ab = ab->above) 257 for (object *ab = tmp->above; ab; ab = ab->above)
256 { 258 {
257 object *head = ab->head_ (); 259 object *head = ab->head_ ();
258 260
259 /* Same note regarding move_type for buttons above apply here. */ 261 /* Same note regarding move_type for buttons above apply here. */
260 if (((ab->move_type & tmp->move_on) || ab->move_type == 0) 262 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
263 if (is_match
264 ? match (tmp->slaying, head, tmp, originator)
261 && (head->race == tmp->slaying 265 : (head->race == tmp->slaying
262 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying) 266 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
263 || (tmp->slaying == shstr_player && head->type == PLAYER))) 267 || (tmp->slaying == shstr_player && head->type == PLAYER)))
268 {
264 tmp->value = 1; 269 tmp->value = 1;
270 break;
271 }
265 } 272 }
266 273
267 any_down = any_down || tmp->value; 274 any_down = any_down || tmp->value;
268 } 275 }
269 } 276 }
… …
317 * sacrificed. This fixes a bug of trying to put multiple altars/related 324 * sacrificed. This fixes a bug of trying to put multiple altars/related
318 * objects on the same space that take the same sacrifice. 325 * objects on the same space that take the same sacrifice.
319 */ 326 */
320 327
321int 328int
322check_altar_sacrifice (const object *altar, const object *sacrifice) 329check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
323{ 330{
331 if (sacrifice->flag [FLAG_UNPAID])
332 return 0;
333
334 if (is_match_expr (ARCH_SACRIFICE (altar)))
335 return match (ARCH_SACRIFICE (altar), altar, originator);
336
324 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) 337 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
325 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 338 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
326 && sacrifice->type != PLAYER) 339 && sacrifice->type != PLAYER)
327 { 340 {
328 if (ARCH_SACRIFICE (altar) == shstr_money 341 if (ARCH_SACRIFICE (altar) == shstr_money
… …
349 * 362 *
350 * If this function returns 1, '*sacrifice' is modified to point to the 363 * If this function returns 1, '*sacrifice' is modified to point to the
351 * remaining sacrifice, or is set to NULL if the sacrifice was used up. 364 * remaining sacrifice, or is set to NULL if the sacrifice was used up.
352 */ 365 */
353int 366int
354operate_altar (object *altar, object **sacrifice) 367operate_altar (object *altar, object **sacrifice, object *originator)
355{ 368{
356 if (!altar->map) 369 if (!altar->map)
357 { 370 {
358 LOG (llevError, "BUG: operate_altar(): altar has no map\n"); 371 LOG (llevError, "BUG: operate_altar(): altar has no map\n");
359 return 0; 372 return 0;
360 } 373 }
361 374
362 if (!altar->slaying || altar->value) 375 if (!altar->slaying || altar->value)
363 return 0; 376 return 0;
364 377
365 if (!check_altar_sacrifice (altar, *sacrifice)) 378 if (!check_altar_sacrifice (altar, *sacrifice, originator))
366 return 0; 379 return 0;
367 380
368 /* check_altar_sacrifice should have already verified that enough money 381 /* check_altar_sacrifice should have already verified that enough money
369 * has been dropped. 382 * has been dropped.
370 */ 383 */
… …
419 * TRIGGER: Returns 1 if handle could be moved, 0 if not. 432 * TRIGGER: Returns 1 if handle could be moved, 0 if not.
420 * 433 *
421 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0. 434 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
422 */ 435 */
423int 436int
424check_trigger (object *op, object *cause) 437check_trigger (object *op, object *cause, object *originator)
425{ 438{
426 object *tmp; 439 object *tmp;
427 int push = 0, tot = 0; 440 int push = 0, tot = 0;
428 int in_movement = op->stats.wc || op->speed; 441 int in_movement = op->stats.wc || op->speed;
429 442
… …
507 if (cause) 520 if (cause)
508 { 521 {
509 if (in_movement) 522 if (in_movement)
510 return 0; 523 return 0;
511 524
512 if (operate_altar (op, &cause)) 525 if (operate_altar (op, &cause)) /* TODO: originator? */
513 { 526 {
514 if (NUM_ANIMATIONS (op) > 1) 527 if (NUM_ANIMATIONS (op) > 1)
515 { 528 {
516 SET_ANIMATION (op, 1); 529 SET_ANIMATION (op, 1);
517 update_object (op, UP_OBJ_FACE); 530 update_object (op, UP_OBJ_FACE);

Diff Legend

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