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.46 by root, Sun May 4 18:24:11 2008 UTC vs.
Revision 1.66 by root, Sun Apr 11 00:34:05 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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>
… …
29 30
30/* 31/*
31 * elmex: 32 * elmex:
32 * This function takes a objectlink list with all the objects are going to be activated. 33 * This function takes a objectlink list with all the objects are going to be activated.
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 source 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.
36 * the originator is the player or monster who did something.
35 */ 37 */
36void 38static void
37activate_connection_link (objectlink * ol, bool state, object *source = 0) 39activate_connection_link (objectlink *ol, int state, object *activator, object *originator)
38{ 40{
39 for (; ol; ol = ol->next) 41 for (; ol; ol = ol->next)
40 { 42 {
41 if (!ol->ob) 43 if (!ol->ob)
42 { 44 {
… …
50 * is getting moved out of memory, the status of buttons and levers 52 * is getting moved out of memory, the status of buttons and levers
51 * probably isn't important - it will get sorted out when the map is 53 * probably isn't important - it will get sorted out when the map is
52 * re-loaded. As such, just exit this function if that is the case. 54 * re-loaded. As such, just exit this function if that is the case.
53 */ 55 */
54 56
55 if (QUERY_FLAG (ol->ob, FLAG_FREED)) 57 if (ol->ob->flag [FLAG_FREED])
56 return; 58 return;
57 59
58 object *tmp = ol->ob; 60 object *tmp = ol->ob;
59 61
60 /* if the criteria isn't appropriate, don't do anything */ 62 /* if the criteria isn't appropriate, don't do anything */
61 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) 63 if (state && !tmp->flag [FLAG_ACTIVATE_ON_PUSH])
62 continue; 64 continue;
63 65
64 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) 66 if (!state && !tmp->flag [FLAG_ACTIVATE_ON_RELEASE])
65 continue; 67 continue;
66 68
67 switch (tmp->type) 69 switch (tmp->type)
68 { 70 {
69 case GATE: 71 case GATE:
… …
74 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole")); 76 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
75 tmp->value = tmp->stats.maxsp ? !state : state; 77 tmp->value = tmp->stats.maxsp ? !state : state;
76 tmp->set_speed (0.5); 78 tmp->set_speed (0.5);
77 break; 79 break;
78 80
79 case CF_HANDLE: 81 case T_HANDLE:
80 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 82 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
81 update_object (tmp, UP_OBJ_FACE); 83 update_object (tmp, UP_OBJ_FACE);
82 break; 84 break;
83 85
84 case SIGN: 86 case SIGN:
85 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 87 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
86 { 88 {
87 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
88 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
89 if (tmp->stats.food) 96 if (tmp->stats.food)
90 tmp->last_eat++; 97 tmp->last_eat++;
91 } 98 }
92 break; 99 break;
93 100
… …
105 SET_ANIMATION (tmp, tmp->value); 112 SET_ANIMATION (tmp, tmp->value);
106 update_object (tmp, UP_OBJ_FACE); 113 update_object (tmp, UP_OBJ_FACE);
107 break; 114 break;
108 115
109 case MOOD_FLOOR: 116 case MOOD_FLOOR:
110 do_mood_floor (tmp, source); 117 do_mood_floor (tmp, activator);
111 break; 118 break;
112 119
113 case TIMED_GATE: 120 case TIMED_GATE:
114 if (!tmp->active) 121 if (!tmp->active)
115 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate")); 122 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
123
116 tmp->set_speed (tmp->arch->speed); 124 tmp->set_speed (tmp->arch->speed);
117 tmp->value = tmp->arch->value; 125 tmp->value = tmp->arch->value;
118 tmp->stats.sp = 1; 126 tmp->stats.sp = 1;
119 tmp->stats.hp = tmp->stats.maxhp; 127 tmp->stats.hp = tmp->stats.maxhp;
120 /* Handle multipart gates. We copy the value for the other parts 128 /* Handle multipart gates. We copy the value for the other parts
… …
129 } 137 }
130 break; 138 break;
131 139
132 case DIRECTOR: 140 case DIRECTOR:
133 case FIREWALL: 141 case FIREWALL:
134 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 142 if (!tmp->flag [FLAG_ANIMATE] && tmp->type == FIREWALL)
135 move_firewall (tmp); 143 move_firewall (tmp);
136 else 144 else
137 { 145 {
138 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 146 tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
139 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
140
141 animate_turning (tmp); 147 animate_turning (tmp);
142 } 148 }
143 break; 149 break;
144 150
145 case TELEPORTER: 151 case TELEPORTER:
… …
155 move_marker (tmp); 161 move_marker (tmp);
156 break; 162 break;
157 163
158 case DUPLICATOR: 164 case DUPLICATOR:
159 move_duplicator (tmp); 165 move_duplicator (tmp);
166 break;
167
168 case MAPSCRIPT:
169 cfperl_mapscript_activate (tmp, state, activator, originator);
160 break; 170 break;
161 } 171 }
162 } 172 }
163} 173}
164 174
… …
173 * Changed the routine to loop through _all_ objects. 183 * Changed the routine to loop through _all_ objects.
174 * Better hurry with that linked list... 184 * Better hurry with that linked list...
175 * 185 *
176 */ 186 */
177void 187void
178push_button (object *op) 188push_button (object *op, object *originator)
179{ 189{
180 oblinkpt *obp = get_button_links (op); 190 if (oblinkpt *obp = op->find_link ())
181 191 {
182 if (!obp) 192 if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value), ARG_OBJECT (op), ARG_OBJECT (originator)))
183 return; 193 return;
184 194
185 if (INVOKE_MAP (TRIGGER, op->map, ARG_INT64 (obp->value), ARG_INT (op->value)))
186 return;
187
188 activate_connection_link (obp->link, op->value, op); 195 activate_connection_link (obp->link, op->value, op, originator);
196 }
189} 197}
190 198
191/* 199/*
192 * elmex: 200 * elmex:
193 * This activates a connection, similar to push_button (object *op) but it takes 201 * This activates a connection, similar to push_button (object *op) but it takes
… …
195 * 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
196 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 204 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
197 * 205 *
198 */ 206 */
199void 207void
200activate_connection (maptile *map, long connection, bool state) 208maptile::trigger (shstr_tmp id, int state, object *activator, object *originator)
201{ 209{
202 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) 210 if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator)))
203 return; 211 return;
204 212
205 oblinkpt *obp = get_connection_links (map, connection); 213 if (oblinkpt *obp = find_link (id))
206
207 if (obp)
208 activate_connection_link (obp->link, state); 214 activate_connection_link (obp->link, state, activator, originator);
209} 215}
210 216
211/* 217/*
212 * Updates everything connected with the button op. 218 * Updates everything connected with the button op.
213 * After changing the state of a button, this function must be called 219 * After changing the state of a button, this function must be called
214 * to make sure that all gates and other buttons connected to the 220 * to make sure that all gates and other buttons connected to the
215 * button reacts to the (eventual) change of state. 221 * button reacts to the (eventual) change of state.
216 */ 222 */
217void 223void
218update_button (object *op) 224update_button (object *op, object *originator)
219{ 225{
220 int any_down = 0, old_value = op->value; 226 int any_down = 0, old_value = op->value;
221 oblinkpt *obp = 0;
222 objectlink *ol;
223 227
224 obp = get_button_links (op); 228 if (oblinkpt *obp = op->find_link ())
225 if (obp)
226 for (ol = obp->link; ol; ol = ol->next) 229 for (objectlink *ol = obp->link; ol; ol = ol->next)
227 { 230 {
228 if (!ol->ob) 231 if (!ol->ob)
229 { 232 {
230 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 233 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
231 continue; 234 continue;
… …
251 254
252 any_down = any_down || tmp->value; 255 any_down = any_down || tmp->value;
253 } 256 }
254 else if (tmp->type == PEDESTAL) 257 else if (tmp->type == PEDESTAL)
255 { 258 {
259 bool is_match = is_match_expr (tmp->slaying);
256 tmp->value = 0; 260 tmp->value = 0;
257 261
258 for (object *ab = tmp->above; ab; ab = ab->above) 262 for (object *ab = tmp->above; ab; ab = ab->above)
259 { 263 {
260 object *head = ab->head_ (); 264 object *head = ab->head_ ();
261 265
262 /* Same note regarding move_type for buttons above apply here. */ 266 /* Same note regarding move_type for buttons above apply here. */
263 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)
264 && (head->race == tmp->slaying 270 : (head->race == tmp->slaying
265 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying) 271 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
266 || (tmp->slaying == shstr_player && head->type == PLAYER))) 272 || (tmp->slaying == shstr_player && head->type == PLAYER)))
273 {
267 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 }
268 } 296 }
269 297
270 any_down = any_down || tmp->value; 298 any_down = any_down || tmp->value;
271 } 299 }
272 } 300 }
… …
279 /* If this button hasn't changed, don't do anything */ 307 /* If this button hasn't changed, don't do anything */
280 if (op->value != old_value) 308 if (op->value != old_value)
281 { 309 {
282 SET_ANIMATION (op, op->value); 310 SET_ANIMATION (op, op->value);
283 update_object (op, UP_OBJ_FACE); 311 update_object (op, UP_OBJ_FACE);
284 push_button (op); /* Make all other buttons the same */ 312 push_button (op, originator); /* Make all other buttons the same */
285 } 313 }
286} 314}
287 315
288void 316void
289use_trigger (object *op) 317use_trigger (object *op, object *originator)
290{ 318{
291 /* Toggle value */ 319 /* Toggle value */
292 op->value = !op->value; 320 op->value = !op->value;
321
293 push_button (op); 322 push_button (op, originator);
294} 323}
295 324
296/* 325/*
297 * Note: animate_object should be used instead of this, 326 * Note: animate_object should be used instead of this,
298 * but it can't handle animations in the 8 directions 327 * but it can't handle animations in the 8 directions
… …
317 * 346 *
318 * 0.93.4: Linked objects (ie, objects that are connected) can not be 347 * 0.93.4: Linked objects (ie, objects that are connected) can not be
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
323int 351int
324check_altar_sacrifice (const object *altar, const object *sacrifice) 352check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
325{ 353{
326 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) 354 if (sacrifice->flag [FLAG_UNPAID])
327 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 355 return 0;
356
357 if (is_match_expr (ARCH_SACRIFICE (altar)))
358 return match (ARCH_SACRIFICE (altar), altar, originator);
359
360 if (!sacrifice->flag [FLAG_ALIVE]
361 && !sacrifice->flag [FLAG_IS_LINKED]
328 && sacrifice->type != PLAYER) 362 && sacrifice->type != PLAYER)
329 { 363 {
330 if (ARCH_SACRIFICE (altar) == shstr_money 364 if (ARCH_SACRIFICE (altar) == shstr_money
331 && sacrifice->type == MONEY 365 && sacrifice->type == MONEY
332 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 366 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
… …
351 * 385 *
352 * If this function returns 1, '*sacrifice' is modified to point to the 386 * 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. 387 * remaining sacrifice, or is set to NULL if the sacrifice was used up.
354 */ 388 */
355int 389int
356operate_altar (object *altar, object **sacrifice) 390operate_altar (object *altar, object **sacrifice, object *originator)
357{ 391{
358 if (!altar->map) 392 if (!altar->map)
359 { 393 {
360 LOG (llevError, "BUG: operate_altar(): altar has no map\n"); 394 LOG (llevError, "BUG: operate_altar(): altar has no map\n");
361 return 0; 395 return 0;
362 } 396 }
363 397
364 if (!altar->slaying || altar->value) 398 if (!altar->slaying || altar->value)
365 return 0; 399 return 0;
366 400
367 if (!check_altar_sacrifice (altar, *sacrifice)) 401 if (!check_altar_sacrifice (altar, *sacrifice, originator))
368 return 0; 402 return 0;
369 403
370 /* check_altar_sacrifice should have already verified that enough money 404 /* check_altar_sacrifice should have already verified that enough money
371 * has been dropped. 405 * has been dropped.
372 */ 406 */
… …
389 new_info_map (NDI_BLACK, altar->map, altar->msg); 423 new_info_map (NDI_BLACK, altar->map, altar->msg);
390 424
391 return 1; 425 return 1;
392} 426}
393 427
394void 428static void
395trigger_move (object *op, int state) /* 1 down and 0 up */ 429trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */
396{ 430{
397 op->stats.wc = state; 431 op->stats.wc = state;
432
398 if (state) 433 if (state)
399 { 434 {
400 use_trigger (op); 435 use_trigger (op, originator);
401 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.); 436 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
402 op->speed_left = -1; 437 op->speed_left = -1;
403 } 438 }
404 else 439 else
405 { 440 {
406 use_trigger (op); 441 use_trigger (op, originator);
407 op->set_speed (0); 442 op->set_speed (0);
408 } 443 }
409} 444}
410 445
411 446
… …
420 * TRIGGER: Returns 1 if handle could be moved, 0 if not. 455 * TRIGGER: Returns 1 if handle could be moved, 0 if not.
421 * 456 *
422 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0. 457 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
423 */ 458 */
424int 459int
425check_trigger (object *op, object *cause) 460check_trigger (object *op, object *cause, object *originator)
426{ 461{
427 object *tmp; 462 object *tmp;
428 int push = 0, tot = 0; 463 int push = 0, tot = 0;
429 int in_movement = op->stats.wc || op->speed; 464 int in_movement = op->stats.wc || op->has_active_speed ();
430 465
431 switch (op->type) 466 switch (op->type)
432 { 467 {
433 case TRIGGER_BUTTON: 468 case TRIGGER_BUTTON:
434 if (op->weight > 0) 469 if (op->weight > 0)
… …
460 } 495 }
461 496
462 if (in_movement || !push) 497 if (in_movement || !push)
463 return 0; 498 return 0;
464 } 499 }
500
465 trigger_move (op, push); 501 trigger_move (op, push, cause);
466 } 502 }
467 503
468 return 0; 504 return 0;
469 505
470 case TRIGGER_PEDESTAL: 506 case TRIGGER_PEDESTAL:
… …
474 { 510 {
475 object *head = tmp->head_ (); 511 object *head = tmp->head_ ();
476 512
477 /* See comment in TRIGGER_BUTTON about move_types */ 513 /* See comment in TRIGGER_BUTTON about move_types */
478 if (((head->move_type & op->move_on) || head->move_type == 0) 514 if (((head->move_type & op->move_on) || head->move_type == 0)
479 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) 515 && (head->race == op->slaying || (op->slaying == shstr_player && head->type == PLAYER)))
480 { 516 {
481 push = 1; 517 push = 1;
482 break; 518 break;
483 } 519 }
484 } 520 }
… …
498 534
499 if (in_movement || !push) 535 if (in_movement || !push)
500 return 0; 536 return 0;
501 } 537 }
502 538
503 trigger_move (op, push); 539 trigger_move (op, push, cause);
504 return 0; 540 return 0;
505 541
506 case TRIGGER_ALTAR: 542 case TRIGGER_ALTAR:
507 if (cause) 543 if (cause)
508 { 544 {
509 if (in_movement) 545 if (in_movement)
510 return 0; 546 return 0;
511 547
512 if (operate_altar (op, &cause)) 548 if (operate_altar (op, &cause)) /* TODO: originator? */
513 { 549 {
514 if (NUM_ANIMATIONS (op) > 1) 550 if (NUM_ANIMATIONS (op) > 1)
515 { 551 {
516 SET_ANIMATION (op, 1); 552 SET_ANIMATION (op, 1);
517 update_object (op, UP_OBJ_FACE); 553 update_object (op, UP_OBJ_FACE);
518 } 554 }
519 555
520 if (op->last_sp >= 0) 556 if (op->last_sp >= 0)
521 { 557 {
522 trigger_move (op, 1); 558 trigger_move (op, 1, cause);
559
523 if (op->last_sp > 0) 560 if (op->last_sp > 0)
524 op->last_sp = -op->last_sp; 561 op->last_sp = -op->last_sp;
525 } 562 }
526 else 563 else
527 { 564 {
528 /* for trigger altar with last_sp, the ON/OFF 565 /* for trigger altar with last_sp, the ON/OFF
529 * status (-> +/- value) is "simulated": 566 * status (-> +/- value) is "simulated":
530 */ 567 */
531 op->value = !op->value; 568 op->value = !op->value;
532 trigger_move (op, 1); 569 trigger_move (op, 1, cause);
533 op->last_sp = -op->last_sp; 570 op->last_sp = -op->last_sp;
534 op->value = !op->value; 571 op->value = !op->value;
535 } 572 }
536 573
537 return cause == NULL; 574 return cause == NULL;
… …
551 * it will push the connected value only once per sacrifice. 588 * it will push the connected value only once per sacrifice.
552 * Otherwise (default), the connected value will be 589 * Otherwise (default), the connected value will be
553 * pushed twice: First by sacrifice, second by reset! -AV 590 * pushed twice: First by sacrifice, second by reset! -AV
554 */ 591 */
555 if (!op->last_sp) 592 if (!op->last_sp)
556 trigger_move (op, 0); 593 trigger_move (op, 0, cause);
557 else 594 else
558 { 595 {
559 op->stats.wc = 0; 596 op->stats.wc = 0;
560 op->value = !op->value; 597 op->value = !op->value;
561 op->set_speed (0); 598 op->set_speed (0);
… …
576 { 613 {
577 SET_ANIMATION (op, push); 614 SET_ANIMATION (op, push);
578 update_object (op, UP_OBJ_FACE); 615 update_object (op, UP_OBJ_FACE);
579 } 616 }
580 617
581 trigger_move (op, push); 618 trigger_move (op, push, cause);
582 return 1; 619 return 1;
583 620
584 default: 621 default:
585 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 622 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
586 return 0; 623 return 0;
587 } 624 }
588} 625}
589 626
590void 627void
591add_button_link (object *button, maptile *map, int connected) 628object::add_link (maptile *map, shstr_tmp id)
592{ 629{
593 oblinkpt *obp;
594 objectlink *ol = get_objectlink ();
595
596 if (!map) 630 if (!map)
597 { 631 {
598 LOG (llevError, "Tried to add button-link without map.\n"); 632 LOG (llevError, "Tried to add button-link without map.\n");
599 return; 633 return;
600 } 634 }
601 635
602 button->path_attuned = connected; /* peterm: I need this so I can rebuild 636 flag [FLAG_IS_LINKED] = true;
603 a connected map from a template map. */
604 637
605 SET_FLAG (button, FLAG_IS_LINKED); 638 objectlink *ol = get_objectlink ();
606
607 ol->ob = button; 639 ol->ob = this;
608 640
609 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next) 641 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
610 ; 642 if (obp->id == id)
611
612 if (obp)
613 { 643 {
614 ol->next = obp->link; 644 ol->next = obp->link;
615 obp->link = ol; 645 obp->link = ol;
646 return;
616 } 647 }
617 else 648
618 {
619 obp = get_objectlinkpt (); 649 oblinkpt *obp = get_objectlinkpt ();
620 obp->value = connected; 650 obp->id = id;
621 651
622 obp->next = map->buttons; 652 obp->next = map->buttons;
623 map->buttons = obp; 653 map->buttons = obp;
624 obp->link = ol; 654 obp->link = ol;
625 }
626} 655}
627 656
628/* 657/*
629 * Remove the object from the linked lists of buttons in the map. 658 * Remove the object from the linked lists of buttons in the map.
630 * This is only needed by editors. 659 * This is only needed by editors.
631 */ 660 */
632
633void 661void
634remove_button_link (object *op) 662object::remove_link ()
635{ 663{
636 oblinkpt *obp; 664 if (!map)
637 objectlink **olp, *ol;
638
639 if (op->map == NULL)
640 { 665 {
641 LOG (llevError, "remove_button_link() in object without map.\n"); 666 LOG (llevError, "remove_button_link() in object without map.\n");
642 return; 667 return;
643 } 668 }
644 669
645 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 670 if (!flag [FLAG_IS_LINKED])
646 { 671 {
647 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 672 LOG (llevError, "remove_button_linked() in unlinked object.\n");
648 return; 673 return;
649 } 674 }
650 675
676 flag [FLAG_IS_LINKED] = false;
677
651 for (obp = op->map->buttons; obp; obp = obp->next) 678 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
652 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 679 for (objectlink **olp = &obp->link; *olp; olp = &(*olp)->next)
653 if (ol->ob == op) 680 if ((*olp)->ob == this)
654 { 681 {
655 682 objectlink *ol = *olp;
656/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
657 obp->value, op->name, op->map->path);
658*/
659 *olp = ol->next; 683 *olp = ol->next;
660 delete ol; 684 delete ol;
661 return; 685 return;
662 } 686 }
663 687
664 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 688 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
665 CLEAR_FLAG (op, FLAG_IS_LINKED); 689}
690
691/*
692 * Updates every button on the map (by calling update_button() for them).
693 */
694void
695maptile::update_buttons ()
696{
697 for (oblinkpt *obp = buttons; obp; obp = obp->next)
698 for (objectlink *ol = obp->link; ol; ol = ol->next)
699 {
700 if (!ol->ob)
701 {
702 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
703 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, &obp->id);
704 continue;
705 }
706
707 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
708 {
709 update_button (ol->ob, 0);
710 break;
711 }
712 }
666} 713}
667 714
668/* 715/*
669 * Gets the objectlink for this connection from the map. 716 * Gets the objectlink for this connection from the map.
670 */ 717 */
671oblinkpt * 718oblinkpt *
672get_connection_links (maptile *map, long connection) 719maptile::find_link (shstr_tmp id)
673{ 720{
674 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 721 for (oblinkpt *obp = buttons; obp; obp = obp->next)
675 if (obp->value == connection) 722 if (obp->id == id)
676 return obp; 723 return obp;
677 724
678 return 0; 725 return 0;
679} 726}
680 727
681/* 728/*
682 * Return the first objectlink in the objects linked to this one 729 * Return the first objectlink in the objects linked to this one
683 */ 730 */
684
685oblinkpt * 731oblinkpt *
686get_button_links (const object *button) 732object::find_link () const
687{ 733{
688 oblinkpt *obp; 734 if (map)
689 objectlink *ol;
690
691 if (!button->map)
692 return NULL;
693
694 for (obp = button->map->buttons; obp; obp = obp->next) 735 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
695 for (ol = obp->link; ol; ol = ol->next) 736 for (objectlink *ol = obp->link; ol; ol = ol->next)
696 if (ol->ob == button) 737 if (ol->ob == this)
697 return obp; 738 return obp;
698 739
699 return NULL;
700}
701
702/*
703 * Made as a separate function to increase efficiency
704 */
705
706int
707get_button_value (const object *button)
708{
709 oblinkpt *obp;
710 objectlink *ol;
711
712 if (!button->map)
713 return 0;
714 for (obp = button->map->buttons; obp; obp = obp->next)
715 for (ol = obp->link; ol; ol = ol->next)
716 if (ol->ob == button)
717 return obp->value;
718 return 0; 740 return 0;
719} 741}
720 742
721/* This routine makes monsters who are 743/* This routine makes monsters who are
722 * standing on the 'mood floor' change their 744 * standing on the 'mood floor' change their
… …
724 * If floor is to be triggered must have 746 * If floor is to be triggered must have
725 * a speed of zero (default is 1 for all 747 * a speed of zero (default is 1 for all
726 * but the charm floor type). 748 * but the charm floor type).
727 * by b.t. thomas@nomad.astro.psu.edu 749 * by b.t. thomas@nomad.astro.psu.edu
728 */ 750 */
729
730void 751void
731do_mood_floor (object *op, object *source) 752do_mood_floor (object *op, object *source)
732{ 753{
733 if (!source) 754 if (!source)
734 source = op; 755 source = op;
… …
739 return; 760 return;
740 761
741 object *tmp; 762 object *tmp;
742 763
743 for (tmp = ms.top; tmp; tmp = tmp->below) 764 for (tmp = ms.top; tmp; tmp = tmp->below)
744 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 765 if (tmp->flag [FLAG_MONSTER])
745 break; 766 break;
746 767
747 /* doesn't effect players, and if there is a player on this space, won't also 768 /* doesn't effect players, and if there is a player on this space, won't also
748 * be a monster here. 769 * be a monster here.
749 */ 770 */
… …
752 return; 773 return;
753 774
754 switch (op->last_sp) 775 switch (op->last_sp)
755 { 776 {
756 case 0: /* furious--make all monsters mad */ 777 case 0: /* furious--make all monsters mad */
757 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 778 if (tmp->flag [FLAG_UNAGGRESSIVE])
758 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 779 tmp->clr_flag (FLAG_UNAGGRESSIVE);
759 780
760 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 781 if (tmp->flag [FLAG_FRIENDLY])
761 { 782 {
762 tmp->attack_movement = 0; 783 tmp->attack_movement = 0;
763 /* lots of checks here, but want to make sure we don't 784 /* lots of checks here, but want to make sure we don't
764 * dereference a null value 785 * dereference a null value
765 */ 786 */
… …
774 remove_friendly_object (tmp); 795 remove_friendly_object (tmp);
775 } 796 }
776 break; 797 break;
777 798
778 case 1: /* angry -- get neutral monsters mad */ 799 case 1: /* angry -- get neutral monsters mad */
779 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 800 if (tmp->flag [FLAG_UNAGGRESSIVE] && !tmp->flag [FLAG_FRIENDLY])
780 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 801 tmp->clr_flag (FLAG_UNAGGRESSIVE);
781 break; 802 break;
782 803
783 case 2: /* calm -- pacify unfriendly monsters */ 804 case 2: /* calm -- pacify unfriendly monsters */
784 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 805 tmp->set_flag (FLAG_UNAGGRESSIVE);
785 break; 806 break;
786 807
787 case 3: /* make all monsters fall asleep */ 808 case 3: /* make all monsters fall asleep */
788 SET_FLAG (tmp, FLAG_SLEEP); 809 tmp->set_flag (FLAG_SLEEP);
789 break; 810 break;
790 811
791 case 4: /* charm all monsters */ 812 case 4: /* charm all monsters */
792 if (op == source) 813 if (op == source)
793 break; /* only if 'connected' */ 814 break; /* only if 'connected' */
794 815
795 if (object *pl = source->ms ().player ()) 816 if (object *pl = source->ms ().player ())
796 { 817 {
797 tmp->set_owner (pl); 818 tmp->set_owner (pl);
798 SET_FLAG (tmp, FLAG_MONSTER); 819 tmp->set_flag (FLAG_MONSTER);
799 820
800 tmp->stats.exp = 0; 821 tmp->stats.exp = 0;
801 822
802 add_friendly_object (tmp); 823 add_friendly_object (tmp);
803 tmp->attack_movement = PETMOVE; 824 tmp->attack_movement = PETMOVE;
804 } 825 }
805 break; 826 break;
806 827
807 case 6: // kill monsters 828 case 6: // kill monsters
808 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY)) 829 if (!tmp->flag [FLAG_FRIENDLY])
809 break; 830 break;
810 831
811 // FALL THROUGH 832 // FALL THROUGH
812 case 5: // kill all alives 833 case 5: // kill all alives
813 if (!tmp->flag [FLAG_PRECIOUS]) 834 if (!tmp->flag [FLAG_PRECIOUS])
… …
898 { 919 {
899 if (trig->last_heal) 920 if (trig->last_heal)
900 match->decrease (); 921 match->decrease ();
901 922
902 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left 923 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
903 push_button (trig); 924 push_button (trig, op);
904 } 925 }
905 else if (!match && !trig->last_sp) // match == not having 926 else if (!match && !trig->last_sp) // match == not having
906 { 927 {
907 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left 928 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
908 push_button (trig); 929 push_button (trig, op);
909 } 930 }
910} 931}
911 932

Diff Legend

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