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.29 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.34 by root, Mon Jun 4 12:19:08 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 GNU General Public License along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <funcpoint.h> 26#include <funcpoint.h>
27 27
… …
110 tmp->stats.sp = 1; 110 tmp->stats.sp = 1;
111 tmp->stats.hp = tmp->stats.maxhp; 111 tmp->stats.hp = tmp->stats.maxhp;
112 /* Handle multipart gates. We copy the value for the other parts 112 /* Handle multipart gates. We copy the value for the other parts
113 * from the head - this ensures that the data will consistent 113 * from the head - this ensures that the data will consistent
114 */ 114 */
115 for (tmp = tmp->more; tmp; tmp = tmp->more) 115 for (object *part = tmp->more; part; part = part->more)
116 { 116 {
117 tmp->value = tmp->head->value; 117 part->value = tmp->value;
118 tmp->stats.sp = tmp->head->stats.sp; 118 part->stats.sp = tmp->stats.sp;
119 tmp->stats.hp = tmp->head->stats.hp; 119 part->stats.hp = tmp->stats.hp;
120 tmp->set_speed (tmp->head->speed); 120 part->set_speed (tmp->speed);
121 } 121 }
122 break; 122 break;
123 123
124 case DIRECTOR: 124 case DIRECTOR:
125 case FIREWALL: 125 case FIREWALL:
… …
127 move_firewall (tmp); 127 move_firewall (tmp);
128 else 128 else
129 { 129 {
130 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 130 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
131 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 131 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
132
132 animate_turning (tmp); 133 animate_turning (tmp);
133 } 134 }
134 break; 135 break;
135 136
136 case TELEPORTER: 137 case TELEPORTER:
… …
250 else if (tmp->type == PEDESTAL) 251 else if (tmp->type == PEDESTAL)
251 { 252 {
252 tmp->value = 0; 253 tmp->value = 0;
253 for (ab = tmp->above; ab != NULL; ab = ab->above) 254 for (ab = tmp->above; ab != NULL; ab = ab->above)
254 { 255 {
255 head = ab->head ? ab->head : ab; 256 head = ab->head_ ();
256 /* Same note regarding move_type for buttons above apply here. */ 257 /* Same note regarding move_type for buttons above apply here. */
257 if (((head->move_type & tmp->move_on) || ab->move_type == 0) && 258 if (((head->move_type & tmp->move_on) || ab->move_type == 0) &&
258 (head->race == tmp->slaying || 259 (head->race == tmp->slaying ||
259 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || 260 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) ||
260 (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) 261 (!strcmp (tmp->slaying, "player") && head->type == PLAYER)))
261 tmp->value = 1; 262 tmp->value = 1;
262 } 263 }
264
263 if (tmp->value) 265 if (tmp->value)
264 any_down = 1; 266 any_down = 1;
265 } 267 }
266 } 268 }
267 if (any_down) /* If any other buttons were down, force this to remain down */ 269 if (any_down) /* If any other buttons were down, force this to remain down */
… …
314int 316int
315check_altar_sacrifice (const object *altar, const object *sacrifice) 317check_altar_sacrifice (const object *altar, const object *sacrifice)
316{ 318{
317 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER) 319 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER)
318 { 320 {
319 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name || 321 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
320 ARCH_SACRIFICE (altar) == sacrifice->name || 322 || ARCH_SACRIFICE (altar) == sacrifice->name
321 ARCH_SACRIFICE (altar) == sacrifice->slaying || 323 || ARCH_SACRIFICE (altar) == sacrifice->slaying
322 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 324 || (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
323 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 325 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
324 return 1; 326 return 1;
325 327
326 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 328 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
327 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 329 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
… …
454 case TRIGGER_PEDESTAL: 456 case TRIGGER_PEDESTAL:
455 if (cause) 457 if (cause)
456 { 458 {
457 for (tmp = op->above; tmp; tmp = tmp->above) 459 for (tmp = op->above; tmp; tmp = tmp->above)
458 { 460 {
459 object *head = tmp->head ? tmp->head : tmp; 461 object *head = tmp->head_ ();
460 462
461 /* See comment in TRIGGER_BUTTON about move_types */ 463 /* See comment in TRIGGER_BUTTON about move_types */
462 if (((head->move_type & op->move_on) || head->move_type == 0) 464 if (((head->move_type & op->move_on) || head->move_type == 0)
463 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) 465 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
464 { 466 {
465 push = 1; 467 push = 1;
466 break; 468 break;
467 } 469 }
468 } 470 }
471
469 if (op->stats.ac == push) 472 if (op->stats.ac == push)
470 return 0; 473 return 0;
474
471 op->stats.ac = push; 475 op->stats.ac = push;
476
472 if (NUM_ANIMATIONS (op) > 1) 477 if (NUM_ANIMATIONS (op) > 1)
473 { 478 {
474 SET_ANIMATION (op, push); 479 SET_ANIMATION (op, push);
475 update_object (op, UP_OBJ_FACE); 480 update_object (op, UP_OBJ_FACE);
476 } 481 }
482
477 update_object (op, UP_OBJ_FACE); 483 update_object (op, UP_OBJ_FACE);
484
478 if (in_movement || !push) 485 if (in_movement || !push)
479 return 0; 486 return 0;
480 } 487 }
488
481 trigger_move (op, push); 489 trigger_move (op, push);
482 return 0; 490 return 0;
483 491
484 case TRIGGER_ALTAR: 492 case TRIGGER_ALTAR:
485 if (cause) 493 if (cause)
486 { 494 {
487 if (in_movement) 495 if (in_movement)
488 return 0; 496 return 0;
497
489 if (operate_altar (op, &cause)) 498 if (operate_altar (op, &cause))
490 { 499 {
491 if (NUM_ANIMATIONS (op) > 1) 500 if (NUM_ANIMATIONS (op) > 1)
492 { 501 {
493 SET_ANIMATION (op, 1); 502 SET_ANIMATION (op, 1);
494 update_object (op, UP_OBJ_FACE); 503 update_object (op, UP_OBJ_FACE);
495 } 504 }
505
496 if (op->last_sp >= 0) 506 if (op->last_sp >= 0)
497 { 507 {
498 trigger_move (op, 1); 508 trigger_move (op, 1);
499 if (op->last_sp > 0) 509 if (op->last_sp > 0)
500 op->last_sp = -op->last_sp; 510 op->last_sp = -op->last_sp;
… …
507 op->value = !op->value; 517 op->value = !op->value;
508 trigger_move (op, 1); 518 trigger_move (op, 1);
509 op->last_sp = -op->last_sp; 519 op->last_sp = -op->last_sp;
510 op->value = !op->value; 520 op->value = !op->value;
511 } 521 }
522
512 return cause == NULL; 523 return cause == NULL;
513 } 524 }
514 else 525 else
515 {
516 return 0; 526 return 0;
517 }
518 } 527 }
519 else 528 else
520 { 529 {
521 if (NUM_ANIMATIONS (op) > 1) 530 if (NUM_ANIMATIONS (op) > 1)
522 { 531 {
… …
741 * dereference a null value 750 * dereference a null value
742 */ 751 */
743 if (tmp->type == GOLEM 752 if (tmp->type == GOLEM
744 && tmp->owner 753 && tmp->owner
745 && tmp->owner->type == PLAYER 754 && tmp->owner->type == PLAYER
746 && tmp->owner->contr->ranges[range_golem] == tmp) 755 && tmp->owner->contr->golem == tmp)
747 tmp->owner->contr->ranges[range_golem] = 0; 756 tmp->owner->contr->golem = 0;
748 757
749 tmp->owner = 0; 758 tmp->owner = 0;
750 759
751 remove_friendly_object (tmp); 760 remove_friendly_object (tmp);
752 } 761 }
… …
779 add_friendly_object (tmp); 788 add_friendly_object (tmp);
780 tmp->attack_movement = PETMOVE; 789 tmp->attack_movement = PETMOVE;
781 } 790 }
782 break; 791 break;
783 792
784 case 6: 793 case 6: // kill monsters
785 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY)) 794 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
786 break; 795 break;
787 796
788 // FALL THROUGH 797 // FALL THROUGH
789 case 5: 798 case 5: // kill all alives
799 if (!tmp->flag [FLAG_PRECIOUS])
800 {
790 get_archetype ("burnout")->insert_at (tmp, source); 801 get_archetype ("burnout")->insert_at (tmp, source);
791 tmp->destroy (); 802 tmp->destroy ();
803 }
792 break; 804 break;
793 805
794 default: 806 default:
795 break; 807 break;
796 } 808 }
… …
808 object *tmp, *ret = NULL; 820 object *tmp, *ret = NULL;
809 821
810 /* First check the object itself. */ 822 /* First check the object itself. */
811 if ((trig->stats.hp && (op->type == trig->stats.hp)) 823 if ((trig->stats.hp && (op->type == trig->stats.hp))
812 || (trig->slaying && (op->slaying == trig->slaying)) 824 || (trig->slaying && (op->slaying == trig->slaying))
813 || (trig->race && (op->arch->name == trig->race))) 825 || (trig->race && (op->arch->archname == trig->race)))
814 return op; 826 return op;
815 827
816 for (tmp = op->inv; tmp; tmp = tmp->below) 828 for (tmp = op->inv; tmp; tmp = tmp->below)
817 { 829 {
818 if (tmp->inv) 830 if (tmp->inv)
… …
821 if (ret) 833 if (ret)
822 return ret; 834 return ret;
823 } 835 }
824 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 836 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
825 || (trig->slaying && (tmp->slaying == trig->slaying)) 837 || (trig->slaying && (tmp->slaying == trig->slaying))
826 || (trig->race && (tmp->arch->name == trig->race))) 838 || (trig->race && (tmp->arch->archname == trig->race)))
827 return tmp; 839 return tmp;
828 } 840 }
829 return NULL; 841 return NULL;
830} 842}
831 843

Diff Legend

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