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.31 by root, Mon Apr 30 04:25:29 2007 UTC vs.
Revision 1.39 by root, Mon Aug 27 01:13:48 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <funcpoint.h> 25#include <funcpoint.h>
27 26
… …
60 object *tmp = ol->ob; 59 object *tmp = ol->ob;
61 60
62 /* if the criteria isn't appropriate, don't do anything */ 61 /* if the criteria isn't appropriate, don't do anything */
63 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) 62 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
64 continue; 63 continue;
64
65 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) 65 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
66 continue; 66 continue;
67 67
68 switch (tmp->type) 68 switch (tmp->type)
69 { 69 {
70 case GATE: 70 case GATE:
71 case HOLE: 71 case HOLE:
72 if (!tmp->active)
73 tmp->play_sound (tmp->sound
74 ? tmp->sound
75 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
72 tmp->value = tmp->stats.maxsp ? !state : state; 76 tmp->value = tmp->stats.maxsp ? !state : state;
73 tmp->set_speed (0.5); 77 tmp->set_speed (0.5);
74 break; 78 break;
75 79
76 case CF_HANDLE: 80 case CF_HANDLE:
… …
79 break; 83 break;
80 84
81 case SIGN: 85 case SIGN:
82 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 86 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
83 { 87 {
88 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign"));
84 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 89 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
85 if (tmp->stats.food) 90 if (tmp->stats.food)
86 tmp->last_eat++; 91 tmp->last_eat++;
87 } 92 }
88 break; 93 break;
89 94
90 case ALTAR: 95 case ALTAR:
96 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar"));
91 tmp->value = 1; 97 tmp->value = 1;
92 SET_ANIMATION (tmp, tmp->value); 98 SET_ANIMATION (tmp, tmp->value);
93 update_object (tmp, UP_OBJ_FACE); 99 update_object (tmp, UP_OBJ_FACE);
94 break; 100 break;
95 101
96 case BUTTON: 102 case BUTTON:
97 case PEDESTAL: 103 case PEDESTAL:
104 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button"));
98 tmp->value = state; 105 tmp->value = state;
99 SET_ANIMATION (tmp, tmp->value); 106 SET_ANIMATION (tmp, tmp->value);
100 update_object (tmp, UP_OBJ_FACE); 107 update_object (tmp, UP_OBJ_FACE);
101 break; 108 break;
102 109
103 case MOOD_FLOOR: 110 case MOOD_FLOOR:
104 do_mood_floor (tmp, source); 111 do_mood_floor (tmp, source);
105 break; 112 break;
106 113
107 case TIMED_GATE: 114 case TIMED_GATE:
115 if (!tmp->active)
116 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
108 tmp->set_speed (tmp->arch->clone.speed); 117 tmp->set_speed (tmp->arch->speed);
109 tmp->value = tmp->arch->clone.value; 118 tmp->value = tmp->arch->value;
110 tmp->stats.sp = 1; 119 tmp->stats.sp = 1;
111 tmp->stats.hp = tmp->stats.maxhp; 120 tmp->stats.hp = tmp->stats.maxhp;
112 /* Handle multipart gates. We copy the value for the other parts 121 /* Handle multipart gates. We copy the value for the other parts
113 * from the head - this ensures that the data will consistent 122 * from the head - this ensures that the data will consistent
114 */ 123 */
115 for (tmp = tmp->more; tmp; tmp = tmp->more) 124 for (object *part = tmp->more; part; part = part->more)
116 { 125 {
117 tmp->value = tmp->head->value; 126 part->value = tmp->value;
118 tmp->stats.sp = tmp->head->stats.sp; 127 part->stats.sp = tmp->stats.sp;
119 tmp->stats.hp = tmp->head->stats.hp; 128 part->stats.hp = tmp->stats.hp;
120 tmp->set_speed (tmp->head->speed); 129 part->set_speed (tmp->speed);
121 } 130 }
122 break; 131 break;
123 132
124 case DIRECTOR: 133 case DIRECTOR:
125 case FIREWALL: 134 case FIREWALL:
… …
127 move_firewall (tmp); 136 move_firewall (tmp);
128 else 137 else
129 { 138 {
130 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 139 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
131 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 140 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
141
132 animate_turning (tmp); 142 animate_turning (tmp);
133 } 143 }
134 break; 144 break;
135 145
136 case TELEPORTER: 146 case TELEPORTER:
… …
140 case CREATOR: 150 case CREATOR:
141 move_creator (tmp); 151 move_creator (tmp);
142 break; 152 break;
143 153
144 case TRIGGER_MARKER: 154 case TRIGGER_MARKER:
155 //tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
145 move_marker (tmp); 156 move_marker (tmp);
146 break; 157 break;
147 158
148 case DUPLICATOR: 159 case DUPLICATOR:
149 move_duplicator (tmp); 160 move_duplicator (tmp);
… …
250 else if (tmp->type == PEDESTAL) 261 else if (tmp->type == PEDESTAL)
251 { 262 {
252 tmp->value = 0; 263 tmp->value = 0;
253 for (ab = tmp->above; ab != NULL; ab = ab->above) 264 for (ab = tmp->above; ab != NULL; ab = ab->above)
254 { 265 {
255 head = ab->head ? ab->head : ab; 266 head = ab->head_ ();
256 /* Same note regarding move_type for buttons above apply here. */ 267 /* Same note regarding move_type for buttons above apply here. */
257 if (((head->move_type & tmp->move_on) || ab->move_type == 0) && 268 if (((head->move_type & tmp->move_on) || ab->move_type == 0) &&
258 (head->race == tmp->slaying || 269 (head->race == tmp->slaying ||
259 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || 270 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) ||
260 (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) 271 (!strcmp (tmp->slaying, "player") && head->type == PLAYER)))
261 tmp->value = 1; 272 tmp->value = 1;
262 } 273 }
274
263 if (tmp->value) 275 if (tmp->value)
264 any_down = 1; 276 any_down = 1;
265 } 277 }
266 } 278 }
267 if (any_down) /* If any other buttons were down, force this to remain down */ 279 if (any_down) /* If any other buttons were down, force this to remain down */
… …
312 */ 324 */
313 325
314int 326int
315check_altar_sacrifice (const object *altar, const object *sacrifice) 327check_altar_sacrifice (const object *altar, const object *sacrifice)
316{ 328{
317 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER) 329 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
330 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
331 && sacrifice->type != PLAYER)
318 { 332 {
333 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
334 && sacrifice->type == MONEY
335 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
336 return 1;
337
319 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name || 338 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
320 ARCH_SACRIFICE (altar) == sacrifice->name || 339 || ARCH_SACRIFICE (altar) == sacrifice->name
321 ARCH_SACRIFICE (altar) == sacrifice->slaying || 340 || ARCH_SACRIFICE (altar) == sacrifice->slaying
322 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 341 || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
323 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 342 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
324 return 1;
325
326 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
327 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
328 return 1; 343 return 1;
329 } 344 }
330 345
331 return 0; 346 return 0;
332} 347}
… …
454 case TRIGGER_PEDESTAL: 469 case TRIGGER_PEDESTAL:
455 if (cause) 470 if (cause)
456 { 471 {
457 for (tmp = op->above; tmp; tmp = tmp->above) 472 for (tmp = op->above; tmp; tmp = tmp->above)
458 { 473 {
459 object *head = tmp->head ? tmp->head : tmp; 474 object *head = tmp->head_ ();
460 475
461 /* See comment in TRIGGER_BUTTON about move_types */ 476 /* See comment in TRIGGER_BUTTON about move_types */
462 if (((head->move_type & op->move_on) || head->move_type == 0) 477 if (((head->move_type & op->move_on) || head->move_type == 0)
463 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) 478 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
464 { 479 {
465 push = 1; 480 push = 1;
466 break; 481 break;
467 } 482 }
468 } 483 }
484
469 if (op->stats.ac == push) 485 if (op->stats.ac == push)
470 return 0; 486 return 0;
487
471 op->stats.ac = push; 488 op->stats.ac = push;
489
472 if (NUM_ANIMATIONS (op) > 1) 490 if (NUM_ANIMATIONS (op) > 1)
473 { 491 {
474 SET_ANIMATION (op, push); 492 SET_ANIMATION (op, push);
475 update_object (op, UP_OBJ_FACE); 493 update_object (op, UP_OBJ_FACE);
476 } 494 }
495
477 update_object (op, UP_OBJ_FACE); 496 update_object (op, UP_OBJ_FACE);
497
478 if (in_movement || !push) 498 if (in_movement || !push)
479 return 0; 499 return 0;
480 } 500 }
501
481 trigger_move (op, push); 502 trigger_move (op, push);
482 return 0; 503 return 0;
483 504
484 case TRIGGER_ALTAR: 505 case TRIGGER_ALTAR:
485 if (cause) 506 if (cause)
486 { 507 {
487 if (in_movement) 508 if (in_movement)
488 return 0; 509 return 0;
510
489 if (operate_altar (op, &cause)) 511 if (operate_altar (op, &cause))
490 { 512 {
491 if (NUM_ANIMATIONS (op) > 1) 513 if (NUM_ANIMATIONS (op) > 1)
492 { 514 {
493 SET_ANIMATION (op, 1); 515 SET_ANIMATION (op, 1);
494 update_object (op, UP_OBJ_FACE); 516 update_object (op, UP_OBJ_FACE);
495 } 517 }
518
496 if (op->last_sp >= 0) 519 if (op->last_sp >= 0)
497 { 520 {
498 trigger_move (op, 1); 521 trigger_move (op, 1);
499 if (op->last_sp > 0) 522 if (op->last_sp > 0)
500 op->last_sp = -op->last_sp; 523 op->last_sp = -op->last_sp;
… …
507 op->value = !op->value; 530 op->value = !op->value;
508 trigger_move (op, 1); 531 trigger_move (op, 1);
509 op->last_sp = -op->last_sp; 532 op->last_sp = -op->last_sp;
510 op->value = !op->value; 533 op->value = !op->value;
511 } 534 }
535
512 return cause == NULL; 536 return cause == NULL;
513 } 537 }
514 else 538 else
515 {
516 return 0; 539 return 0;
517 }
518 } 540 }
519 else 541 else
520 { 542 {
521 if (NUM_ANIMATIONS (op) > 1) 543 if (NUM_ANIMATIONS (op) > 1)
522 { 544 {
… …
811 object *tmp, *ret = NULL; 833 object *tmp, *ret = NULL;
812 834
813 /* First check the object itself. */ 835 /* First check the object itself. */
814 if ((trig->stats.hp && (op->type == trig->stats.hp)) 836 if ((trig->stats.hp && (op->type == trig->stats.hp))
815 || (trig->slaying && (op->slaying == trig->slaying)) 837 || (trig->slaying && (op->slaying == trig->slaying))
816 || (trig->race && (op->arch->name == trig->race))) 838 || (trig->race && (op->arch->archname == trig->race)))
817 return op; 839 return op;
818 840
819 for (tmp = op->inv; tmp; tmp = tmp->below) 841 for (tmp = op->inv; tmp; tmp = tmp->below)
820 { 842 {
821 if (tmp->inv) 843 if (tmp->inv)
… …
824 if (ret) 846 if (ret)
825 return ret; 847 return ret;
826 } 848 }
827 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 849 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
828 || (trig->slaying && (tmp->slaying == trig->slaying)) 850 || (trig->slaying && (tmp->slaying == trig->slaying))
829 || (trig->race && (tmp->arch->name == trig->race))) 851 || (trig->race && (tmp->arch->archname == trig->race)))
830 return tmp; 852 return tmp;
831 } 853 }
832 return NULL; 854 return NULL;
833} 855}
834 856

Diff Legend

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