ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/time.C
(Generate patch)

Comparing deliantra/server/server/time.C (file contents):
Revision 1.51 by root, Fri May 18 20:45:37 2007 UTC vs.
Revision 1.92 by root, Sat Jun 27 08:25:36 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* 24/*
26 * Routines that is executed from objects based on their speed have been 25 * Routines that is executed from objects based on their speed have been
27 * collected in this file. 26 * collected in this file.
… …
35 * so those will be removed shortly (in a cascade like fashion.) 34 * so those will be removed shortly (in a cascade like fashion.)
36 */ 35 */
37void 36void
38remove_door (object *op) 37remove_door (object *op)
39{ 38{
39 for (int i = 1; i < SIZEOFFREE1 + 1; i += 2)
40 {
41 object *tmp;
42 mapxy pos (op);
43 pos.move (i);
44 if (pos.normalise ()
45 && (tmp = present (DOOR, pos.m, pos.x, pos.y)))
46 {
47 tmp->set_speed (0.1f);
48 tmp->speed_left = -0.2f;
49 }
50 }
51
52 if (op->other_arch)
53 {
54 object *tmp = arch_to_object (op->other_arch);
55 tmp->x = op->x;
56 tmp->y = op->y;
57 tmp->map = op->map;
58 tmp->level = op->level;
59 insert_ob_in_map (tmp, op->map, op, 0);
60 }
61
62 op->drop_and_destroy ();
63}
64
65void
66remove_door2 (object *op)
67{
40 int i; 68 int i;
41 object *tmp; 69 object *tmp;
42 70
43 for (i = 1; i < 9; i += 2) 71 for (i = 1; i < 9; i += 2)
72 {
44 if ((tmp = present (DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i])) != NULL) 73 tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]);
45 { 74 if (tmp && tmp->slaying == op->slaying)
75 { /* same key both doors */
46 tmp->set_speed (0.1f); 76 tmp->set_speed (0.1f);
47 tmp->speed_left = -0.2f; 77 tmp->speed_left = -0.2f;
48 } 78 }
79 }
49 80
50 if (op->other_arch) 81 if (op->other_arch)
51 { 82 {
52 tmp = arch_to_object (op->other_arch); 83 tmp = arch_to_object (op->other_arch);
53 tmp->x = op->x; 84 tmp->x = op->x;
… …
55 tmp->map = op->map; 86 tmp->map = op->map;
56 tmp->level = op->level; 87 tmp->level = op->level;
57 insert_ob_in_map (tmp, op->map, op, 0); 88 insert_ob_in_map (tmp, op->map, op, 0);
58 } 89 }
59 90
60 op->destroy (); 91 op->drop_and_destroy ();
61}
62
63void
64remove_door2 (object *op)
65{
66 int i;
67 object *tmp;
68
69 for (i = 1; i < 9; i += 2)
70 {
71 tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]);
72 if (tmp && tmp->slaying == op->slaying)
73 { /* same key both doors */
74 tmp->set_speed (0.1f);
75 tmp->speed_left = -0.2f;
76 }
77 }
78
79 if (op->other_arch)
80 {
81 tmp = arch_to_object (op->other_arch);
82 tmp->x = op->x;
83 tmp->y = op->y;
84 tmp->map = op->map;
85 tmp->level = op->level;
86 insert_ob_in_map (tmp, op->map, op, 0);
87 }
88
89 op->destroy ();
90} 92}
91 93
92void 94void
93generate_monster (object *gen) 95generate_monster (object *gen)
94{ 96{
… …
96 return; 98 return;
97 99
98 if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1)) 100 if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1))
99 return; 101 return;
100 102
103 // sleeping generators won't generate, this will make monsters like
104 // centipedes not generate more centipedes when being asleep.
105 if (gen->flag [FLAG_SLEEP])
106 return;
107
101 object *op; 108 object *op;
109 int dir;
102 110
103 if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN)) 111 if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN))
104 { 112 {
105 // either copy one item form the inventory... 113 // either copy one item from the inventory...
106 if (!gen->inv) 114 if (!gen->inv)
107 return; 115 return;
108 116
109 // first select one item from the inventory 117 // first select one item from the inventory
110 int index = 0; 118 int index = 0;
111 for (object *tmp = gen->inv; tmp; tmp = tmp->below) 119 for (object *tmp = gen->inv; tmp; tmp = tmp->below)
112 if (!rndm (++index)) 120 if (!rndm (++index))
113 op = tmp; 121 op = tmp;
114 122
115 op = object_create_clone (op); 123 dir = find_free_spot (op, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1);
124 if (dir < 0)
125 return;
126
127 op = op->deep_clone ();
116 128
117 CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE); 129 CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE);
118 unflag_inv (op, FLAG_IS_A_TEMPLATE); 130 unflag_inv (op, FLAG_IS_A_TEMPLATE);
119 } 131 }
132 else if (gen->other_arch)
133 {
134 // ...or use other_arch
135 dir = find_free_spot (gen->other_arch, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1);
136 if (dir < 0)
137 return;
138
139 op = arch_to_object (gen->other_arch);
140 }
120 else 141 else
121 {
122 // ...or use other_arch
123 if (archetype *at = gen->other_arch)
124 op = arch_to_object (at);
125 else
126 return; 142 return;
127 }
128 143
129 op->expand_tail (); 144 op->expand_tail ();
130 145
131 int i = find_free_spot (op, gen->map, gen->x, gen->y, 1, 9); 146 mapxy pos (gen); pos.move (dir);
132 if (i >= 0) 147
148 if (pos.insert (op, gen))
133 { 149 {
134 if (insert_ob_in_map_at (op, gen->map, gen, 0, gen->x + freearr_x[i], gen->y + freearr_y[i]))
135 {
136 if (rndm (0, 9)) 150 if (rndm (0, 9))
137 generate_artifact (op, gen->map->difficulty); 151 generate_artifact (op, gen->map->difficulty);
138 152
139 if (op->has_random_items ()) 153 if (op->has_random_items ())
140 create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty); 154 create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty);
141 155
142 return; 156 return;
143 }
144 } 157 }
145 158
146 op->destroy (); 159 op->destroy ();
147} 160}
148 161
… …
235 if (op->value) 248 if (op->value)
236 { 249 {
237 if (--op->stats.wc <= 0) 250 if (--op->stats.wc <= 0)
238 { /* Reached bottom, let's stop */ 251 { /* Reached bottom, let's stop */
239 op->stats.wc = 0; 252 op->stats.wc = 0;
240 if (op->arch->clone.speed) 253 if (op->arch->speed)
241 op->value = 0; 254 op->value = 0;
242 else 255 else
243 op->set_speed (0); 256 op->set_speed (0);
244 } 257 }
245 258
… …
265 * objects are above the gate. If so, we finish closing the gate, 278 * objects are above the gate. If so, we finish closing the gate,
266 * otherwise, we fall through to the code below which should lower 279 * otherwise, we fall through to the code below which should lower
267 * the gate slightly. 280 * the gate slightly.
268 */ 281 */
269 282
270 for (tmp = op->above; tmp != NULL; tmp = tmp->above) 283 for (tmp = op->above; tmp; tmp = tmp->above)
271 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE)) 284 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE))
272 break; 285 break;
273 286
274 if (tmp == NULL) 287 if (!tmp)
275 { 288 {
276 if (op->arch->clone.speed) 289 if (op->arch->speed)
277 op->value = 1; 290 op->value = 1;
278 else 291 else
279 op->set_speed (0); 292 op->set_speed (0);
280 293
281 return; 294 return;
… …
292 } 305 }
293 else 306 else
294 { /* The gate is still going up */ 307 { /* The gate is still going up */
295 op->stats.wc++; 308 op->stats.wc++;
296 309
297 if ((int) op->stats.wc >= (NUM_ANIMATIONS (op))) 310 if (op->stats.wc >= NUM_ANIMATIONS (op))
298 op->stats.wc = (signed char) NUM_ANIMATIONS (op) - 1; 311 op->stats.wc = NUM_ANIMATIONS (op) - 1;
299 312
300 /* If there is something on top of the gate, we try to roll it off. 313 /* If there is something on top of the gate, we try to roll it off.
301 * If a player/monster, we don't roll, we just hit them with damage 314 * If a player/monster, we don't roll, we just hit them with damage
302 */ 315 */
303 if ((int) op->stats.wc >= NUM_ANIMATIONS (op) / 2) 316 if (op->stats.wc >= NUM_ANIMATIONS (op) / 2)
304 { 317 {
305 /* Halfway or further, check blocks */ 318 /* Halfway or further, check blocks */
306 /* First, get the top object on the square. */ 319 /* First, get the top object on the square. */
307 for (tmp = op->above; tmp && tmp->above; tmp = tmp->above) 320 for (tmp = op->above; tmp && tmp->above; tmp = tmp->above)
308 ; 321 ;
… …
310 if (tmp) 323 if (tmp)
311 { 324 {
312 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 325 if (QUERY_FLAG (tmp, FLAG_ALIVE))
313 { 326 {
314 hit_player (tmp, random_roll (0, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1); 327 hit_player (tmp, random_roll (0, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1);
328 op->play_sound (sound_find ("blocked_gate"));
315 329
316 if (tmp->type == PLAYER) 330 if (tmp->type == PLAYER)
317 new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are crushed by the %s!", &op->name); 331 new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are crushed by the %s!", &op->name);
318 } 332 }
319 else
320 /* If the object is not alive, and the object either can 333 /* If the object is not alive, and the object either can
321 * be picked up or the object rolls, move the object 334 * be picked up or the object rolls, move the object
322 * off the gate. 335 * off the gate.
323 */ 336 */
324 if (!QUERY_FLAG (tmp, FLAG_ALIVE) && (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL))) 337 else if (!QUERY_FLAG (tmp, FLAG_ALIVE) && (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL)))
325 { 338 {
326 /* If it has speed, it should move itself, otherwise: */ 339 /* If it has speed, it should move itself, otherwise: */
327 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 340 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1);
328 341
329 /* If there is a free spot, move the object someplace */ 342 /* If there is a free spot, move the object someplace */
330 if (i != -1) 343 if (i > 0)
331 { 344 {
345 mapxy pos (tmp);
346 pos.move (i);
347 if (pos.normalise ())
332 tmp->remove (); 348 tmp->move_to (pos);
333 tmp->x += freearr_x[i], tmp->y += freearr_y[i];
334 insert_ob_in_map (tmp, op->map, op, 0);
335 } 349 }
336 } 350 }
337 } 351 }
338 352
339 /* See if there is still anything blocking the gate */ 353 /* See if there is still anything blocking the gate */
340 for (tmp = op->above; tmp != NULL; tmp = tmp->above) 354 for (tmp = op->above; tmp; tmp = tmp->above)
341 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE)) 355 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE))
342 break; 356 break;
343 357
344 /* IF there is, start putting the gate down */ 358 /* IF there is, start putting the gate down */
345 if (tmp) 359 if (tmp)
346 {
347 op->stats.food = 1; 360 op->stats.food = 1;
348 }
349 else 361 else
350 { 362 {
351 op->move_block = MOVE_ALL; 363 op->move_block = MOVE_ALL;
364
352 if (!op->arch->clone.stats.ac) 365 if (!op->arch->stats.ac)
353 SET_FLAG (op, FLAG_BLOCKSVIEW); 366 SET_FLAG (op, FLAG_BLOCKSVIEW);
354 update_all_los (op->map, op->x, op->y); 367 update_all_los (op->map, op->x, op->y);
355 } 368 }
356 } /* gate is halfway up */ 369 } /* gate is halfway up */
357 370
… …
370 int v = op->value; 383 int v = op->value;
371 384
372 if (op->stats.sp) 385 if (op->stats.sp)
373 { 386 {
374 move_gate (op); 387 move_gate (op);
388
375 if (op->value != v) /* change direction ? */ 389 if (op->value != v) /* change direction ? */
376 op->stats.sp = 0; 390 op->stats.sp = 0;
377 return; 391 return;
378 } 392 }
393
379 if (--op->stats.hp <= 0) 394 if (--op->stats.hp <= 0)
380 { /* keep gate down */ 395 { /* keep gate down */
381 move_gate (op); 396 move_gate (op);
397
382 if (op->value != v) 398 if (op->value != v)
383 op->set_speed (0); 399 op->set_speed (0);
384 } 400 }
385} 401}
386 402
… …
398 int last = op->value; 414 int last = op->value;
399 int detected; 415 int detected;
400 416
401 detected = 0; 417 detected = 0;
402 418
403 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && !detected; tmp = tmp->above) 419 for (tmp = op->ms ().bot; tmp && !detected; tmp = tmp->above)
404 { 420 {
405 object *tmp2; 421 object *tmp2;
406 422
407 if (op->stats.hp) 423 if (op->stats.hp)
408 { 424 {
… …
426 if (op->stats.sp == 1) 442 if (op->stats.sp == 1)
427 { 443 {
428 if (detected && last == 0) 444 if (detected && last == 0)
429 { 445 {
430 op->value = 1; 446 op->value = 1;
431 push_button (op); 447 push_button (op, tmp);
432 } 448 }
449
433 if (!detected && last == 1) 450 if (!detected && last == 1)
434 { 451 {
435 op->value = 0; 452 op->value = 0;
436 push_button (op); 453 push_button (op, tmp);
437 } 454 }
438 } 455 }
439 else 456 else
440 { /* in this case, we unset buttons */ 457 { /* in this case, we unset buttons */
441 if (detected && last == 1) 458 if (detected && last == 1)
442 { 459 {
443 op->value = 0; 460 op->value = 0;
444 push_button (op); 461 push_button (op, tmp);
445 } 462 }
463
446 if (!detected && last == 0) 464 if (!detected && last == 0)
447 { 465 {
448 op->value = 1; 466 op->value = 1;
449 push_button (op); 467 push_button (op, tmp);
450 } 468 }
451 } 469 }
452} 470}
453
454 471
455void 472void
456animate_trigger (object *op) 473animate_trigger (object *op)
457{ 474{
458 if ((unsigned char) ++op->stats.wc >= NUM_ANIMATIONS (op)) 475 if ((unsigned char) ++op->stats.wc >= NUM_ANIMATIONS (op))
… …
468} 485}
469 486
470void 487void
471move_hole (object *op) 488move_hole (object *op)
472{ /* 1 = opening, 0 = closing */ 489{ /* 1 = opening, 0 = closing */
473 object *next, *tmp;
474
475 if (op->value) 490 if (op->value)
476 { /* We're opening */ 491 { /* We're opening */
477 if (--op->stats.wc <= 0) 492 if (--op->stats.wc <= 0)
478 { /* Opened, let's stop */ 493 { /* Opened, let's stop */
479 op->stats.wc = 0; 494 op->stats.wc = 0;
480 op->set_speed (0); 495 op->set_speed (0);
481 496
482 /* Hard coding this makes sense for holes I suppose */ 497 /* Hard coding this makes sense for holes I suppose */
483 op->move_on = MOVE_WALK; 498 op->move_on = MOVE_WALK;
484 for (tmp = op->above; tmp != NULL; tmp = next) 499 for (object *next, *tmp = op->above; tmp; tmp = next)
485 { 500 {
486 next = tmp->above; 501 next = tmp->above;
487 move_apply (op, tmp, tmp); 502 move_apply (op, tmp, tmp);
488 } 503 }
489 } 504 }
490 505
491 SET_ANIMATION (op, op->stats.wc); 506 SET_ANIMATION (op, op->stats.wc);
492 update_object (op, UP_OBJ_FACE); 507 update_object (op, UP_OBJ_FACE);
493 return; 508 return;
494 } 509 }
510
495 /* We're closing */ 511 /* We're closing */
496 op->move_on = 0; 512 op->move_on = 0;
497 513
498 op->stats.wc++; 514 op->stats.wc++;
499 if ((int) op->stats.wc >= NUM_ANIMATIONS (op)) 515 if ((int) op->stats.wc >= NUM_ANIMATIONS (op))
… …
530 { 546 {
531 object *payload = op->inv; 547 object *payload = op->inv;
532 548
533 if (payload == NULL) 549 if (payload == NULL)
534 return NULL; 550 return NULL;
551
535 payload->remove (); 552 payload->remove ();
536 op->destroy (); 553 op->destroy ();
537 return payload; 554 return payload;
538 } 555 }
539 556
… …
582 599
583 // restore original wc, dam, attacktype and slaying 600 // restore original wc, dam, attacktype and slaying
584 op->stats.wc = op->stats.sp; 601 op->stats.wc = op->stats.sp;
585 op->stats.dam = op->stats.hp; 602 op->stats.dam = op->stats.hp;
586 op->attacktype = op->stats.grace; 603 op->attacktype = op->stats.grace;
604 op->slaying = op->custom_name;
587 605
588 if (op->spellarg)
589 {
590 op->slaying = op->spellarg;
591 free (op->spellarg);
592 op->spellarg = 0;
593 }
594 else
595 op->slaying = 0;
596
597 /* Reset these to zero, so that object::can_merge will work properly */ 606 /* Reset these to defaults, so that object::can_merge will work properly */
598 op->spellarg = NULL; 607 op->custom_name = 0;
599 op->stats.sp = 0; 608 op->stats.sp = 0;
600 op->stats.hp = 0; 609 op->stats.hp = 0;
601 op->stats.grace = 0; 610 op->stats.grace = 0;
602 op->level = 0; 611 op->level = 0;
603 op->face = op->arch->clone.face; 612 op->face = op->arch->face;
604 op->owner = NULL; /* So that stopped arrows will be saved */ 613 op->owner = 0;
614
605 update_object (op, UP_OBJ_CHANGE); 615 update_object (op, UP_OBJ_CHANGE);
616
606 return op; 617 return op;
607} 618}
608 619
609/* stop_arrow() - what to do when a non-living flying object 620/* stop_arrow() - what to do when a non-living flying object
610 * has to stop. Sept 96 - I added in thrown object code in 621 * has to stop. Sept 96 - I added in thrown object code in
… …
619 if (INVOKE_OBJECT (STOP, op)) 630 if (INVOKE_OBJECT (STOP, op))
620 return; 631 return;
621 632
622 if (op->inv) 633 if (op->inv)
623 { 634 {
635 // replace this by straightforward drop to ground?
624 object *payload = op->inv; 636 object *payload = op->inv;
625 637
626 payload->remove ();
627 payload->owner = 0; 638 payload->owner = 0;
628 insert_ob_in_map (payload, op->map, payload, 0); 639 insert_ob_in_map (payload, op->map, payload, 0);
629 op->destroy (); 640 op->destroy ();
630 } 641 }
631 else 642 else
… …
640/* Move an arrow along its course. op is the arrow or thrown object. 651/* Move an arrow along its course. op is the arrow or thrown object.
641 */ 652 */
642void 653void
643move_arrow (object *op) 654move_arrow (object *op)
644{ 655{
645 object *tmp;
646 sint16 new_x, new_y;
647 int was_reflected, mflags; 656 int was_reflected;
648 maptile *m;
649 657
650 if (op->map == NULL) 658 if (!op->map)
651 { 659 {
652 LOG (llevError, "BUG: Arrow had no map.\n"); 660 LOG (llevError, "BUG: Arrow had no map.\n");
653 op->destroy (); 661 op->destroy ();
654 return; 662 return;
655 } 663 }
… …
663 * is if the player throws a bomb - the bomb explodes on its own, 671 * is if the player throws a bomb - the bomb explodes on its own,
664 * but this object sticks around. We could handle the cleanup in the 672 * but this object sticks around. We could handle the cleanup in the
665 * bomb code, but there are potential other cases where that could happen, 673 * bomb code, but there are potential other cases where that could happen,
666 * and it is easy enough to clean it up here. 674 * and it is easy enough to clean it up here.
667 */ 675 */
668 if (op->inv == NULL) 676 if (!op->inv)
669 { 677 {
670 op->destroy (); 678 op->destroy ();
671 return; 679 return;
672 } 680 }
673 681
… …
685 stop_arrow (op); 693 stop_arrow (op);
686 return; 694 return;
687 } 695 }
688 696
689 /* Calculate target map square */ 697 /* Calculate target map square */
690 new_x = op->x + DIRX (op);
691 new_y = op->y + DIRY (op);
692 was_reflected = 0; 698 was_reflected = 0;
693 699
694 m = op->map; 700 mapxy pos (op); pos.move (op->direction);
695 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
696 701
697 if (mflags & P_OUT_OF_MAP) 702 if (!pos.normalise ())
698 { 703 {
699 stop_arrow (op); 704 stop_arrow (op);
700 return; 705 return;
701 } 706 }
702 707
703 /* only need to look for living creatures if this flag is set */ 708 /* only need to look for living creatures if this flag is set */
704 if (mflags & P_IS_ALIVE) 709 if (pos->flags () & P_IS_ALIVE)
705 { 710 {
706 for (tmp = GET_MAP_OB (m, new_x, new_y); tmp != NULL; tmp = tmp->above) 711 object *tmp;
712
713 for (tmp = pos->bot; tmp; tmp = tmp->above)
707 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 714 if (QUERY_FLAG (tmp, FLAG_ALIVE))
708 break; 715 break;
709 716
710 /* Not really fair, but don't let monsters hit themselves with 717 /* Not really fair, but don't let monsters hit themselves with
711 * their own arrow - this can be because they fire it then 718 * their own arrow - this can be because they fire it then
… …
734 return; 741 return;
735 } 742 }
736 } /* if this is not hitting its owner */ 743 } /* if this is not hitting its owner */
737 } /* if there is something alive on this space */ 744 } /* if there is something alive on this space */
738 745
739 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 746 if (OB_TYPE_MOVE_BLOCK (op, pos->move_block))
740 { 747 {
741 int retry = 0; 748 int retry = 0;
742 749
743 /* if the object doesn't reflect, stop the arrow from moving 750 /* if the object doesn't reflect, stop the arrow from moving
744 * note that this code will now catch cases where a monster is 751 * note that this code will now catch cases where a monster is
… …
757 if (op->direction & 1) 764 if (op->direction & 1)
758 { 765 {
759 op->direction = absdir (op->direction + 4); 766 op->direction = absdir (op->direction + 4);
760 retry = 1; 767 retry = 1;
761 } 768 }
769
762 /* There were two blocks with identical code - 770 /* There were two blocks with identical code -
763 * use this retry here to make this one block 771 * use this retry here to make this one block
764 * that did the same thing. 772 * that did the same thing.
765 */ 773 */
766 while (retry < 2) 774 while (retry < 2)
767 { 775 {
768 int left, right, mflags;
769 maptile *m1;
770 sint16 x1, y1;
771
772 retry++; 776 retry++;
773 777
774 /* Need to check for P_OUT_OF_MAP: if the arrow is tavelling 778 /* Need to check for P_OUT_OF_MAP: if the arrow is travelling
775 * over a corner in a tiled map, it is possible that 779 * over a corner in a tiled map, it is possible that
776 * op->direction is within an adjacent map but either 780 * op->direction is within an adjacent map but either
777 * op->direction-1 or op->direction+1 does not exist. 781 * op->direction-1 or op->direction+1 does not exist.
778 */ 782 */
779 mflags = get_map_flags (op->map, &m1, op->x + freearr_x[absdir (op->direction - 1)], 783 mapxy pos1 (pos); pos1.move (absdir (op->direction - 1));
780 op->y + freearr_y[absdir (op->direction - 1)], &x1, &y1); 784 bool left = pos1.normalise () && OB_TYPE_MOVE_BLOCK (op, pos1->move_block);
781 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, (GET_MAP_MOVE_BLOCK (m1, x1, y1)));
782 785
783 mflags = get_map_flags (op->map, &m1, op->x + freearr_x[absdir (op->direction + 1)], 786 mapxy pos2 (pos); pos2.move (absdir (op->direction + 1));
784 op->y + freearr_y[absdir (op->direction + 1)], &x1, &y1); 787 bool right = pos2.normalise () && OB_TYPE_MOVE_BLOCK (op, pos2->move_block);
785 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, (GET_MAP_MOVE_BLOCK (m1, x1, y1)));
786 788
787 if (left == right) 789 if (left == right)
788 op->direction = absdir (op->direction + 4); 790 op->direction = absdir (op->direction + 4);
789 else if (left) 791 else if (left)
790 op->direction = absdir (op->direction + 2); 792 op->direction = absdir (op->direction + 2);
791 else if (right) 793 else if (right)
792 op->direction = absdir (op->direction - 2); 794 op->direction = absdir (op->direction - 2);
793 795
794 mflags = get_map_flags (op->map, &m1, op->x + DIRX (op), op->y + DIRY (op), &x1, &y1);
795
796 /* If this space is not out of the map and not blocked, valid space - 796 /* If this space is not out of the map and not blocked, valid space -
797 * don't need to retry again. 797 * don't need to retry again.
798 */ 798 */
799 if (!(mflags & P_OUT_OF_MAP) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m1, x1, y1))) 799 mapxy pos3 (pos); pos3.move (op->direction);
800 if (pos3.normalise () && !OB_TYPE_MOVE_BLOCK (op, pos3->move_block))
800 break; 801 break;
801
802 } 802 }
803
803 /* Couldn't find a direction to move the arrow to - just 804 /* Couldn't find a direction to move the arrow to - just
804 * top it from moving. 805 * stop it from moving.
805 */ 806 */
806 if (retry == 2) 807 if (retry == 2)
807 { 808 {
808 stop_arrow (op); 809 stop_arrow (op);
809 return; 810 return;
810 } 811 }
812
811 /* update object image for new facing */ 813 /* update object image for new facing */
812 /* many thrown objects *don't* have more than one face */ 814 /* many thrown objects *don't* have more than one face */
813 if (GET_ANIM_ID (op)) 815 if (op->has_anim ())
814 SET_ANIMATION (op, op->direction); 816 op->set_anim_frame (op->direction);
815 } /* object is reflected */ 817 } /* object is reflected */
816 } /* object ran into a wall */ 818 } /* object ran into a wall */
817
818 /* Move the arrow. */
819 op->remove ();
820 op->x = new_x;
821 op->y = new_y;
822 819
823 /* decrease the speed as it flies. 0.05 means a standard bow will shoot 820 /* decrease the speed as it flies. 0.05 means a standard bow will shoot
824 * about 17 squares. Tune as needed. 821 * about 17 squares. Tune as needed.
825 */ 822 */
826 op->speed -= 0.05; 823 op->speed -= 0.05;
827 insert_ob_in_map (op, m, op, 0);
828}
829 824
830/* This routine doesnt seem to work for "inanimate" objects that 825 /* Move the arrow. */
831 * are being carried, ie a held torch leaps from your hands!. 826 op->move_to (pos);
832 * Modified this routine to allow held objects. b.t. */ 827}
833 828
834void 829void
835change_object (object *op) 830change_object (object *op)
836{ /* Doesn`t handle linked objs yet */ 831{ /* Doesn`t handle linked objs yet */
837 int i, j; 832 int i, j;
838 833
839 if (op->other_arch == NULL) 834 if (!op->other_arch)
840 { 835 {
841 LOG (llevError, "Change object (%s) without other_arch error.\n", &op->name); 836 LOG (llevError, "Change object (%s) without other_arch error.\n", op->debug_desc ());
842 return; 837 return;
843 } 838 }
844 839
845 /* In non-living items only change when food value is 0 */ 840 /* In non-living items only change when food value is 0 */
846 if (!QUERY_FLAG (op, FLAG_ALIVE)) 841 if (!QUERY_FLAG (op, FLAG_ALIVE))
847 { 842 {
848 if (op->stats.food-- > 0) 843 if (op->stats.food-- > 0)
849 return; 844 return;
845
846 op->stats.food = 1; /* so 1 other_arch is made */
847 }
848
849 object *env = op->env;
850
851 op->remove ();
852 for (i = 0; i < op->stats.food; i++)
853 {
854 object *tmp = arch_to_object (op->other_arch);
855
856 tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
857
858 if (env)
859 env->insert (tmp);
850 else 860 else
851 op->stats.food = 1; /* so 1 other_arch is made */
852 }
853
854 object *pl = op->in_player ();
855 object *env = op->env;
856
857 op->remove ();
858 for (i = 0; i < NROFNEWOBJS (op); i++)
859 {
860 object *tmp = arch_to_object (op->other_arch);
861
862 if (op->type == LAMP)
863 tmp->stats.food = op->stats.food - 1;
864
865 tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
866 if (env)
867 {
868 tmp->x = env->x, tmp->y = env->y;
869 tmp = insert_ob_in_ob (tmp, env);
870
871 /* If this object is the players inventory, we need to tell the
872 * client of the change. Insert_ob_in_map takes care of the
873 * updating the client, so we don't need to do that below.
874 */
875 if (pl)
876 {
877 esrv_del_item (pl->contr, op->count);
878 esrv_send_item (pl, tmp);
879 }
880 }
881 else
882 { 861 {
883 j = find_first_free_spot (tmp, op->map, op->x, op->y); 862 j = find_first_free_spot (tmp, op->map, op->x, op->y);
884 if (j == -1) /* No free spot */ 863 if (j < 0) /* No free spot */
885 tmp->destroy (); 864 tmp->destroy ();
886 else 865 else
887 { 866 {
888 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j]; 867 mapxy pos (op); pos.move (j);
889 insert_ob_in_map (tmp, op->map, op, 0); 868
869 if (pos.normalise ())
870 pos.insert (tmp, op);
890 } 871 }
891 } 872 }
892 } 873 }
893 874
894 op->destroy (); 875 op->destroy ();
… …
910 move_teleporter (op->more); 891 move_teleporter (op->more);
911 892
912 if (op->head) 893 if (op->head)
913 head = op->head; 894 head = op->head;
914 895
915 for (tmp = op->above; tmp != NULL; tmp = tmp->above) 896 for (tmp = op->above; tmp; tmp = tmp->above)
916 if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 897 if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR))
917 break; 898 break;
918 899
919 /* If nothing above us to move, nothing to do */ 900 /* If nothing above us to move, nothing to do */
920 if (!tmp || QUERY_FLAG (tmp, FLAG_WIZPASS)) 901 if (!tmp || QUERY_FLAG (tmp, FLAG_WIZPASS))
… …
950 else 931 else
951 { 932 {
952 /* Random teleporter */ 933 /* Random teleporter */
953 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp))) 934 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))
954 return; 935 return;
936
955 teleport (head, TELEPORTER, tmp); 937 teleport (head, TELEPORTER, tmp);
956 } 938 }
957} 939}
958
959 940
960/* This object will teleport someone to a different map 941/* This object will teleport someone to a different map
961 and will also apply changes to the player from its inventory. 942 and will also apply changes to the player from its inventory.
962 This was invented for giving classes, but there's no reason it 943 This was invented for giving classes, but there's no reason it
963 can't be generalized. 944 can't be generalized.
… …
1016 return; /* dm has created a firewall in his inventory */ 997 return; /* dm has created a firewall in his inventory */
1017 998
1018 spell = op->inv; 999 spell = op->inv;
1019 1000
1020 if (!spell || spell->type != SPELL) 1001 if (!spell || spell->type != SPELL)
1021 spell = &op->other_arch->clone; 1002 spell = op->other_arch;
1022 1003
1023 if (!spell) 1004 if (!spell)
1024 { 1005 {
1025 LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y); 1006 LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y);
1026 return; 1007 return;
… …
1094 * is cleared, otherwise the player will get stuck in 1075 * is cleared, otherwise the player will get stuck in
1095 * place. This can happen if the player used a spell to 1076 * place. This can happen if the player used a spell to
1096 * get to this space. 1077 * get to this space.
1097 */ 1078 */
1098 victim->contr->fire_on = 0; 1079 victim->contr->fire_on = 0;
1099 victim->speed_left = 0.f; 1080 victim->speed_left = 1.f;
1100 move_player (victim, dir); 1081 move_player (victim, dir);
1101 } 1082 }
1102 else 1083 else
1103 return; 1084 return;
1104 } 1085 }
… …
1137 if (op->above == NULL) 1118 if (op->above == NULL)
1138 return; 1119 return;
1139 1120
1140 for (tmp = op->above; tmp; tmp = tmp->above) 1121 for (tmp = op->above; tmp; tmp = tmp->above)
1141 { 1122 {
1142 if (op->other_arch->name == tmp->arch->name) 1123 if (op->other_arch->archname == tmp->arch->archname)
1143 { 1124 {
1144 if (op->level <= 0) 1125 if (op->level <= 0)
1145 tmp->destroy (); 1126 tmp->destroy ();
1146 else 1127 else
1147 { 1128 {
… …
1169 * has to make sure that there is in fact space for the object. 1150 * has to make sure that there is in fact space for the object.
1170 * It should really do this for small objects also, but there is 1151 * It should really do this for small objects also, but there is
1171 * more concern with large objects, most notably a part being placed 1152 * more concern with large objects, most notably a part being placed
1172 * outside of the map which would cause the server to crash 1153 * outside of the map which would cause the server to crash
1173*/ 1154*/
1174
1175void 1155void
1176move_creator (object *creator) 1156move_creator (object *creator)
1177{ 1157{
1178 object *new_ob; 1158 object *new_ob;
1179 1159
… …
1181 { 1161 {
1182 creator->stats.hp = -1; 1162 creator->stats.hp = -1;
1183 return; 1163 return;
1184 } 1164 }
1185 1165
1186 if (creator->inv != NULL) 1166 if (creator->inv)
1187 { 1167 {
1188 object *ob; 1168 object *ob;
1189 int i; 1169 int i;
1190 object *ob_to_copy; 1170 object *ob_to_copy;
1191 1171
… …
1196 if (rndm (0, i) == 0) 1176 if (rndm (0, i) == 0)
1197 { 1177 {
1198 ob_to_copy = ob; 1178 ob_to_copy = ob;
1199 } 1179 }
1200 } 1180 }
1201 new_ob = object_create_clone (ob_to_copy); 1181 new_ob = ob_to_copy->deep_clone ();
1202 CLEAR_FLAG (new_ob, FLAG_IS_A_TEMPLATE); 1182 CLEAR_FLAG (new_ob, FLAG_IS_A_TEMPLATE);
1203 unflag_inv (new_ob, FLAG_IS_A_TEMPLATE); 1183 unflag_inv (new_ob, FLAG_IS_A_TEMPLATE);
1204 } 1184 }
1205 else 1185 else
1206 { 1186 {
1207 if (creator->other_arch == NULL) 1187 if (!creator->other_arch)
1208 { 1188 {
1209 LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n", 1189 LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n",
1210 &creator->name, &creator->map->path, creator->x, creator->y); 1190 &creator->name, &creator->map->path, creator->x, creator->y);
1211 return; 1191 return;
1212 } 1192 }
… …
1214 new_ob = object_create_arch (creator->other_arch); 1194 new_ob = object_create_arch (creator->other_arch);
1215 fix_generated_item (new_ob, creator, 0, 0, GT_MINIMAL); 1195 fix_generated_item (new_ob, creator, 0, 0, GT_MINIMAL);
1216 } 1196 }
1217 1197
1218 /* Make sure this multipart object fits */ 1198 /* Make sure this multipart object fits */
1219 if (new_ob->arch->more && ob_blocked (new_ob, creator->map, creator->x, creator->y)) 1199 if (new_ob->arch->more && new_ob->blocked (creator->map, creator->x, creator->y))
1220 { 1200 {
1221 new_ob->destroy (); 1201 new_ob->destroy ();
1222 return; 1202 return;
1223 } 1203 }
1204
1205 // for now lets try to identify everything generated here, it mostly
1206 // happens automated, so this will at least fix many identify-experience holes
1207 SET_FLAG (new_ob, FLAG_IDENTIFIED);
1224 1208
1225 insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y); 1209 insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);
1226 if (QUERY_FLAG (new_ob, FLAG_FREED)) 1210 if (QUERY_FLAG (new_ob, FLAG_FREED))
1227 return; 1211 return;
1228 1212
1229 if (creator->slaying) 1213 if (creator->slaying)
1230 {
1231 new_ob->name = new_ob->title = creator->slaying; 1214 new_ob->name = new_ob->title = creator->slaying;
1232 }
1233} 1215}
1234 1216
1235/* move_marker --peterm@soda.csua.berkeley.edu 1217/* move_marker --peterm@soda.csua.berkeley.edu
1236 when moved, a marker will search for a player sitting above 1218 when moved, a marker will search for a player sitting above
1237 it, and insert an invisible, weightless force into him 1219 it, and insert an invisible, weightless force into him
… …
1243void 1225void
1244move_marker (object *op) 1226move_marker (object *op)
1245{ 1227{
1246 if (object *tmp = op->ms ().player ()) 1228 if (object *tmp = op->ms ().player ())
1247 { 1229 {
1248 object *tmp2;
1249
1250 /* remove an old force with a slaying field == op->name */ 1230 /* remove an old force with a slaying field == op->name */
1251 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below) 1231 if (object *force = tmp->force_find (op->name))
1252 if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->name) 1232 force->destroy ();
1233
1234 if (!tmp->force_find (op->slaying))
1253 { 1235 {
1254 tmp2->destroy (); 1236 tmp->force_add (op->slaying, op->stats.food);
1255 break;
1256 }
1257 1237
1258 /* cycle through his inventory to look for the MARK we want to
1259 * place
1260 */
1261 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1262 if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->slaying)
1263 break;
1264
1265 /* if we didn't find our own MARK */
1266 if (!tmp2)
1267 {
1268 object *force = get_archetype (FORCE_NAME);
1269
1270 if (op->stats.food)
1271 {
1272 force->set_speed (0.01);
1273 force->speed_left = -op->stats.food;
1274 }
1275 else
1276 force->set_speed (0);
1277
1278 /* put in the lock code */
1279 force->slaying = op->slaying;
1280
1281 if (op->lore)
1282 force->lore = op->lore;
1283
1284 insert_ob_in_ob (force, tmp);
1285 if (op->msg) 1238 if (op->msg)
1286 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg); 1239 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg);
1287 1240
1288 if (op->stats.hp > 0) 1241 if (op->stats.hp > 0)
1289 { 1242 {
1290 op->stats.hp--; 1243 op->stats.hp--;
1244
1291 if (op->stats.hp == 0) 1245 if (op->stats.hp == 0)
1292 { 1246 {
1293 /* marker expires--granted mark number limit */ 1247 /* marker expires--granted mark number limit */
1294 op->destroy (); 1248 op->destroy ();
1295 return; 1249 return;
… …
1297 } 1251 }
1298 } 1252 }
1299 } 1253 }
1300} 1254}
1301 1255
1256// mapscript objects activate themselves (only) then their timer fires
1257// TODO: maybe they should simply trigger the link like any other object?
1258void
1259move_mapscript (object *op)
1260{
1261 op->set_speed (0);
1262 cfperl_mapscript_activate (op, true, op, 0);
1263}
1264
1265void move_lamp (object *op)
1266{
1267 // if the lamp/torch is off, we should disable it.
1268 if (!op->glow_radius)
1269 {
1270 op->set_speed (0);
1271 return;
1272 }
1273 else
1274 {
1275 // check whether the face might needs to be updated
1276 // (currently this is needed to have already switched on torches
1277 // on maps, as they just set the glow_radius in the archetype)
1278 if (op->other_arch
1279 && (
1280 (op->flag [FLAG_ANIMATE] != op->other_arch->flag [FLAG_ANIMATE])
1281 || (op->flag [FLAG_ANIMATE]
1282 ? (op->animation_id != op->other_arch->animation_id)
1283 : (op->face != op->other_arch->face))
1284 ))
1285 get_animation_from_arch (op, op->other_arch);
1286 }
1287
1288 // lamps and torches auf maps don't use up their fuel
1289 if (op->is_on_map ())
1290 return;
1291
1292 if (op->stats.food > 0)
1293 {
1294 op->stats.food--;
1295 return;
1296 }
1297
1298 apply_lamp (op, false);
1299}
1300
1302void 1301void
1303process_object (object *op) 1302process_object (object *op)
1304{ 1303{
1305 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 1304 if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))
1306 return; 1305 return;
1307 1306
1308 if (INVOKE_OBJECT (TICK, op)) 1307 if (expect_false (INVOKE_OBJECT (TICK, op)))
1309 return; 1308 return;
1310 1309
1311 if (QUERY_FLAG (op, FLAG_MONSTER)) 1310 if (QUERY_FLAG (op, FLAG_MONSTER))
1312 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED)) 1311 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED))
1313 return; 1312 return;
… …
1318 1317
1319 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1318 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1320 make_sure_seen (op); 1319 make_sure_seen (op);
1321 } 1320 }
1322 1321
1322 if (expect_false (
1323 if (op->flag [FLAG_GENERATOR] 1323 op->flag [FLAG_GENERATOR]
1324 || op->flag [FLAG_CHANGING] 1324 || op->flag [FLAG_CHANGING]
1325 || op->flag [FLAG_IS_USED_UP]) 1325 || op->flag [FLAG_IS_USED_UP]
1326 ))
1326 { 1327 {
1327 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state) 1328 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state)
1328 { 1329 {
1329 change_object (op); 1330 change_object (op);
1330 return; 1331 return;
… …
1337 { 1338 {
1338 if (QUERY_FLAG (op, FLAG_APPLIED)) 1339 if (QUERY_FLAG (op, FLAG_APPLIED))
1339 remove_force (op); 1340 remove_force (op);
1340 else 1341 else
1341 { 1342 {
1342 /* If necessary, delete the item from the players inventory */ 1343 op->remove (); // TODO: really necessary?
1343 object *pl = op->in_player ();
1344
1345 if (pl)
1346 esrv_del_item (pl->contr, op->count);
1347
1348 op->remove ();
1349 1344
1350 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1345 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1351 make_sure_not_seen (op); 1346 make_sure_not_seen (op);
1352 1347
1353 op->destroy (); 1348 op->drop_and_destroy ();
1354 } 1349 }
1355 1350
1356 return; 1351 return;
1357 } 1352 }
1358 } 1353 }
… …
1482 1477
1483 case PLAYER: 1478 case PLAYER:
1484 // players have their own speed-management, so undo the --speed_left 1479 // players have their own speed-management, so undo the --speed_left
1485 ++op->speed_left; 1480 ++op->speed_left;
1486 break; 1481 break;
1487 }
1488}
1489 1482
1483 case MAPSCRIPT:
1484 move_mapscript (op);
1485 break;
1486
1487 case LAMP:
1488 case TORCH:
1489 move_lamp (op);
1490 break;
1491 }
1492}
1493

Diff Legend

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