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.8 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.40 by root, Thu Nov 8 19:43:23 2007 UTC

1
2/* 1/*
3 * static char *rcsid_button_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 * "$Id: button.C,v 1.8 2006/09/11 20:28:37 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
12 7 *
13 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
14 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
15 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
16 (at your option) any later version. 11 * (at your option) any later version.
17 12 *
18 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,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details. 16 * GNU General Public License for more details.
22 17 *
23 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
24 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
26 21 * The authors can be reached via e-mail to <support@deliantra.net>
27 The authors can be reached via e-mail at crossfire-devel@real-time.com
28*/ 22 */
29 23
30#include <global.h> 24#include <global.h>
31#include <funcpoint.h> 25#include <funcpoint.h>
32 26
33/* 27/*
… …
41 * The source argument can be 0 or the source object for this activation. 35 * The source argument can be 0 or the source object for this activation.
42 */ 36 */
43void 37void
44activate_connection_link (objectlink * ol, bool state, object *source = 0) 38activate_connection_link (objectlink * ol, bool state, object *source = 0)
45{ 39{
46 object *tmp = 0;
47
48 for (; ol; ol = ol->next) 40 for (; ol; ol = ol->next)
49 { 41 {
50 if (!ol->ob || ol->ob->count != ol->id) 42 if (!ol->ob)
51 { 43 {
52 LOG (llevError, "Internal error in activate_connection_link (%ld).\n", ol->id); 44 LOG (llevError, "Internal error in activate_connection_link.\n");
53 continue; 45 continue;
54 } 46 }
47
55 /* a button link object can become freed when the map is saving. As 48 /* a button link object can become freed when the map is saving. As
56 * a map is saved, objects are removed and freed, and if an object is 49 * a map is saved, objects are removed and freed, and if an object is
57 * on top of a button, this function is eventually called. If a map 50 * on top of a button, this function is eventually called. If a map
58 * is getting moved out of memory, the status of buttons and levers 51 * is getting moved out of memory, the status of buttons and levers
59 * probably isn't important - it will get sorted out when the map is 52 * probably isn't important - it will get sorted out when the map is
60 * re-loaded. As such, just exit this function if that is the case. 53 * re-loaded. As such, just exit this function if that is the case.
61 */ 54 */
62 55
63 if (QUERY_FLAG (ol->ob, FLAG_FREED)) 56 if (QUERY_FLAG (ol->ob, FLAG_FREED))
64 return; 57 return;
58
65 tmp = ol->ob; 59 object *tmp = ol->ob;
66 60
67 /* if the criteria isn't appropriate, don't do anything */ 61 /* if the criteria isn't appropriate, don't do anything */
68 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) 62 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
69 continue; 63 continue;
64
70 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) 65 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
71 continue; 66 continue;
72 67
73 switch (tmp->type) 68 switch (tmp->type)
74 { 69 {
75 case GATE: 70 case GATE:
76 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"));
77 tmp->value = tmp->stats.maxsp ? !state : state; 76 tmp->value = tmp->stats.maxsp ? !state : state;
78 tmp->speed = 0.5; 77 tmp->set_speed (0.5);
79 update_ob_speed (tmp);
80 break; 78 break;
81 79
82 case CF_HANDLE: 80 case CF_HANDLE:
83 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 81 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
84 update_object (tmp, UP_OBJ_FACE); 82 update_object (tmp, UP_OBJ_FACE);
85 break; 83 break;
86 84
87 case SIGN: 85 case SIGN:
88 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 86 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
89 { 87 {
88 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign"));
90 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 89 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
91 if (tmp->stats.food) 90 if (tmp->stats.food)
92 tmp->last_eat++; 91 tmp->last_eat++;
93 } 92 }
94 break; 93 break;
95 94
96 case ALTAR: 95 case ALTAR:
96 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar"));
97 tmp->value = 1; 97 tmp->value = 1;
98 SET_ANIMATION (tmp, tmp->value); 98 SET_ANIMATION (tmp, tmp->value);
99 update_object (tmp, UP_OBJ_FACE); 99 update_object (tmp, UP_OBJ_FACE);
100 break; 100 break;
101 101
102 case BUTTON: 102 case BUTTON:
103 case PEDESTAL: 103 case PEDESTAL:
104 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button"));
104 tmp->value = state; 105 tmp->value = state;
105 SET_ANIMATION (tmp, tmp->value); 106 SET_ANIMATION (tmp, tmp->value);
106 update_object (tmp, UP_OBJ_FACE); 107 update_object (tmp, UP_OBJ_FACE);
107 break; 108 break;
108 109
109 case MOOD_FLOOR: 110 case MOOD_FLOOR:
110 do_mood_floor (tmp, source); 111 do_mood_floor (tmp, source);
111 break; 112 break;
112 113
113 case TIMED_GATE: 114 case TIMED_GATE:
115 if (!tmp->active)
116 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
114 tmp->speed = tmp->arch->clone.speed; 117 tmp->set_speed (tmp->arch->speed);
115 update_ob_speed (tmp); /* original values */
116 tmp->value = tmp->arch->clone.value; 118 tmp->value = tmp->arch->value;
117 tmp->stats.sp = 1; 119 tmp->stats.sp = 1;
118 tmp->stats.hp = tmp->stats.maxhp; 120 tmp->stats.hp = tmp->stats.maxhp;
119 /* Handle multipart gates. We copy the value for the other parts 121 /* Handle multipart gates. We copy the value for the other parts
120 * from the head - this ensures that the data will consistent 122 * from the head - this ensures that the data will consistent
121 */ 123 */
122 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more) 124 for (object *part = tmp->more; part; part = part->more)
123 { 125 {
124 tmp->speed = tmp->head->speed; 126 part->value = tmp->value;
125 tmp->value = tmp->head->value; 127 part->stats.sp = tmp->stats.sp;
126 tmp->stats.sp = tmp->head->stats.sp; 128 part->stats.hp = tmp->stats.hp;
127 tmp->stats.hp = tmp->head->stats.hp;
128 update_ob_speed (tmp); 129 part->set_speed (tmp->speed);
129 } 130 }
130 break; 131 break;
131 132
132 case DIRECTOR: 133 case DIRECTOR:
133 case FIREWALL: 134 case FIREWALL:
134 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 135 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
135 move_firewall (tmp); 136 move_firewall (tmp);
136 else 137 else
137 { 138 {
138 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 139 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
139 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 140 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
141
140 animate_turning (tmp); 142 animate_turning (tmp);
141 } 143 }
142 break; 144 break;
143 145
144 case TELEPORTER: 146 case TELEPORTER:
145 move_teleporter (tmp); 147 move_teleporter (tmp);
146 break; 148 break;
147 149
148 case CREATOR: 150 case CREATOR:
149 move_creator (tmp); 151 move_creator (tmp);
150 break; 152 break;
151 153
152 case TRIGGER_MARKER: 154 case TRIGGER_MARKER:
155 //tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
153 move_marker (tmp); 156 move_marker (tmp);
154 break; 157 break;
155 158
156 case DUPLICATOR: 159 case DUPLICATOR:
157 move_duplicator (tmp); 160 move_duplicator (tmp);
158 break; 161 break;
159 } 162 }
160 } 163 }
161} 164}
162 165
163/* 166/*
… …
193 * the connection was 'state' or 'released'. So that you can activate objects 196 * the connection was 'state' or 'released'. So that you can activate objects
194 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 197 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
195 * 198 *
196 */ 199 */
197void 200void
198activate_connection (mapstruct *map, long connection, bool state) 201activate_connection (maptile *map, long connection, bool state)
199{ 202{
200 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) 203 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state)))
201 return; 204 return;
202 205
203 oblinkpt *obp = get_connection_links (map, connection); 206 oblinkpt *obp = get_connection_links (map, connection);
… …
210 * Updates everything connected with the button op. 213 * Updates everything connected with the button op.
211 * After changing the state of a button, this function must be called 214 * After changing the state of a button, this function must be called
212 * to make sure that all gates and other buttons connected to the 215 * to make sure that all gates and other buttons connected to the
213 * button reacts to the (eventual) change of state. 216 * button reacts to the (eventual) change of state.
214 */ 217 */
215
216void 218void
217update_button (object *op) 219update_button (object *op)
218{ 220{
219 object *ab, *tmp, *head; 221 object *ab, *tmp, *head;
220 int tot, any_down = 0, old_value = op->value; 222 int tot, any_down = 0, old_value = op->value;
… …
224 obp = get_button_links (op); 226 obp = get_button_links (op);
225 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */ 227 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
226 if (obp) 228 if (obp)
227 for (ol = obp->link; ol; ol = ol->next) 229 for (ol = obp->link; ol; ol = ol->next)
228 { 230 {
229 if (!ol->ob || ol->ob->count != ol->id) 231 if (!ol->ob)
230 { 232 {
231 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 233 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
232 continue; 234 continue;
233 } 235 }
236
234 tmp = ol->ob; 237 tmp = ol->ob;
235 if (tmp->type == BUTTON) 238 if (tmp->type == BUTTON)
236 { 239 {
237 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above) 240 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above)
238 /* Bug? The pedestal code below looks for the head of 241 /* Bug? The pedestal code below looks for the head of
… …
258 else if (tmp->type == PEDESTAL) 261 else if (tmp->type == PEDESTAL)
259 { 262 {
260 tmp->value = 0; 263 tmp->value = 0;
261 for (ab = tmp->above; ab != NULL; ab = ab->above) 264 for (ab = tmp->above; ab != NULL; ab = ab->above)
262 { 265 {
263 head = ab->head ? ab->head : ab; 266 head = ab->head_ ();
264 /* Same note regarding move_type for buttons above apply here. */ 267 /* Same note regarding move_type for buttons above apply here. */
265 if (((head->move_type & tmp->move_on) || ab->move_type == 0) && 268 if (((head->move_type & tmp->move_on) || ab->move_type == 0) &&
266 (head->race == tmp->slaying || 269 (head->race == tmp->slaying ||
267 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || 270 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) ||
268 (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) 271 (!strcmp (tmp->slaying, "player") && head->type == PLAYER)))
269 tmp->value = 1; 272 tmp->value = 1;
270 } 273 }
274
271 if (tmp->value) 275 if (tmp->value)
272 any_down = 1; 276 any_down = 1;
273 } 277 }
274 } 278 }
275 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 */
… …
282 update_object (op, UP_OBJ_FACE); 286 update_object (op, UP_OBJ_FACE);
283 push_button (op); /* Make all other buttons the same */ 287 push_button (op); /* Make all other buttons the same */
284 } 288 }
285} 289}
286 290
287/*
288 * Updates every button on the map (by calling update_button() for them).
289 */
290
291void
292update_buttons (mapstruct *m)
293{
294 objectlink *ol;
295 oblinkpt *obp;
296
297 for (obp = m->buttons; obp; obp = obp->next)
298 for (ol = obp->link; ol; ol = ol->next)
299 {
300 if (!ol->ob || ol->ob->count != ol->id)
301 {
302 LOG (llevError, "Internal error in update_button (%s (%dx%d):%d, connected %ld).\n",
303 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, ol->id, obp->value);
304 continue;
305 }
306 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
307 {
308 update_button (ol->ob);
309 break;
310 }
311 }
312}
313
314void 291void
315use_trigger (object *op) 292use_trigger (object *op)
316{ 293{
317
318 /* Toggle value */ 294 /* Toggle value */
319 op->value = !op->value; 295 op->value = !op->value;
320 push_button (op); 296 push_button (op);
321} 297}
322 298
323/* 299/*
324 * Note: animate_object should be used instead of this, 300 * Note: animate_object should be used instead of this,
325 * but it can't handle animations in the 8 directions 301 * but it can't handle animations in the 8 directions
326 */ 302 */
327
328void 303void
329animate_turning (object *op) /* only one part objects */ 304animate_turning (object *op) /* only one part objects */
330{ 305{
331 if (++op->state >= NUM_ANIMATIONS (op) / 8) 306 if (++op->state >= NUM_ANIMATIONS (op) / 8)
332 op->state = 0; 307 op->state = 0;
… …
349 */ 324 */
350 325
351int 326int
352check_altar_sacrifice (const object *altar, const object *sacrifice) 327check_altar_sacrifice (const object *altar, const object *sacrifice)
353{ 328{
354 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)
355 { 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
356 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name || 338 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
357 ARCH_SACRIFICE (altar) == sacrifice->name || 339 || ARCH_SACRIFICE (altar) == sacrifice->name
358 ARCH_SACRIFICE (altar) == sacrifice->slaying || 340 || ARCH_SACRIFICE (altar) == sacrifice->slaying
359 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 341 || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
360 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 342 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
361 return 1; 343 return 1;
362 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
363 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
364 return 1;
365 } 344 }
345
366 return 0; 346 return 0;
367} 347}
368
369 348
370/* 349/*
371 * operate_altar checks if sacrifice was accepted and removes sacrificed 350 * operate_altar checks if sacrifice was accepted and removes sacrificed
372 * objects. If sacrifice was succeed return 1 else 0. Might be better to 351 * objects. If sacrifice was succeed return 1 else 0. Might be better to
373 * call check_altar_sacrifice (above) than depend on the return value, 352 * call check_altar_sacrifice (above) than depend on the return value,
374 * since operate_altar will remove the sacrifice also. 353 * since operate_altar will remove the sacrifice also.
375 * 354 *
376 * If this function returns 1, '*sacrifice' is modified to point to the 355 * If this function returns 1, '*sacrifice' is modified to point to the
377 * remaining sacrifice, or is set to NULL if the sacrifice was used up. 356 * remaining sacrifice, or is set to NULL if the sacrifice was used up.
378 */ 357 */
379
380int 358int
381operate_altar (object *altar, object **sacrifice) 359operate_altar (object *altar, object **sacrifice)
382{ 360{
383
384 if (!altar->map) 361 if (!altar->map)
385 { 362 {
386 LOG (llevError, "BUG: operate_altar(): altar has no map\n"); 363 LOG (llevError, "BUG: operate_altar(): altar has no map\n");
387 return 0; 364 return 0;
388 } 365 }
… …
401 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value; 378 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value;
402 379
403 /* Round up any sacrifices. Altars don't make change either */ 380 /* Round up any sacrifices. Altars don't make change either */
404 if (NROF_SACRIFICE (altar) % (*sacrifice)->value) 381 if (NROF_SACRIFICE (altar) % (*sacrifice)->value)
405 number++; 382 number++;
383
406 *sacrifice = decrease_ob_nr (*sacrifice, number); 384 *sacrifice = decrease_ob_nr (*sacrifice, number);
407 } 385 }
408 else 386 else
409 *sacrifice = decrease_ob_nr (*sacrifice, NROF_SACRIFICE (altar)); 387 *sacrifice = decrease_ob_nr (*sacrifice, NROF_SACRIFICE (altar));
410 388
411 if (altar->msg) 389 if (altar->msg)
412 new_info_map (NDI_BLACK, altar->map, altar->msg); 390 new_info_map (NDI_BLACK, altar->map, altar->msg);
391
413 return 1; 392 return 1;
414} 393}
415 394
416void 395void
417trigger_move (object *op, int state) /* 1 down and 0 up */ 396trigger_move (object *op, int state) /* 1 down and 0 up */
418{ 397{
419 op->stats.wc = state; 398 op->stats.wc = state;
420 if (state) 399 if (state)
421 { 400 {
422 use_trigger (op); 401 use_trigger (op);
423 if (op->stats.exp > 0) /* check sanity */ 402 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
424 op->speed = 1.0 / op->stats.exp;
425 else
426 op->speed = 1.0;
427 update_ob_speed (op);
428 op->speed_left = -1; 403 op->speed_left = -1;
429 } 404 }
430 else 405 else
431 { 406 {
432 use_trigger (op); 407 use_trigger (op);
433 op->speed = 0; 408 op->set_speed (0);
434 update_ob_speed (op);
435 } 409 }
436} 410}
437 411
438 412
439/* 413/*
… …
495 case TRIGGER_PEDESTAL: 469 case TRIGGER_PEDESTAL:
496 if (cause) 470 if (cause)
497 { 471 {
498 for (tmp = op->above; tmp; tmp = tmp->above) 472 for (tmp = op->above; tmp; tmp = tmp->above)
499 { 473 {
500 object *head = tmp->head ? tmp->head : tmp; 474 object *head = tmp->head_ ();
501 475
502 /* See comment in TRIGGER_BUTTON about move_types */ 476 /* See comment in TRIGGER_BUTTON about move_types */
503 if (((head->move_type & op->move_on) || head->move_type == 0) 477 if (((head->move_type & op->move_on) || head->move_type == 0)
504 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) 478 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
505 { 479 {
506 push = 1; 480 push = 1;
507 break; 481 break;
508 } 482 }
509 } 483 }
484
510 if (op->stats.ac == push) 485 if (op->stats.ac == push)
511 return 0; 486 return 0;
487
512 op->stats.ac = push; 488 op->stats.ac = push;
489
513 if (NUM_ANIMATIONS (op) > 1) 490 if (NUM_ANIMATIONS (op) > 1)
514 { 491 {
515 SET_ANIMATION (op, push); 492 SET_ANIMATION (op, push);
516 update_object (op, UP_OBJ_FACE); 493 update_object (op, UP_OBJ_FACE);
517 } 494 }
495
518 update_object (op, UP_OBJ_FACE); 496 update_object (op, UP_OBJ_FACE);
497
519 if (in_movement || !push) 498 if (in_movement || !push)
520 return 0; 499 return 0;
521 } 500 }
501
522 trigger_move (op, push); 502 trigger_move (op, push);
523 return 0; 503 return 0;
524 504
525 case TRIGGER_ALTAR: 505 case TRIGGER_ALTAR:
526 if (cause) 506 if (cause)
527 { 507 {
528 if (in_movement) 508 if (in_movement)
529 return 0; 509 return 0;
510
530 if (operate_altar (op, &cause)) 511 if (operate_altar (op, &cause))
531 { 512 {
532 if (NUM_ANIMATIONS (op) > 1) 513 if (NUM_ANIMATIONS (op) > 1)
533 { 514 {
534 SET_ANIMATION (op, 1); 515 SET_ANIMATION (op, 1);
535 update_object (op, UP_OBJ_FACE); 516 update_object (op, UP_OBJ_FACE);
536 } 517 }
518
537 if (op->last_sp >= 0) 519 if (op->last_sp >= 0)
538 { 520 {
539 trigger_move (op, 1); 521 trigger_move (op, 1);
540 if (op->last_sp > 0) 522 if (op->last_sp > 0)
541 op->last_sp = -op->last_sp; 523 op->last_sp = -op->last_sp;
… …
548 op->value = !op->value; 530 op->value = !op->value;
549 trigger_move (op, 1); 531 trigger_move (op, 1);
550 op->last_sp = -op->last_sp; 532 op->last_sp = -op->last_sp;
551 op->value = !op->value; 533 op->value = !op->value;
552 } 534 }
535
553 return cause == NULL; 536 return cause == NULL;
554 } 537 }
555 else 538 else
556 {
557 return 0; 539 return 0;
558 }
559 } 540 }
560 else 541 else
561 { 542 {
562 if (NUM_ANIMATIONS (op) > 1) 543 if (NUM_ANIMATIONS (op) > 1)
563 { 544 {
… …
574 trigger_move (op, 0); 555 trigger_move (op, 0);
575 else 556 else
576 { 557 {
577 op->stats.wc = 0; 558 op->stats.wc = 0;
578 op->value = !op->value; 559 op->value = !op->value;
579 op->speed = 0; 560 op->set_speed (0);
580 update_ob_speed (op);
581 } 561 }
582 } 562 }
583 return 0; 563 return 0;
584 564
585 case TRIGGER: 565 case TRIGGER:
586 if (cause) 566 if (cause)
587 { 567 {
588 if (in_movement) 568 if (in_movement)
589 return 0; 569 return 0;
570
590 push = 1; 571 push = 1;
591 } 572 }
573
592 if (NUM_ANIMATIONS (op) > 1) 574 if (NUM_ANIMATIONS (op) > 1)
593 { 575 {
594 SET_ANIMATION (op, push); 576 SET_ANIMATION (op, push);
595 update_object (op, UP_OBJ_FACE); 577 update_object (op, UP_OBJ_FACE);
596 } 578 }
579
597 trigger_move (op, push); 580 trigger_move (op, push);
598 return 1; 581 return 1;
599 582
600 default: 583 default:
601 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 584 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
602 return 0; 585 return 0;
603 } 586 }
604} 587}
605 588
606void 589void
607add_button_link (object *button, mapstruct *map, int connected) 590add_button_link (object *button, maptile *map, int connected)
608{ 591{
609 oblinkpt *obp; 592 oblinkpt *obp;
610 objectlink *ol = get_objectlink (); 593 objectlink *ol = get_objectlink ();
611 594
612 if (!map) 595 if (!map)
613 { 596 {
614 LOG (llevError, "Tried to add button-link without map.\n"); 597 LOG (llevError, "Tried to add button-link without map.\n");
615 return; 598 return;
616 } 599 }
617 if (!editor) 600
618 button->path_attuned = connected; /* peterm: I need this so I can rebuild 601 button->path_attuned = connected; /* peterm: I need this so I can rebuild
619 a connected map from a template map. */ 602 a connected map from a template map. */
620
621/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/
622 603
623 SET_FLAG (button, FLAG_IS_LINKED); 604 SET_FLAG (button, FLAG_IS_LINKED);
624 605
625 ol->ob = button; 606 ol->ob = button;
626 ol->id = button->count;
627 607
628 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); 608 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next)
609 ;
629 610
630 if (obp) 611 if (obp)
631 { 612 {
632 ol->next = obp->link; 613 ol->next = obp->link;
633 obp->link = ol; 614 obp->link = ol;
… …
657 if (op->map == NULL) 638 if (op->map == NULL)
658 { 639 {
659 LOG (llevError, "remove_button_link() in object without map.\n"); 640 LOG (llevError, "remove_button_link() in object without map.\n");
660 return; 641 return;
661 } 642 }
643
662 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 644 if (!QUERY_FLAG (op, FLAG_IS_LINKED))
663 { 645 {
664 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 646 LOG (llevError, "remove_button_linked() in unlinked object.\n");
665 return; 647 return;
666 } 648 }
649
667 for (obp = op->map->buttons; obp; obp = obp->next) 650 for (obp = op->map->buttons; obp; obp = obp->next)
668 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 651 for (olp = &obp->link; (ol = *olp); olp = &ol->next)
669 if (ol->ob == op) 652 if (ol->ob == op)
670 { 653 {
671 654
672/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n", 655/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
673 obp->value, op->name, op->map->path); 656 obp->value, op->name, op->map->path);
674*/ 657*/
675 *olp = ol->next; 658 *olp = ol->next;
676 free (ol); 659 delete ol;
677 return; 660 return;
678 } 661 }
662
679 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 663 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
680 CLEAR_FLAG (op, FLAG_IS_LINKED); 664 CLEAR_FLAG (op, FLAG_IS_LINKED);
681} 665}
682 666
683/* 667/*
684 * Gets the objectlink for this connection from the map. 668 * Gets the objectlink for this connection from the map.
685 */ 669 */
686oblinkpt * 670oblinkpt *
687get_connection_links (mapstruct *map, long connection) 671get_connection_links (maptile *map, long connection)
688{ 672{
689 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 673 for (oblinkpt * obp = map->buttons; obp; obp = obp->next)
690 if (obp->value == connection) 674 if (obp->value == connection)
691 return obp; 675 return obp;
676
692 return 0; 677 return 0;
693} 678}
694 679
695/* 680/*
696 * Return the first objectlink in the objects linked to this one 681 * Return the first objectlink in the objects linked to this one
… …
702 oblinkpt *obp; 687 oblinkpt *obp;
703 objectlink *ol; 688 objectlink *ol;
704 689
705 if (!button->map) 690 if (!button->map)
706 return NULL; 691 return NULL;
692
707 for (obp = button->map->buttons; obp; obp = obp->next) 693 for (obp = button->map->buttons; obp; obp = obp->next)
708 for (ol = obp->link; ol; ol = ol->next) 694 for (ol = obp->link; ol; ol = ol->next)
709 if (ol->ob == button && ol->id == button->count) 695 if (ol->ob == button)
710 return obp; 696 return obp;
697
711 return NULL; 698 return NULL;
712} 699}
713 700
714/* 701/*
715 * Made as a separate function to increase efficiency 702 * Made as a separate function to increase efficiency
… …
723 710
724 if (!button->map) 711 if (!button->map)
725 return 0; 712 return 0;
726 for (obp = button->map->buttons; obp; obp = obp->next) 713 for (obp = button->map->buttons; obp; obp = obp->next)
727 for (ol = obp->link; ol; ol = ol->next) 714 for (ol = obp->link; ol; ol = ol->next)
728 if (ol->ob == button && ol->id == button->count) 715 if (ol->ob == button)
729 return obp->value; 716 return obp->value;
730 return 0; 717 return 0;
731} 718}
732 719
733/* This routine makes monsters who are 720/* This routine makes monsters who are
… …
740 */ 727 */
741 728
742void 729void
743do_mood_floor (object *op, object *source) 730do_mood_floor (object *op, object *source)
744{ 731{
745 object *tmp;
746 object *tmp2;
747
748 if (!source) 732 if (!source)
749 source = op; 733 source = op;
750 734
751 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 735 mapspace &ms = op->ms ();
736
737 if (!(ms.flags () & P_IS_ALIVE))
738 return;
739
740 object *tmp;
741
742 for (tmp = ms.top; tmp; tmp = tmp->below)
752 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 743 if (QUERY_FLAG (tmp, FLAG_MONSTER))
753 break; 744 break;
754 745
755 /* doesn't effect players, and if there is a player on this space, won't also 746 /* doesn't effect players, and if there is a player on this space, won't also
756 * be a monster here. 747 * be a monster here.
757 */ 748 */
749 //TODO: have players really FLAG_MONSTER? kept it for safety
758 if (!tmp || tmp->type == PLAYER) 750 if (!tmp || tmp->type == PLAYER)
759 return; 751 return;
760 752
761 switch (op->last_sp) 753 switch (op->last_sp)
762 { 754 {
763 case 0: /* furious--make all monsters mad */ 755 case 0: /* furious--make all monsters mad */
764 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 756 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
765 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 757 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
758
766 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 759 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
767 { 760 {
768 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
769 remove_friendly_object (tmp);
770 tmp->attack_movement = 0; 761 tmp->attack_movement = 0;
771 /* 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
772 * dereference a null value 763 * dereference a null value
773 */ 764 */
774 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) 765 if (tmp->type == GOLEM
775 { 766 && tmp->owner
776 tmp->owner->contr->ranges[range_golem] = NULL; 767 && tmp->owner->type == PLAYER
768 && tmp->owner->contr->golem == tmp)
777 tmp->owner->contr->golem_count = 0; 769 tmp->owner->contr->golem = 0;
778 } 770
779 tmp->owner = 0; 771 tmp->owner = 0;
772
773 remove_friendly_object (tmp);
780 } 774 }
781 break; 775 break;
776
782 case 1: /* angry -- get neutral monsters mad */ 777 case 1: /* angry -- get neutral monsters mad */
783 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 778 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
784 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 779 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
785 break; 780 break;
781
786 case 2: /* calm -- pacify unfriendly monsters */ 782 case 2: /* calm -- pacify unfriendly monsters */
787 if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
788 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 783 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
789 break; 784 break;
785
790 case 3: /* make all monsters fall asleep */ 786 case 3: /* make all monsters fall asleep */
791 if (!QUERY_FLAG (tmp, FLAG_SLEEP))
792 SET_FLAG (tmp, FLAG_SLEEP); 787 SET_FLAG (tmp, FLAG_SLEEP);
793 break; 788 break;
789
794 case 4: /* charm all monsters */ 790 case 4: /* charm all monsters */
795 if (op == source) 791 if (op == source)
796 break; /* only if 'connected' */ 792 break; /* only if 'connected' */
797 793
798 for (tmp2 = get_map_ob (source->map, source->x, source->y); /* finding an owner */ 794 if (object *pl = source->ms ().player ())
799 tmp2->type != PLAYER; tmp2 = tmp2->above) 795 {
800 if (tmp2->above == NULL) 796 tmp->set_owner (pl);
797 SET_FLAG (tmp, FLAG_MONSTER);
798
799 tmp->stats.exp = 0;
800
801 add_friendly_object (tmp);
802 tmp->attack_movement = PETMOVE;
803 }
801 break; 804 break;
802 805
803 if (tmp2->type != PLAYER) 806 case 6: // kill monsters
807 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
804 break; 808 break;
805 set_owner (tmp, tmp2); 809
806 SET_FLAG (tmp, FLAG_MONSTER); 810 // FALL THROUGH
807 tmp->stats.exp = 0; 811 case 5: // kill all alives
808 SET_FLAG (tmp, FLAG_FRIENDLY); 812 if (!tmp->flag [FLAG_PRECIOUS])
809 add_friendly_object (tmp); 813 {
810 tmp->attack_movement = PETMOVE; 814 get_archetype ("burnout")->insert_at (tmp, source);
815 tmp->destroy ();
816 }
811 break; 817 break;
812 818
813 default: 819 default:
814 break; 820 break;
815 } 821 }
… …
819 * It will descend through containers to find the object. 825 * It will descend through containers to find the object.
820 * slaying = match object slaying flag 826 * slaying = match object slaying flag
821 * race = match object archetype name flag 827 * race = match object archetype name flag
822 * hp = match object type (excpt type '0'== PLAYER) 828 * hp = match object type (excpt type '0'== PLAYER)
823 */ 829 */
824
825object * 830object *
826check_inv_recursive (object *op, const object *trig) 831check_inv_recursive (object *op, const object *trig)
827{ 832{
828 object *tmp, *ret = NULL; 833 object *tmp, *ret = NULL;
829 834
830 /* First check the object itself. */ 835 /* First check the object itself. */
831 if ((trig->stats.hp && (op->type == trig->stats.hp)) 836 if ((trig->stats.hp && (op->type == trig->stats.hp))
832 || (trig->slaying && (op->slaying == trig->slaying)) || (trig->race && (op->arch->name == trig->race))) 837 || (trig->slaying && (op->slaying == trig->slaying))
838 || (trig->race && (op->arch->archname == trig->race)))
833 return op; 839 return op;
834 840
835 for (tmp = op->inv; tmp; tmp = tmp->below) 841 for (tmp = op->inv; tmp; tmp = tmp->below)
836 { 842 {
837 if (tmp->inv) 843 if (tmp->inv)
… …
839 ret = check_inv_recursive (tmp, trig); 845 ret = check_inv_recursive (tmp, trig);
840 if (ret) 846 if (ret)
841 return ret; 847 return ret;
842 } 848 }
843 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 849 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
844 || (trig->slaying && (tmp->slaying == trig->slaying)) || (trig->race && (tmp->arch->name == trig->race))) 850 || (trig->slaying && (tmp->slaying == trig->slaying))
851 || (trig->race && (tmp->arch->archname == trig->race)))
845 return tmp; 852 return tmp;
846 } 853 }
847 return NULL; 854 return NULL;
848} 855}
849 856
… …
852 * the square will activate connected items. 859 * the square will activate connected items.
853 * Monsters can't trigger this square (for now) 860 * Monsters can't trigger this square (for now)
854 * Values are: last_sp = 1/0 obj/no obj triggers 861 * Values are: last_sp = 1/0 obj/no obj triggers
855 * last_heal = 1/0 remove/dont remove obj if triggered 862 * last_heal = 1/0 remove/dont remove obj if triggered
856 * -b.t. (thomas@nomad.astro.psu.edu 863 * -b.t. (thomas@nomad.astro.psu.edu
857 */ 864 *
858 865 * Tue Dec 19 15:34:00 CET 2006 elmex: changed the function to ignore op
866 * because the check-inventory semantic essentially only applies when
867 * something is above the inventory checker.
868 * The semantic prior this change was: trigger if something has moved on or off
869 * and has a matching item. Imagine what happens if someone steps on the inventory
870 * checker with a matching item, has it, activates the connection, throws the item
871 * away, and then leaves the inventory checker. That would've caused an always-enabled
872 * state in the inventory checker. This won't happen anymore now.
873 *
874 * Wed Jan 10 11:34:26 CET 2007 elmex: fixed this function, we now check
875 * whether op is on this mapspace or not, because the value (1|0) depends
876 * on this information. also make sure to only push_button if op has
877 * a matching item (because when we do a push_button with value=0 timed gates
878 * will still open)! (i hope i got the semantics right this time)
879 *
880 */
859void 881void
860check_inv (object *op, object *trig) 882check_inv (object *op, object *trig)
861{ 883{
862 object *match; 884 trig->value = 0; // deactivate if none of the following conditions apply
863 885
864 if (op->type != PLAYER) 886 object *pl = trig->ms ().player ();
865 return;
866 match = check_inv_recursive (op, trig); 887 object *match = check_inv_recursive (op, trig);
888
889 // elmex: a note about (pl == op):
890 // if pl == 0 then the player has left this space
891 // if pl != 0 then a player is on this mapspace, but then
892 // we still have to check whether it's the player that triggered
893 // this inv-checker, because if not, then the op left this inv-checker
894 // and we have to set the value to 0
895
867 if (match && trig->last_sp) 896 if (match && trig->last_sp) // match == having
868 { 897 {
869 if (trig->last_heal) 898 if (trig->last_heal)
870 decrease_ob (match); 899 decrease_ob (match);
871 use_trigger (trig);
872 }
873 else if (!match && !trig->last_sp)
874 use_trigger (trig);
875}
876 900
877 901 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
878/* This does a minimal check of the button link consistency for object 902 push_button (trig);
879 * map. All it really does it much sure the object id link that is set
880 * matches what the object has.
881 */
882void
883verify_button_links (const mapstruct *map)
884{
885 oblinkpt *obp;
886 objectlink *ol;
887
888 if (!map)
889 return;
890
891 for (obp = map->buttons; obp; obp = obp->next)
892 { 903 }
893 for (ol = obp->link; ol; ol = ol->next) 904 else if (!match && !trig->last_sp) // match == not having
894 {
895 if (ol->id != ol->ob->count)
896 LOG (llevError, "verify_button_links: object %s on list is corrupt (%d!=%d)\n", &ol->ob->name, ol->id, ol->ob->count);
897 }
898 } 905 {
906 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
907 push_button (trig);
908 }
899} 909}
910

Diff Legend

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