1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 | * Deliantra 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 <support@deliantra.net> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | #include <global.h> |
24 | #include <global.h> |
26 | #include <funcpoint.h> |
|
|
27 | |
25 | |
28 | /* |
26 | /* |
29 | * This code is no longer highly inefficient 8) |
27 | * This code is no longer highly inefficient 8) |
30 | */ |
28 | */ |
31 | |
29 | |
… | |
… | |
60 | object *tmp = ol->ob; |
58 | object *tmp = ol->ob; |
61 | |
59 | |
62 | /* if the criteria isn't appropriate, don't do anything */ |
60 | /* if the criteria isn't appropriate, don't do anything */ |
63 | if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) |
61 | if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) |
64 | continue; |
62 | continue; |
|
|
63 | |
65 | if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) |
64 | if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) |
66 | continue; |
65 | continue; |
67 | |
66 | |
68 | switch (tmp->type) |
67 | switch (tmp->type) |
69 | { |
68 | { |
70 | case GATE: |
69 | case GATE: |
71 | case HOLE: |
70 | case HOLE: |
|
|
71 | if (!tmp->active) |
|
|
72 | tmp->play_sound (tmp->sound |
|
|
73 | ? tmp->sound |
|
|
74 | : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole")); |
72 | tmp->value = tmp->stats.maxsp ? !state : state; |
75 | tmp->value = tmp->stats.maxsp ? !state : state; |
73 | tmp->set_speed (0.5); |
76 | tmp->set_speed (0.5); |
74 | break; |
77 | break; |
75 | |
78 | |
76 | case CF_HANDLE: |
79 | case CF_HANDLE: |
… | |
… | |
79 | break; |
82 | break; |
80 | |
83 | |
81 | case SIGN: |
84 | case SIGN: |
82 | if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) |
85 | if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) |
83 | { |
86 | { |
|
|
87 | tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign")); |
84 | new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); |
88 | new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); |
85 | if (tmp->stats.food) |
89 | if (tmp->stats.food) |
86 | tmp->last_eat++; |
90 | tmp->last_eat++; |
87 | } |
91 | } |
88 | break; |
92 | break; |
89 | |
93 | |
90 | case ALTAR: |
94 | case ALTAR: |
|
|
95 | tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar")); |
91 | tmp->value = 1; |
96 | tmp->value = 1; |
92 | SET_ANIMATION (tmp, tmp->value); |
97 | SET_ANIMATION (tmp, tmp->value); |
93 | update_object (tmp, UP_OBJ_FACE); |
98 | update_object (tmp, UP_OBJ_FACE); |
94 | break; |
99 | break; |
95 | |
100 | |
96 | case BUTTON: |
101 | case BUTTON: |
97 | case PEDESTAL: |
102 | case PEDESTAL: |
|
|
103 | tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button")); |
98 | tmp->value = state; |
104 | tmp->value = state; |
99 | SET_ANIMATION (tmp, tmp->value); |
105 | SET_ANIMATION (tmp, tmp->value); |
100 | update_object (tmp, UP_OBJ_FACE); |
106 | update_object (tmp, UP_OBJ_FACE); |
101 | break; |
107 | break; |
102 | |
108 | |
103 | case MOOD_FLOOR: |
109 | case MOOD_FLOOR: |
104 | do_mood_floor (tmp, source); |
110 | do_mood_floor (tmp, source); |
105 | break; |
111 | break; |
106 | |
112 | |
107 | case TIMED_GATE: |
113 | case TIMED_GATE: |
|
|
114 | if (!tmp->active) |
|
|
115 | tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate")); |
108 | tmp->set_speed (tmp->arch->clone.speed); |
116 | tmp->set_speed (tmp->arch->speed); |
109 | tmp->value = tmp->arch->clone.value; |
117 | tmp->value = tmp->arch->value; |
110 | tmp->stats.sp = 1; |
118 | tmp->stats.sp = 1; |
111 | tmp->stats.hp = tmp->stats.maxhp; |
119 | tmp->stats.hp = tmp->stats.maxhp; |
112 | /* Handle multipart gates. We copy the value for the other parts |
120 | /* Handle multipart gates. We copy the value for the other parts |
113 | * from the head - this ensures that the data will consistent |
121 | * from the head - this ensures that the data will consistent |
114 | */ |
122 | */ |
115 | for (tmp = tmp->more; tmp; tmp = tmp->more) |
123 | for (object *part = tmp->more; part; part = part->more) |
116 | { |
124 | { |
117 | tmp->value = tmp->head->value; |
125 | part->value = tmp->value; |
118 | tmp->stats.sp = tmp->head->stats.sp; |
126 | part->stats.sp = tmp->stats.sp; |
119 | tmp->stats.hp = tmp->head->stats.hp; |
127 | part->stats.hp = tmp->stats.hp; |
120 | tmp->set_speed (tmp->head->speed); |
128 | part->set_speed (tmp->speed); |
121 | } |
129 | } |
122 | break; |
130 | break; |
123 | |
131 | |
124 | case DIRECTOR: |
132 | case DIRECTOR: |
125 | case FIREWALL: |
133 | case FIREWALL: |
… | |
… | |
127 | move_firewall (tmp); |
135 | move_firewall (tmp); |
128 | else |
136 | else |
129 | { |
137 | { |
130 | if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ |
138 | if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ |
131 | tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; |
139 | tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; |
|
|
140 | |
132 | animate_turning (tmp); |
141 | animate_turning (tmp); |
133 | } |
142 | } |
134 | break; |
143 | break; |
135 | |
144 | |
136 | case TELEPORTER: |
145 | case TELEPORTER: |
… | |
… | |
140 | case CREATOR: |
149 | case CREATOR: |
141 | move_creator (tmp); |
150 | move_creator (tmp); |
142 | break; |
151 | break; |
143 | |
152 | |
144 | case TRIGGER_MARKER: |
153 | case TRIGGER_MARKER: |
|
|
154 | //tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker")); |
145 | move_marker (tmp); |
155 | move_marker (tmp); |
146 | break; |
156 | break; |
147 | |
157 | |
148 | case DUPLICATOR: |
158 | case DUPLICATOR: |
149 | move_duplicator (tmp); |
159 | move_duplicator (tmp); |
… | |
… | |
224 | } |
234 | } |
225 | |
235 | |
226 | tmp = ol->ob; |
236 | tmp = ol->ob; |
227 | if (tmp->type == BUTTON) |
237 | if (tmp->type == BUTTON) |
228 | { |
238 | { |
229 | for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above) |
239 | for (ab = tmp->above, tot = 0; ab; ab = ab->above) |
230 | /* Bug? The pedestal code below looks for the head of |
|
|
231 | * the object, this bit doesn't. I'd think we should check |
|
|
232 | * for head here also. Maybe it also makese sense to |
|
|
233 | * make the for ab=tmp->above loop common, and alter |
|
|
234 | * behaviour based on object within that loop? |
|
|
235 | */ |
240 | { |
|
|
241 | head = ab->head_ (); |
236 | |
242 | |
237 | /* Basically, if the move_type matches that on what the |
243 | /* Basically, if the move_type matches that on what the |
238 | * button wants, we count it. The second check is so that |
244 | * button wants, we count it. The second check is so that |
239 | * objects don't move (swords, etc) will count. Note that |
245 | * objects who don't move (swords, etc) will count. Note that |
240 | * this means that more work is needed to make buttons |
246 | * this means that more work is needed to make buttons |
241 | * that are only triggered by flying objects. |
247 | * that are only triggered by flying objects. |
242 | */ |
248 | */ |
243 | if ((ab->move_type & tmp->move_on) || ab->move_type == 0) |
249 | if ((head->move_type & tmp->move_on) || head->move_type == 0) |
244 | tot += ab->weight * (ab->nrof ? ab->nrof : 1) + ab->carrying; |
250 | tot += head->total_weight (); |
|
|
251 | } |
245 | |
252 | |
246 | tmp->value = (tot >= tmp->weight) ? 1 : 0; |
253 | tmp->value = tot >= tmp->weight ? 1 : 0; |
247 | if (tmp->value) |
|
|
248 | any_down = 1; |
|
|
249 | } |
254 | } |
250 | else if (tmp->type == PEDESTAL) |
255 | else if (tmp->type == PEDESTAL) |
251 | { |
256 | { |
252 | tmp->value = 0; |
257 | tmp->value = 0; |
|
|
258 | |
253 | for (ab = tmp->above; ab != NULL; ab = ab->above) |
259 | for (ab = tmp->above; ab; ab = ab->above) |
254 | { |
260 | { |
255 | head = ab->head ? ab->head : ab; |
261 | head = ab->head_ (); |
|
|
262 | |
256 | /* Same note regarding move_type for buttons above apply here. */ |
263 | /* Same note regarding move_type for buttons above apply here. */ |
257 | if (((head->move_type & tmp->move_on) || ab->move_type == 0) && |
264 | if (((head->move_type & tmp->move_on) || ab->move_type == 0) && |
258 | (head->race == tmp->slaying || |
265 | (head->race == tmp->slaying || |
259 | ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || |
266 | ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || |
260 | (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) |
267 | (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) |
261 | tmp->value = 1; |
268 | tmp->value = 1; |
262 | } |
269 | } |
263 | if (tmp->value) |
|
|
264 | any_down = 1; |
|
|
265 | } |
270 | } |
|
|
271 | |
|
|
272 | any_down = any_down || tmp->value; |
266 | } |
273 | } |
|
|
274 | |
267 | if (any_down) /* If any other buttons were down, force this to remain down */ |
275 | if (any_down) /* If any other buttons were down, force this to remain down */ |
268 | op->value = 1; |
276 | op->value = 1; |
269 | |
277 | |
270 | /* If this button hasn't changed, don't do anything */ |
278 | /* If this button hasn't changed, don't do anything */ |
271 | if (op->value != old_value) |
279 | if (op->value != old_value) |
… | |
… | |
312 | */ |
320 | */ |
313 | |
321 | |
314 | int |
322 | int |
315 | check_altar_sacrifice (const object *altar, const object *sacrifice) |
323 | check_altar_sacrifice (const object *altar, const object *sacrifice) |
316 | { |
324 | { |
317 | if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER) |
325 | if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) |
|
|
326 | && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) |
|
|
327 | && sacrifice->type != PLAYER) |
318 | { |
328 | { |
319 | if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name || |
329 | if (ARCH_SACRIFICE (altar) == shstr_money |
320 | ARCH_SACRIFICE (altar) == sacrifice->name || |
330 | && sacrifice->type == MONEY |
321 | ARCH_SACRIFICE (altar) == sacrifice->slaying || |
331 | && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) |
322 | (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) |
|
|
323 | && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) |
|
|
324 | return 1; |
332 | return 1; |
325 | |
333 | |
326 | if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 |
334 | if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname |
327 | && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) |
335 | || ARCH_SACRIFICE (altar) == sacrifice->name |
|
|
336 | || ARCH_SACRIFICE (altar) == sacrifice->slaying |
|
|
337 | || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar))) |
|
|
338 | && NROF_SACRIFICE (altar) <= sacrifice->number_of ()) |
328 | return 1; |
339 | return 1; |
329 | } |
340 | } |
330 | |
341 | |
331 | return 0; |
342 | return 0; |
332 | } |
343 | } |
… | |
… | |
356 | return 0; |
367 | return 0; |
357 | |
368 | |
358 | /* check_altar_sacrifice should have already verified that enough money |
369 | /* check_altar_sacrifice should have already verified that enough money |
359 | * has been dropped. |
370 | * has been dropped. |
360 | */ |
371 | */ |
361 | if (!strcmp (ARCH_SACRIFICE (altar), "money")) |
372 | if (ARCH_SACRIFICE (altar) == shstr_money) |
362 | { |
373 | { |
363 | int number = NROF_SACRIFICE (altar) / (*sacrifice)->value; |
374 | int number = NROF_SACRIFICE (altar) / (*sacrifice)->value; |
364 | |
375 | |
365 | /* Round up any sacrifices. Altars don't make change either */ |
376 | /* Round up any sacrifices. Altars don't make change either */ |
366 | if (NROF_SACRIFICE (altar) % (*sacrifice)->value) |
377 | if (NROF_SACRIFICE (altar) % (*sacrifice)->value) |
367 | number++; |
378 | number++; |
368 | |
379 | |
369 | *sacrifice = decrease_ob_nr (*sacrifice, number); |
380 | if (!(*sacrifice)->decrease (number)) |
|
|
381 | *sacrifice = 0; |
370 | } |
382 | } |
371 | else |
383 | else |
372 | *sacrifice = decrease_ob_nr (*sacrifice, NROF_SACRIFICE (altar)); |
384 | if (!(*sacrifice)->decrease (NROF_SACRIFICE (altar))) |
|
|
385 | *sacrifice = 0; |
373 | |
386 | |
374 | if (altar->msg) |
387 | if (altar->msg) |
375 | new_info_map (NDI_BLACK, altar->map, altar->msg); |
388 | new_info_map (NDI_BLACK, altar->map, altar->msg); |
376 | |
389 | |
377 | return 1; |
390 | return 1; |
… | |
… | |
427 | * button wants, we count it. The second check is so that |
440 | * button wants, we count it. The second check is so that |
428 | * objects that don't move (swords, etc) will count. Note that |
441 | * objects that don't move (swords, etc) will count. Note that |
429 | * this means that more work is needed to make buttons |
442 | * this means that more work is needed to make buttons |
430 | * that are only triggered by flying objects. |
443 | * that are only triggered by flying objects. |
431 | */ |
444 | */ |
432 | |
|
|
433 | if ((tmp->move_type & op->move_on) || tmp->move_type == 0) |
445 | if ((tmp->move_type & op->move_on) || tmp->move_type == 0) |
434 | { |
446 | tot += tmp->head_ ()->total_weight (); |
435 | tot += tmp->weight * (tmp->nrof ? tmp->nrof : 1) + tmp->carrying; |
447 | |
436 | } |
|
|
437 | if (tot >= op->weight) |
448 | if (tot >= op->weight) |
438 | push = 1; |
449 | push = 1; |
|
|
450 | |
439 | if (op->stats.ac == push) |
451 | if (op->stats.ac == push) |
440 | return 0; |
452 | return 0; |
|
|
453 | |
441 | op->stats.ac = push; |
454 | op->stats.ac = push; |
442 | if (NUM_ANIMATIONS (op) > 1) |
455 | if (NUM_ANIMATIONS (op) > 1) |
443 | { |
456 | { |
444 | SET_ANIMATION (op, push); |
457 | SET_ANIMATION (op, push); |
445 | update_object (op, UP_OBJ_FACE); |
458 | update_object (op, UP_OBJ_FACE); |
446 | } |
459 | } |
|
|
460 | |
447 | if (in_movement || !push) |
461 | if (in_movement || !push) |
448 | return 0; |
462 | return 0; |
449 | } |
463 | } |
450 | trigger_move (op, push); |
464 | trigger_move (op, push); |
451 | } |
465 | } |
|
|
466 | |
452 | return 0; |
467 | return 0; |
453 | |
468 | |
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 | { |
… | |
… | |
734 | if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) |
756 | if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) |
735 | CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); |
757 | CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); |
736 | |
758 | |
737 | if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
759 | if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
738 | { |
760 | { |
739 | remove_friendly_object (tmp); |
|
|
740 | |
|
|
741 | tmp->attack_movement = 0; |
761 | tmp->attack_movement = 0; |
742 | /* lots of checks here, but want to make sure we don't |
762 | /* lots of checks here, but want to make sure we don't |
743 | * dereference a null value |
763 | * dereference a null value |
744 | */ |
764 | */ |
745 | if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) |
765 | if (tmp->type == GOLEM |
|
|
766 | && tmp->owner |
|
|
767 | && tmp->owner->type == PLAYER |
|
|
768 | && tmp->owner->contr->golem == tmp) |
746 | tmp->owner->contr->ranges[range_golem] = 0; |
769 | tmp->owner->contr->golem = 0; |
747 | |
770 | |
748 | tmp->owner = 0; |
771 | tmp->owner = 0; |
|
|
772 | |
|
|
773 | remove_friendly_object (tmp); |
749 | } |
774 | } |
750 | break; |
775 | break; |
751 | |
776 | |
752 | case 1: /* angry -- get neutral monsters mad */ |
777 | case 1: /* angry -- get neutral monsters mad */ |
753 | if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
778 | if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
… | |
… | |
776 | add_friendly_object (tmp); |
801 | add_friendly_object (tmp); |
777 | tmp->attack_movement = PETMOVE; |
802 | tmp->attack_movement = PETMOVE; |
778 | } |
803 | } |
779 | break; |
804 | break; |
780 | |
805 | |
781 | case 6: |
806 | case 6: // kill monsters |
782 | if (!QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
807 | if (!QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
783 | break; |
808 | break; |
784 | |
809 | |
785 | // FALL THROUGH |
810 | // FALL THROUGH |
786 | case 5: |
811 | case 5: // kill all alives |
|
|
812 | if (!tmp->flag [FLAG_PRECIOUS]) |
|
|
813 | { |
787 | get_archetype ("burnout")->insert_at (tmp, source); |
814 | get_archetype ("burnout")->insert_at (tmp, source); |
788 | tmp->destroy (); |
815 | tmp->destroy (); |
|
|
816 | } |
789 | break; |
817 | break; |
790 | |
818 | |
791 | default: |
819 | default: |
792 | break; |
820 | break; |
793 | } |
821 | } |
… | |
… | |
805 | object *tmp, *ret = NULL; |
833 | object *tmp, *ret = NULL; |
806 | |
834 | |
807 | /* First check the object itself. */ |
835 | /* First check the object itself. */ |
808 | if ((trig->stats.hp && (op->type == trig->stats.hp)) |
836 | if ((trig->stats.hp && (op->type == trig->stats.hp)) |
809 | || (trig->slaying && (op->slaying == trig->slaying)) |
837 | || (trig->slaying && (op->slaying == trig->slaying)) |
810 | || (trig->race && (op->arch->name == trig->race))) |
838 | || (trig->race && (op->arch->archname == trig->race))) |
811 | return op; |
839 | return op; |
812 | |
840 | |
813 | for (tmp = op->inv; tmp; tmp = tmp->below) |
841 | for (tmp = op->inv; tmp; tmp = tmp->below) |
814 | { |
842 | { |
815 | if (tmp->inv) |
843 | if (tmp->inv) |
… | |
… | |
818 | if (ret) |
846 | if (ret) |
819 | return ret; |
847 | return ret; |
820 | } |
848 | } |
821 | else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) |
849 | else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) |
822 | || (trig->slaying && (tmp->slaying == trig->slaying)) |
850 | || (trig->slaying && (tmp->slaying == trig->slaying)) |
823 | || (trig->race && (tmp->arch->name == trig->race))) |
851 | || (trig->race && (tmp->arch->archname == trig->race))) |
824 | return tmp; |
852 | return tmp; |
825 | } |
853 | } |
826 | return NULL; |
854 | return NULL; |
827 | } |
855 | } |
828 | |
856 | |
… | |
… | |
866 | // and we have to set the value to 0 |
894 | // and we have to set the value to 0 |
867 | |
895 | |
868 | if (match && trig->last_sp) // match == having |
896 | if (match && trig->last_sp) // match == having |
869 | { |
897 | { |
870 | if (trig->last_heal) |
898 | if (trig->last_heal) |
871 | decrease_ob (match); |
899 | match->decrease (); |
872 | |
900 | |
873 | trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left |
901 | trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left |
874 | push_button (trig); |
902 | push_button (trig); |
875 | } |
903 | } |
876 | else if (!match && !trig->last_sp) // match == not having |
904 | else if (!match && !trig->last_sp) // match == not having |