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.42 by root, Sun Apr 20 22:03:21 2008 UTC vs.
Revision 1.55 by root, Mon Oct 12 04:02:17 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 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
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
… …
20 * 20 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <funcpoint.h>
26 25
27/* 26/*
28 * This code is no longer highly inefficient 8) 27 * This code is no longer highly inefficient 8)
29 */ 28 */
30 29
31/* 30/*
32 * elmex: 31 * elmex:
33 * This function takes a objectlink list with all the objects are going to be activated. 32 * This function takes a objectlink list with all the objects are going to be activated.
34 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set. 33 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
35 * The source argument can be 0 or the source object for this activation. 34 * The activator argument can be 0 or the source object for this activation.
35 * the originator is the player or monster who did something.
36 */ 36 */
37void 37static void
38activate_connection_link (objectlink * ol, bool state, object *source = 0) 38activate_connection_link (objectlink *ol, int state, object *activator, object *originator)
39{ 39{
40 for (; ol; ol = ol->next) 40 for (; ol; ol = ol->next)
41 { 41 {
42 if (!ol->ob) 42 if (!ol->ob)
43 { 43 {
… …
106 SET_ANIMATION (tmp, tmp->value); 106 SET_ANIMATION (tmp, tmp->value);
107 update_object (tmp, UP_OBJ_FACE); 107 update_object (tmp, UP_OBJ_FACE);
108 break; 108 break;
109 109
110 case MOOD_FLOOR: 110 case MOOD_FLOOR:
111 do_mood_floor (tmp, source); 111 do_mood_floor (tmp, activator);
112 break; 112 break;
113 113
114 case TIMED_GATE: 114 case TIMED_GATE:
115 if (!tmp->active) 115 if (!tmp->active)
116 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate")); 116 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
117
117 tmp->set_speed (tmp->arch->speed); 118 tmp->set_speed (tmp->arch->speed);
118 tmp->value = tmp->arch->value; 119 tmp->value = tmp->arch->value;
119 tmp->stats.sp = 1; 120 tmp->stats.sp = 1;
120 tmp->stats.hp = tmp->stats.maxhp; 121 tmp->stats.hp = tmp->stats.maxhp;
121 /* Handle multipart gates. We copy the value for the other parts 122 /* Handle multipart gates. We copy the value for the other parts
… …
134 case FIREWALL: 135 case FIREWALL:
135 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 136 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
136 move_firewall (tmp); 137 move_firewall (tmp);
137 else 138 else
138 { 139 {
139 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 140 tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
140 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
141
142 animate_turning (tmp); 141 animate_turning (tmp);
143 } 142 }
144 break; 143 break;
145 144
146 case TELEPORTER: 145 case TELEPORTER:
… …
156 move_marker (tmp); 155 move_marker (tmp);
157 break; 156 break;
158 157
159 case DUPLICATOR: 158 case DUPLICATOR:
160 move_duplicator (tmp); 159 move_duplicator (tmp);
160 break;
161
162 case MAPSCRIPT:
163 cfperl_mapscript_activate (tmp, state, activator, originator);
161 break; 164 break;
162 } 165 }
163 } 166 }
164} 167}
165 168
… …
174 * Changed the routine to loop through _all_ objects. 177 * Changed the routine to loop through _all_ objects.
175 * Better hurry with that linked list... 178 * Better hurry with that linked list...
176 * 179 *
177 */ 180 */
178void 181void
179push_button (object *op) 182push_button (object *op, object *originator)
180{ 183{
181 oblinkpt *obp = get_button_links (op); 184 if (oblinkpt *obp = op->find_link ())
182 185 {
183 if (!obp) 186 if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value), ARG_OBJECT (op), ARG_OBJECT (originator)))
184 return; 187 return;
185 188
186 if (INVOKE_MAP (TRIGGER, op->map, ARG_INT64 (obp->value), ARG_INT (op->value)))
187 return;
188
189 activate_connection_link (obp->link, op->value, op); 189 activate_connection_link (obp->link, op->value, op, originator);
190 }
190} 191}
191 192
192/* 193/*
193 * elmex: 194 * elmex:
194 * This activates a connection, similar to push_button (object *op) but it takes 195 * This activates a connection, similar to push_button (object *op) but it takes
… …
196 * the connection was 'state' or 'released'. So that you can activate objects 197 * the connection was 'state' or 'released'. So that you can activate objects
197 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 198 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
198 * 199 *
199 */ 200 */
200void 201void
201activate_connection (maptile *map, long connection, bool state) 202maptile::trigger (shstr_tmp id, int state, object *activator, object *originator)
202{ 203{
203 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) 204 if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator)))
204 return; 205 return;
205 206
206 oblinkpt *obp = get_connection_links (map, connection); 207 if (oblinkpt *obp = find_link (id))
207
208 if (obp)
209 activate_connection_link (obp->link, state); 208 activate_connection_link (obp->link, state, activator, originator);
210} 209}
211 210
212/* 211/*
213 * Updates everything connected with the button op. 212 * Updates everything connected with the button op.
214 * After changing the state of a button, this function must be called 213 * After changing the state of a button, this function must be called
215 * to make sure that all gates and other buttons connected to the 214 * to make sure that all gates and other buttons connected to the
216 * button reacts to the (eventual) change of state. 215 * button reacts to the (eventual) change of state.
217 */ 216 */
218void 217void
219update_button (object *op) 218update_button (object *op, object *originator)
220{ 219{
221 object *ab, *tmp, *head;
222 int tot, any_down = 0, old_value = op->value; 220 int any_down = 0, old_value = op->value;
223 oblinkpt *obp = 0;
224 objectlink *ol;
225 221
226 obp = get_button_links (op); 222 if (oblinkpt *obp = op->find_link ())
227 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
228 if (obp)
229 for (ol = obp->link; ol; ol = ol->next) 223 for (objectlink *ol = obp->link; ol; ol = ol->next)
230 { 224 {
231 if (!ol->ob) 225 if (!ol->ob)
232 { 226 {
233 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 227 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
234 continue; 228 continue;
235 } 229 }
236 230
237 tmp = ol->ob; 231 object *tmp = ol->ob;
232
238 if (tmp->type == BUTTON) 233 if (tmp->type == BUTTON)
239 { 234 {
235 sint32 total = 0;
236
240 for (ab = tmp->above, tot = 0; ab; ab = ab->above) 237 for (object *ab = tmp->above; ab; ab = ab->above)
238 /* Basically, if the move_type matches that on what the
239 * button wants, we count it. The second check is so that
240 * objects who don't move (swords, etc) will count. Note that
241 * this means that more work is needed to make buttons
242 * that are only triggered by flying objects.
243 */
244 if ((ab->move_type & tmp->move_on) || ab->move_type == 0)
245 total += ab->head_ ()->total_weight ();
246
247 tmp->value = total >= tmp->weight;
248
249 any_down = any_down || tmp->value;
250 }
251 else if (tmp->type == PEDESTAL)
252 {
253 bool is_match = is_match_expr (tmp->slaying);
254 tmp->value = 0;
255
256 for (object *ab = tmp->above; ab; ab = ab->above)
241 { 257 {
242 head = ab->head_ (); 258 object *head = ab->head_ ();
243 259
244 /* Basically, if the move_type matches that on what the 260 /* Same note regarding move_type for buttons above apply here. */
245 * button wants, we count it. The second check is so that
246 * objects who don't move (swords, etc) will count. Note that
247 * this means that more work is needed to make buttons
248 * that are only triggered by flying objects.
249 */
250 if ((head->move_type & tmp->move_on) || head->move_type == 0) 261 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
251 tot += head->total_weight (); 262 if (is_match
263 ? match (tmp->slaying, head, tmp, originator)
264 : (head->race == tmp->slaying
265 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
266 || (tmp->slaying == shstr_player && head->type == PLAYER)))
267 {
268 tmp->value = 1;
269 break;
270 }
252 } 271 }
253 272
254 tmp->value = tot >= tmp->weight ? 1 : 0;
255 }
256 else if (tmp->type == PEDESTAL)
257 {
258 tmp->value = 0;
259
260 for (ab = tmp->above; ab; ab = ab->above)
261 {
262 head = ab->head_ ();
263
264 /* Same note regarding move_type for buttons above apply here. */
265 if (((head->move_type & tmp->move_on) || ab->move_type == 0) &&
266 (head->race == tmp->slaying ||
267 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) ||
268 (!strcmp (tmp->slaying, "player") && head->type == PLAYER)))
269 tmp->value = 1;
270 }
271 }
272
273 any_down = any_down || tmp->value; 273 any_down = any_down || tmp->value;
274 }
274 } 275 }
275 276
276 if (any_down) /* If any other buttons were down, force this to remain down */ 277 if (any_down) /* If any other buttons were down, force this to remain down */
277 op->value = 1; 278 op->value = 1;
278 279
280 //LOG(llevDebug, "update_button: %s (%d, %d=%d)\n", &op->name, op->count, op->value, old_value);
281
279 /* If this button hasn't changed, don't do anything */ 282 /* If this button hasn't changed, don't do anything */
280 if (op->value != old_value) 283 if (op->value != old_value)
281 { 284 {
282 SET_ANIMATION (op, op->value); 285 SET_ANIMATION (op, op->value);
283 update_object (op, UP_OBJ_FACE); 286 update_object (op, UP_OBJ_FACE);
284 push_button (op); /* Make all other buttons the same */ 287 push_button (op, originator); /* Make all other buttons the same */
285 } 288 }
286} 289}
287 290
288void 291void
289use_trigger (object *op) 292use_trigger (object *op, object *originator)
290{ 293{
291 /* Toggle value */ 294 /* Toggle value */
292 op->value = !op->value; 295 op->value = !op->value;
296
293 push_button (op); 297 push_button (op, originator);
294} 298}
295 299
296/* 300/*
297 * Note: animate_object should be used instead of this, 301 * Note: animate_object should be used instead of this,
298 * but it can't handle animations in the 8 directions 302 * but it can't handle animations in the 8 directions
… …
319 * sacrificed. This fixes a bug of trying to put multiple altars/related 323 * sacrificed. This fixes a bug of trying to put multiple altars/related
320 * objects on the same space that take the same sacrifice. 324 * objects on the same space that take the same sacrifice.
321 */ 325 */
322 326
323int 327int
324check_altar_sacrifice (const object *altar, const object *sacrifice) 328check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
325{ 329{
330 if (sacrifice->flag [FLAG_UNPAID])
331 return 0;
332
333 if (is_match_expr (ARCH_SACRIFICE (altar)))
334 return match (ARCH_SACRIFICE (altar), altar, originator);
335
326 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) 336 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
327 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 337 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
328 && sacrifice->type != PLAYER) 338 && sacrifice->type != PLAYER)
329 { 339 {
330 if (ARCH_SACRIFICE (altar) == shstr_money 340 if (ARCH_SACRIFICE (altar) == shstr_money
… …
351 * 361 *
352 * If this function returns 1, '*sacrifice' is modified to point to the 362 * 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. 363 * remaining sacrifice, or is set to NULL if the sacrifice was used up.
354 */ 364 */
355int 365int
356operate_altar (object *altar, object **sacrifice) 366operate_altar (object *altar, object **sacrifice, object *originator)
357{ 367{
358 if (!altar->map) 368 if (!altar->map)
359 { 369 {
360 LOG (llevError, "BUG: operate_altar(): altar has no map\n"); 370 LOG (llevError, "BUG: operate_altar(): altar has no map\n");
361 return 0; 371 return 0;
362 } 372 }
363 373
364 if (!altar->slaying || altar->value) 374 if (!altar->slaying || altar->value)
365 return 0; 375 return 0;
366 376
367 if (!check_altar_sacrifice (altar, *sacrifice)) 377 if (!check_altar_sacrifice (altar, *sacrifice, originator))
368 return 0; 378 return 0;
369 379
370 /* check_altar_sacrifice should have already verified that enough money 380 /* check_altar_sacrifice should have already verified that enough money
371 * has been dropped. 381 * has been dropped.
372 */ 382 */
… …
376 386
377 /* Round up any sacrifices. Altars don't make change either */ 387 /* Round up any sacrifices. Altars don't make change either */
378 if (NROF_SACRIFICE (altar) % (*sacrifice)->value) 388 if (NROF_SACRIFICE (altar) % (*sacrifice)->value)
379 number++; 389 number++;
380 390
381 *sacrifice = decrease_ob_nr (*sacrifice, number); 391 if (!(*sacrifice)->decrease (number))
392 *sacrifice = 0;
382 } 393 }
383 else 394 else
384 *sacrifice = decrease_ob_nr (*sacrifice, NROF_SACRIFICE (altar)); 395 if (!(*sacrifice)->decrease (NROF_SACRIFICE (altar)))
396 *sacrifice = 0;
385 397
386 if (altar->msg) 398 if (altar->msg)
387 new_info_map (NDI_BLACK, altar->map, altar->msg); 399 new_info_map (NDI_BLACK, altar->map, altar->msg);
388 400
389 return 1; 401 return 1;
390} 402}
391 403
392void 404void
393trigger_move (object *op, int state) /* 1 down and 0 up */ 405trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */
394{ 406{
395 op->stats.wc = state; 407 op->stats.wc = state;
408
396 if (state) 409 if (state)
397 { 410 {
398 use_trigger (op); 411 use_trigger (op, originator);
399 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.); 412 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
400 op->speed_left = -1; 413 op->speed_left = -1;
401 } 414 }
402 else 415 else
403 { 416 {
404 use_trigger (op); 417 use_trigger (op, originator);
405 op->set_speed (0); 418 op->set_speed (0);
406 } 419 }
407} 420}
408 421
409 422
… …
418 * TRIGGER: Returns 1 if handle could be moved, 0 if not. 431 * TRIGGER: Returns 1 if handle could be moved, 0 if not.
419 * 432 *
420 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0. 433 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
421 */ 434 */
422int 435int
423check_trigger (object *op, object *cause) 436check_trigger (object *op, object *cause, object *originator)
424{ 437{
425 object *tmp; 438 object *tmp;
426 int push = 0, tot = 0; 439 int push = 0, tot = 0;
427 int in_movement = op->stats.wc || op->speed; 440 int in_movement = op->stats.wc || op->speed;
428 441
429 switch (op->type) 442 switch (op->type)
430 { 443 {
431 case TRIGGER_BUTTON: 444 case TRIGGER_BUTTON:
432 if (op->weight > 0) 445 if (op->weight > 0)
433 { 446 {
434 if (cause) 447 if (cause)
435 { 448 {
436 for (tmp = op->above; tmp; tmp = tmp->above) 449 for (tmp = op->above; tmp; tmp = tmp->above)
437 /* Comment reproduced from update_buttons(): */ 450 /* Comment reproduced from update_buttons(): */
438 /* Basically, if the move_type matches that on what the 451 /* Basically, if the move_type matches that on what the
439 * button wants, we count it. The second check is so that 452 * button wants, we count it. The second check is so that
440 * objects that don't move (swords, etc) will count. Note that 453 * objects that don't move (swords, etc) will count. Note that
441 * this means that more work is needed to make buttons 454 * this means that more work is needed to make buttons
442 * that are only triggered by flying objects. 455 * that are only triggered by flying objects.
456 */
457 if ((tmp->move_type & op->move_on) || tmp->move_type == 0)
458 tot += tmp->head_ ()->total_weight ();
459
460 if (tot >= op->weight)
461 push = 1;
462
463 if (op->stats.ac == push)
464 return 0;
465
466 op->stats.ac = push;
467 if (NUM_ANIMATIONS (op) > 1)
468 {
469 SET_ANIMATION (op, push);
470 update_object (op, UP_OBJ_FACE);
471 }
472
473 if (in_movement || !push)
474 return 0;
475 }
476
477 trigger_move (op, push, cause);
478 }
479
480 return 0;
481
482 case TRIGGER_PEDESTAL:
483 if (cause)
484 {
485 for (tmp = op->above; tmp; tmp = tmp->above)
486 {
487 object *head = tmp->head_ ();
488
489 /* See comment in TRIGGER_BUTTON about move_types */
490 if (((head->move_type & op->move_on) || head->move_type == 0)
491 && (head->race == op->slaying || (op->slaying == shstr_player && head->type == PLAYER)))
492 {
493 push = 1;
494 break;
495 }
496 }
497
498 if (op->stats.ac == push)
499 return 0;
500
501 op->stats.ac = push;
502
503 if (NUM_ANIMATIONS (op) > 1)
504 {
505 SET_ANIMATION (op, push);
506 update_object (op, UP_OBJ_FACE);
507 }
508
509 update_object (op, UP_OBJ_FACE);
510
511 if (in_movement || !push)
512 return 0;
513 }
514
515 trigger_move (op, push, cause);
516 return 0;
517
518 case TRIGGER_ALTAR:
519 if (cause)
520 {
521 if (in_movement)
522 return 0;
523
524 if (operate_altar (op, &cause)) /* TODO: originator? */
525 {
526 if (NUM_ANIMATIONS (op) > 1)
527 {
528 SET_ANIMATION (op, 1);
529 update_object (op, UP_OBJ_FACE);
530 }
531
532 if (op->last_sp >= 0)
533 {
534 trigger_move (op, 1, cause);
535
536 if (op->last_sp > 0)
537 op->last_sp = -op->last_sp;
538 }
539 else
540 {
541 /* for trigger altar with last_sp, the ON/OFF
542 * status (-> +/- value) is "simulated":
443 */ 543 */
444 if ((tmp->move_type & op->move_on) || tmp->move_type == 0) 544 op->value = !op->value;
445 tot += tmp->head_ ()->total_weight (); 545 trigger_move (op, 1, cause);
446 546 op->last_sp = -op->last_sp;
447 if (tot >= op->weight) 547 op->value = !op->value;
448 push = 1;
449
450 if (op->stats.ac == push)
451 return 0;
452
453 op->stats.ac = push;
454 if (NUM_ANIMATIONS (op) > 1)
455 {
456 SET_ANIMATION (op, push);
457 update_object (op, UP_OBJ_FACE);
458 } 548 }
459 549
460 if (in_movement || !push) 550 return cause == NULL;
461 return 0;
462 } 551 }
463 trigger_move (op, push);
464 } 552 else
465
466 return 0;
467
468 case TRIGGER_PEDESTAL:
469 if (cause)
470 {
471 for (tmp = op->above; tmp; tmp = tmp->above)
472 {
473 object *head = tmp->head_ ();
474
475 /* See comment in TRIGGER_BUTTON about move_types */
476 if (((head->move_type & op->move_on) || head->move_type == 0)
477 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
478 {
479 push = 1;
480 break;
481 }
482 }
483
484 if (op->stats.ac == push)
485 return 0; 553 return 0;
486 554 }
487 op->stats.ac = push; 555 else
488 556 {
489 if (NUM_ANIMATIONS (op) > 1) 557 if (NUM_ANIMATIONS (op) > 1)
490 { 558 {
491 SET_ANIMATION (op, push); 559 SET_ANIMATION (op, 0);
492 update_object (op, UP_OBJ_FACE); 560 update_object (op, UP_OBJ_FACE);
493 } 561 }
494 562
495 update_object (op, UP_OBJ_FACE);
496
497 if (in_movement || !push)
498 return 0;
499 }
500
501 trigger_move (op, push);
502 return 0;
503
504 case TRIGGER_ALTAR:
505 if (cause)
506 {
507 if (in_movement)
508 return 0;
509
510 if (operate_altar (op, &cause))
511 {
512 if (NUM_ANIMATIONS (op) > 1)
513 {
514 SET_ANIMATION (op, 1);
515 update_object (op, UP_OBJ_FACE);
516 }
517
518 if (op->last_sp >= 0)
519 {
520 trigger_move (op, 1);
521 if (op->last_sp > 0)
522 op->last_sp = -op->last_sp;
523 }
524 else
525 {
526 /* for trigger altar with last_sp, the ON/OFF
527 * status (-> +/- value) is "simulated":
528 */
529 op->value = !op->value;
530 trigger_move (op, 1);
531 op->last_sp = -op->last_sp;
532 op->value = !op->value;
533 }
534
535 return cause == NULL;
536 }
537 else
538 return 0;
539 }
540 else
541 {
542 if (NUM_ANIMATIONS (op) > 1)
543 {
544 SET_ANIMATION (op, 0);
545 update_object (op, UP_OBJ_FACE);
546 }
547
548 /* If trigger_altar has "last_sp > 0" set on the map, 563 /* If trigger_altar has "last_sp > 0" set on the map,
549 * it will push the connected value only once per sacrifice. 564 * it will push the connected value only once per sacrifice.
550 * Otherwise (default), the connected value will be 565 * Otherwise (default), the connected value will be
551 * pushed twice: First by sacrifice, second by reset! -AV 566 * pushed twice: First by sacrifice, second by reset! -AV
552 */ 567 */
553 if (!op->last_sp) 568 if (!op->last_sp)
554 trigger_move (op, 0); 569 trigger_move (op, 0, cause);
555 else 570 else
556 { 571 {
557 op->stats.wc = 0; 572 op->stats.wc = 0;
558 op->value = !op->value; 573 op->value = !op->value;
559 op->set_speed (0); 574 op->set_speed (0);
560 } 575 }
561 } 576 }
562 return 0; 577 return 0;
563 578
564 case TRIGGER: 579 case TRIGGER:
565 if (cause) 580 if (cause)
566 { 581 {
567 if (in_movement) 582 if (in_movement)
568 return 0; 583 return 0;
569 584
570 push = 1; 585 push = 1;
571 } 586 }
572 587
573 if (NUM_ANIMATIONS (op) > 1) 588 if (NUM_ANIMATIONS (op) > 1)
574 { 589 {
575 SET_ANIMATION (op, push); 590 SET_ANIMATION (op, push);
576 update_object (op, UP_OBJ_FACE); 591 update_object (op, UP_OBJ_FACE);
577 } 592 }
578 593
579 trigger_move (op, push); 594 trigger_move (op, push, cause);
580 return 1; 595 return 1;
581 596
582 default: 597 default:
583 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 598 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
584 return 0; 599 return 0;
585 } 600 }
586} 601}
587 602
588void 603void
589add_button_link (object *button, maptile *map, int connected) 604object::add_link (maptile *map, shstr_tmp id)
590{ 605{
591 oblinkpt *obp;
592 objectlink *ol = get_objectlink ();
593
594 if (!map) 606 if (!map)
595 { 607 {
596 LOG (llevError, "Tried to add button-link without map.\n"); 608 LOG (llevError, "Tried to add button-link without map.\n");
597 return; 609 return;
598 } 610 }
599 611
600 button->path_attuned = connected; /* peterm: I need this so I can rebuild 612 flag [FLAG_IS_LINKED] = true;
601 a connected map from a template map. */
602 613
603 SET_FLAG (button, FLAG_IS_LINKED); 614 objectlink *ol = get_objectlink ();
604
605 ol->ob = button; 615 ol->ob = this;
606 616
607 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next) 617 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
608 ; 618 if (obp->id == id)
609
610 if (obp)
611 { 619 {
612 ol->next = obp->link; 620 ol->next = obp->link;
613 obp->link = ol; 621 obp->link = ol;
622 return;
614 } 623 }
615 else 624
616 {
617 obp = get_objectlinkpt (); 625 oblinkpt *obp = get_objectlinkpt ();
618 obp->value = connected; 626 obp->id = id;
619 627
620 obp->next = map->buttons; 628 obp->next = map->buttons;
621 map->buttons = obp; 629 map->buttons = obp;
622 obp->link = ol; 630 obp->link = ol;
623 }
624} 631}
625 632
626/* 633/*
627 * Remove the object from the linked lists of buttons in the map. 634 * Remove the object from the linked lists of buttons in the map.
628 * This is only needed by editors. 635 * This is only needed by editors.
629 */ 636 */
630
631void 637void
632remove_button_link (object *op) 638object::remove_link ()
633{ 639{
634 oblinkpt *obp; 640 if (!map)
635 objectlink **olp, *ol;
636
637 if (op->map == NULL)
638 { 641 {
639 LOG (llevError, "remove_button_link() in object without map.\n"); 642 LOG (llevError, "remove_button_link() in object without map.\n");
640 return; 643 return;
641 } 644 }
642 645
643 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 646 if (!flag [FLAG_IS_LINKED])
644 { 647 {
645 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 648 LOG (llevError, "remove_button_linked() in unlinked object.\n");
646 return; 649 return;
647 } 650 }
648 651
652 flag [FLAG_IS_LINKED] = false;
653
649 for (obp = op->map->buttons; obp; obp = obp->next) 654 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
650 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 655 for (objectlink **olp = &obp->link; *olp; olp = &(*olp)->next)
651 if (ol->ob == op) 656 if ((*olp)->ob == this)
652 { 657 {
653 658 objectlink *ol = *olp;
654/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
655 obp->value, op->name, op->map->path);
656*/
657 *olp = ol->next; 659 *olp = ol->next;
658 delete ol; 660 delete ol;
659 return; 661 return;
660 } 662 }
661 663
662 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 664 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
663 CLEAR_FLAG (op, FLAG_IS_LINKED); 665}
666
667/*
668 * Updates every button on the map (by calling update_button() for them).
669 */
670void
671maptile::update_buttons ()
672{
673 for (oblinkpt *obp = buttons; obp; obp = obp->next)
674 for (objectlink *ol = obp->link; ol; ol = ol->next)
675 {
676 if (!ol->ob)
677 {
678 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
679 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, &obp->id);
680 continue;
681 }
682
683 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
684 {
685 update_button (ol->ob, 0);
686 break;
687 }
688 }
664} 689}
665 690
666/* 691/*
667 * Gets the objectlink for this connection from the map. 692 * Gets the objectlink for this connection from the map.
668 */ 693 */
669oblinkpt * 694oblinkpt *
670get_connection_links (maptile *map, long connection) 695maptile::find_link (shstr_tmp id)
671{ 696{
672 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 697 for (oblinkpt *obp = buttons; obp; obp = obp->next)
673 if (obp->value == connection) 698 if (obp->id == id)
674 return obp; 699 return obp;
675 700
676 return 0; 701 return 0;
677} 702}
678 703
679/* 704/*
680 * Return the first objectlink in the objects linked to this one 705 * Return the first objectlink in the objects linked to this one
681 */ 706 */
682
683oblinkpt * 707oblinkpt *
684get_button_links (const object *button) 708object::find_link () const
685{ 709{
686 oblinkpt *obp; 710 if (map)
687 objectlink *ol;
688
689 if (!button->map)
690 return NULL;
691
692 for (obp = button->map->buttons; obp; obp = obp->next) 711 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
693 for (ol = obp->link; ol; ol = ol->next) 712 for (objectlink *ol = obp->link; ol; ol = ol->next)
694 if (ol->ob == button) 713 if (ol->ob == this)
695 return obp; 714 return obp;
696 715
697 return NULL;
698}
699
700/*
701 * Made as a separate function to increase efficiency
702 */
703
704int
705get_button_value (const object *button)
706{
707 oblinkpt *obp;
708 objectlink *ol;
709
710 if (!button->map)
711 return 0;
712 for (obp = button->map->buttons; obp; obp = obp->next)
713 for (ol = obp->link; ol; ol = ol->next)
714 if (ol->ob == button)
715 return obp->value;
716 return 0; 716 return 0;
717} 717}
718 718
719/* This routine makes monsters who are 719/* This routine makes monsters who are
720 * standing on the 'mood floor' change their 720 * standing on the 'mood floor' change their
… …
722 * If floor is to be triggered must have 722 * If floor is to be triggered must have
723 * a speed of zero (default is 1 for all 723 * a speed of zero (default is 1 for all
724 * but the charm floor type). 724 * but the charm floor type).
725 * by b.t. thomas@nomad.astro.psu.edu 725 * by b.t. thomas@nomad.astro.psu.edu
726 */ 726 */
727
728void 727void
729do_mood_floor (object *op, object *source) 728do_mood_floor (object *op, object *source)
730{ 729{
731 if (!source) 730 if (!source)
732 source = op; 731 source = op;
… …
808 807
809 // FALL THROUGH 808 // FALL THROUGH
810 case 5: // kill all alives 809 case 5: // kill all alives
811 if (!tmp->flag [FLAG_PRECIOUS]) 810 if (!tmp->flag [FLAG_PRECIOUS])
812 { 811 {
813 get_archetype ("burnout")->insert_at (tmp, source); 812 archetype::get (shstr_burnout)->insert_at (tmp, source);
814 tmp->destroy (); 813 tmp->destroy ();
815 } 814 }
816 break; 815 break;
817 816
818 default: 817 default:
… …
893 // and we have to set the value to 0 892 // and we have to set the value to 0
894 893
895 if (match && trig->last_sp) // match == having 894 if (match && trig->last_sp) // match == having
896 { 895 {
897 if (trig->last_heal) 896 if (trig->last_heal)
898 decrease_ob (match); 897 match->decrease ();
899 898
900 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left 899 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
901 push_button (trig); 900 push_button (trig, op);
902 } 901 }
903 else if (!match && !trig->last_sp) // match == not having 902 else if (!match && !trig->last_sp) // match == not having
904 { 903 {
905 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left 904 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
906 push_button (trig); 905 push_button (trig, op);
907 } 906 }
908} 907}
909 908

Diff Legend

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