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.46 by root, Sat Apr 28 21:34:38 2007 UTC vs.
Revision 1.83 by elmex, Thu Jan 1 15:48:57 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.1); 76 tmp->set_speed (0.1f);
47 tmp->speed_left = -0.2; 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.1);
75 tmp->speed_left = -0.2;
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 {
… …
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);
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);
437 } 454 }
… …
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);
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);
450 } 468 }
451 } 469 }
452} 470}
453 471
454
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))
459 { 476 {
… …
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
… …
574 return NULL; 591 return NULL;
575 } 592 }
576 593
577 op->set_speed (0); 594 op->set_speed (0);
578 op->direction = 0; 595 op->direction = 0;
579 op->move_on = 0; 596 op->move_on = 0;
580 op->move_type = 0; 597 op->move_type = 0;
598 op->skill = 0; // really?
599
600 // restore original wc, dam, attacktype and slaying
581 op->stats.wc = op->stats.sp; 601 op->stats.wc = op->stats.sp;
582 op->stats.dam = op->stats.hp; 602 op->stats.dam = op->stats.hp;
583 op->attacktype = op->stats.grace; 603 op->attacktype = op->stats.grace;
584 op->slaying = 0;
585 op->skill = 0;
586 604
587 if (op->spellarg != NULL) 605 if (op->spellarg)
588 { 606 {
589 op->slaying = op->spellarg; 607 op->slaying = op->spellarg;
590 free (op->spellarg); 608 free (op->spellarg);
591 op->spellarg = NULL; 609 op->spellarg = 0;
592 } 610 }
593 else 611 else
594 op->slaying = NULL; 612 op->slaying = 0;
595 613
596 /* Reset these to zero, so that object::can_merge will work properly */ 614 /* Reset these to zero, so that object::can_merge will work properly */
597 op->spellarg = NULL; 615 op->spellarg = NULL;
598 op->stats.sp = 0; 616 op->stats.sp = 0;
599 op->stats.hp = 0; 617 op->stats.hp = 0;
600 op->stats.grace = 0; 618 op->stats.grace = 0;
601 op->level = 0; 619 op->level = 0;
602 op->face = op->arch->clone.face; 620 op->face = op->arch->face;
603 op->owner = NULL; /* So that stopped arrows will be saved */ 621 op->owner = NULL; /* So that stopped arrows will be saved */
604 update_object (op, UP_OBJ_CHANGE); 622 update_object (op, UP_OBJ_CHANGE);
605 return op; 623 return op;
606} 624}
607 625
… …
618 if (INVOKE_OBJECT (STOP, op)) 636 if (INVOKE_OBJECT (STOP, op))
619 return; 637 return;
620 638
621 if (op->inv) 639 if (op->inv)
622 { 640 {
641 // replace this by straightforward drop to ground?
623 object *payload = op->inv; 642 object *payload = op->inv;
624 643
625 payload->remove ();
626 payload->owner = 0; 644 payload->owner = 0;
627 insert_ob_in_map (payload, op->map, payload, 0); 645 insert_ob_in_map (payload, op->map, payload, 0);
628 op->destroy (); 646 op->destroy ();
629 } 647 }
630 else 648 else
631 { 649 {
632 op = fix_stopped_arrow (op); 650 op = fix_stopped_arrow (op);
651
633 if (op) 652 if (op)
634 merge_ob (op, NULL); 653 merge_ob (op, 0);
635 } 654 }
636} 655}
637 656
638/* Move an arrow along its course. op is the arrow or thrown object. 657/* Move an arrow along its course. op is the arrow or thrown object.
639 */ 658 */
640void 659void
641move_arrow (object *op) 660move_arrow (object *op)
642{ 661{
643 object *tmp;
644 sint16 new_x, new_y;
645 int was_reflected, mflags; 662 int was_reflected;
646 maptile *m;
647 663
648 if (op->map == NULL) 664 if (!op->map)
649 { 665 {
650 LOG (llevError, "BUG: Arrow had no map.\n"); 666 LOG (llevError, "BUG: Arrow had no map.\n");
651 op->destroy (); 667 op->destroy ();
652 return; 668 return;
653 } 669 }
… …
661 * is if the player throws a bomb - the bomb explodes on its own, 677 * is if the player throws a bomb - the bomb explodes on its own,
662 * but this object sticks around. We could handle the cleanup in the 678 * but this object sticks around. We could handle the cleanup in the
663 * bomb code, but there are potential other cases where that could happen, 679 * bomb code, but there are potential other cases where that could happen,
664 * and it is easy enough to clean it up here. 680 * and it is easy enough to clean it up here.
665 */ 681 */
666 if (op->inv == NULL) 682 if (!op->inv)
667 { 683 {
668 op->destroy (); 684 op->destroy ();
669 return; 685 return;
670 } 686 }
671 687
… …
683 stop_arrow (op); 699 stop_arrow (op);
684 return; 700 return;
685 } 701 }
686 702
687 /* Calculate target map square */ 703 /* Calculate target map square */
688 new_x = op->x + DIRX (op);
689 new_y = op->y + DIRY (op);
690 was_reflected = 0; 704 was_reflected = 0;
691 705
692 m = op->map; 706 mapxy pos (op); pos.move (op->direction);
693 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
694 707
695 if (mflags & P_OUT_OF_MAP) 708 if (!pos.normalise ())
696 { 709 {
697 stop_arrow (op); 710 stop_arrow (op);
698 return; 711 return;
699 } 712 }
700 713
701 /* only need to look for living creatures if this flag is set */ 714 /* only need to look for living creatures if this flag is set */
702 if (mflags & P_IS_ALIVE) 715 if (pos->flags () & P_IS_ALIVE)
703 { 716 {
704 for (tmp = GET_MAP_OB (m, new_x, new_y); tmp != NULL; tmp = tmp->above) 717 object *tmp;
718
719 for (tmp = pos->bot; tmp; tmp = tmp->above)
705 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 720 if (QUERY_FLAG (tmp, FLAG_ALIVE))
706 break; 721 break;
707 722
708 /* Not really fair, but don't let monsters hit themselves with 723 /* Not really fair, but don't let monsters hit themselves with
709 * their own arrow - this can be because they fire it then 724 * their own arrow - this can be because they fire it then
… …
732 return; 747 return;
733 } 748 }
734 } /* if this is not hitting its owner */ 749 } /* if this is not hitting its owner */
735 } /* if there is something alive on this space */ 750 } /* if there is something alive on this space */
736 751
737 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 752 if (OB_TYPE_MOVE_BLOCK (op, pos->move_block))
738 { 753 {
739 int retry = 0; 754 int retry = 0;
740 755
741 /* if the object doesn't reflect, stop the arrow from moving 756 /* if the object doesn't reflect, stop the arrow from moving
742 * note that this code will now catch cases where a monster is 757 * note that this code will now catch cases where a monster is
… …
755 if (op->direction & 1) 770 if (op->direction & 1)
756 { 771 {
757 op->direction = absdir (op->direction + 4); 772 op->direction = absdir (op->direction + 4);
758 retry = 1; 773 retry = 1;
759 } 774 }
775
760 /* There were two blocks with identical code - 776 /* There were two blocks with identical code -
761 * use this retry here to make this one block 777 * use this retry here to make this one block
762 * that did the same thing. 778 * that did the same thing.
763 */ 779 */
764 while (retry < 2) 780 while (retry < 2)
765 { 781 {
766 int left, right, mflags;
767 maptile *m1;
768 sint16 x1, y1;
769
770 retry++; 782 retry++;
771 783
772 /* Need to check for P_OUT_OF_MAP: if the arrow is tavelling 784 /* Need to check for P_OUT_OF_MAP: if the arrow is travelling
773 * over a corner in a tiled map, it is possible that 785 * over a corner in a tiled map, it is possible that
774 * op->direction is within an adjacent map but either 786 * op->direction is within an adjacent map but either
775 * op->direction-1 or op->direction+1 does not exist. 787 * op->direction-1 or op->direction+1 does not exist.
776 */ 788 */
777 mflags = get_map_flags (op->map, &m1, op->x + freearr_x[absdir (op->direction - 1)], 789 mapxy pos1 (pos); pos1.move (absdir (op->direction - 1));
778 op->y + freearr_y[absdir (op->direction - 1)], &x1, &y1); 790 bool left = pos1.normalise () && OB_TYPE_MOVE_BLOCK (op, pos1->move_block);
779 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, (GET_MAP_MOVE_BLOCK (m1, x1, y1)));
780 791
781 mflags = get_map_flags (op->map, &m1, op->x + freearr_x[absdir (op->direction + 1)], 792 mapxy pos2 (pos); pos2.move (absdir (op->direction + 1));
782 op->y + freearr_y[absdir (op->direction + 1)], &x1, &y1); 793 bool right = pos2.normalise () && OB_TYPE_MOVE_BLOCK (op, pos2->move_block);
783 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, (GET_MAP_MOVE_BLOCK (m1, x1, y1)));
784 794
785 if (left == right) 795 if (left == right)
786 op->direction = absdir (op->direction + 4); 796 op->direction = absdir (op->direction + 4);
787 else if (left) 797 else if (left)
788 op->direction = absdir (op->direction + 2); 798 op->direction = absdir (op->direction + 2);
789 else if (right) 799 else if (right)
790 op->direction = absdir (op->direction - 2); 800 op->direction = absdir (op->direction - 2);
791 801
792 mflags = get_map_flags (op->map, &m1, op->x + DIRX (op), op->y + DIRY (op), &x1, &y1);
793
794 /* If this space is not out of the map and not blocked, valid space - 802 /* If this space is not out of the map and not blocked, valid space -
795 * don't need to retry again. 803 * don't need to retry again.
796 */ 804 */
797 if (!(mflags & P_OUT_OF_MAP) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m1, x1, y1))) 805 mapxy pos3 (pos); pos3.move (op->direction);
806 if (pos3.normalise () && !OB_TYPE_MOVE_BLOCK (op, pos3->move_block))
798 break; 807 break;
799
800 } 808 }
809
801 /* Couldn't find a direction to move the arrow to - just 810 /* Couldn't find a direction to move the arrow to - just
802 * top it from moving. 811 * stop it from moving.
803 */ 812 */
804 if (retry == 2) 813 if (retry == 2)
805 { 814 {
806 stop_arrow (op); 815 stop_arrow (op);
807 return; 816 return;
808 } 817 }
818
809 /* update object image for new facing */ 819 /* update object image for new facing */
810 /* many thrown objects *don't* have more than one face */ 820 /* many thrown objects *don't* have more than one face */
811 if (GET_ANIM_ID (op)) 821 if (GET_ANIM_ID (op))
812 SET_ANIMATION (op, op->direction); 822 SET_ANIMATION (op, op->direction);
813 } /* object is reflected */ 823 } /* object is reflected */
814 } /* object ran into a wall */ 824 } /* object ran into a wall */
815 825
816 /* Move the arrow. */
817 op->remove ();
818 op->x = new_x;
819 op->y = new_y;
820
821 /* decrease the speed as it flies. 0.05 means a standard bow will shoot 826 /* decrease the speed as it flies. 0.05 means a standard bow will shoot
822 * about 17 squares. Tune as needed. 827 * about 17 squares. Tune as needed.
823 */ 828 */
824 op->speed -= 0.05; 829 op->speed -= 0.05;
825 insert_ob_in_map (op, m, op, 0);
826}
827 830
828/* This routine doesnt seem to work for "inanimate" objects that 831 /* Move the arrow. */
829 * are being carried, ie a held torch leaps from your hands!. 832 op->move_to (pos);
830 * Modified this routine to allow held objects. b.t. */ 833}
831 834
832void 835void
833change_object (object *op) 836change_object (object *op)
834{ /* Doesn`t handle linked objs yet */ 837{ /* Doesn`t handle linked objs yet */
835 int i, j; 838 int i, j;
836 839
837 if (op->other_arch == NULL) 840 if (!op->other_arch)
838 { 841 {
839 LOG (llevError, "Change object (%s) without other_arch error.\n", &op->name); 842 LOG (llevError, "Change object (%s) without other_arch error.\n", op->debug_desc ());
840 return; 843 return;
841 } 844 }
842 845
843 /* In non-living items only change when food value is 0 */ 846 /* In non-living items only change when food value is 0 */
844 if (!QUERY_FLAG (op, FLAG_ALIVE)) 847 if (!QUERY_FLAG (op, FLAG_ALIVE))
845 { 848 {
846 if (op->stats.food-- > 0) 849 if (op->stats.food-- > 0)
847 return; 850 return;
848 else 851
849 op->stats.food = 1; /* so 1 other_arch is made */ 852 op->stats.food = 1; /* so 1 other_arch is made */
850 } 853 }
851 854
852 object *pl = op->in_player ();
853 object *env = op->env; 855 object *env = op->env;
854 856
855 op->remove (); 857 op->remove ();
856 for (i = 0; i < NROFNEWOBJS (op); i++) 858 for (i = 0; i < op->stats.food; i++)
857 { 859 {
858 object *tmp = arch_to_object (op->other_arch); 860 object *tmp = arch_to_object (op->other_arch);
859 861
860 if (op->type == LAMP) 862 if (op->type == LAMP)
861 tmp->stats.food = op->stats.food - 1; 863 tmp->stats.food = op->stats.food - 1;
862 864
863 tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */ 865 tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
866
864 if (env) 867 if (env)
865 { 868 env->insert (tmp);
866 tmp->x = env->x, tmp->y = env->y;
867 tmp = insert_ob_in_ob (tmp, env);
868
869 /* If this object is the players inventory, we need to tell the
870 * client of the change. Insert_ob_in_map takes care of the
871 * updating the client, so we don't need to do that below.
872 */
873 if (pl)
874 {
875 esrv_del_item (pl->contr, op->count);
876 esrv_send_item (pl, tmp);
877 }
878 }
879 else 869 else
880 { 870 {
881 j = find_first_free_spot (tmp, op->map, op->x, op->y); 871 j = find_first_free_spot (tmp, op->map, op->x, op->y);
882 if (j == -1) /* No free spot */ 872 if (j < 0) /* No free spot */
883 tmp->destroy (); 873 tmp->destroy ();
884 else 874 else
885 { 875 {
886 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j]; 876 mapxy pos (op); pos.move (j);
887 insert_ob_in_map (tmp, op->map, op, 0); 877
878 if (pos.normalise ())
879 pos.insert (tmp, op);
888 } 880 }
889 } 881 }
890 } 882 }
891 883
892 op->destroy (); 884 op->destroy ();
… …
908 move_teleporter (op->more); 900 move_teleporter (op->more);
909 901
910 if (op->head) 902 if (op->head)
911 head = op->head; 903 head = op->head;
912 904
913 for (tmp = op->above; tmp != NULL; tmp = tmp->above) 905 for (tmp = op->above; tmp; tmp = tmp->above)
914 if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 906 if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR))
915 break; 907 break;
916 908
917 /* If nothing above us to move, nothing to do */ 909 /* If nothing above us to move, nothing to do */
918 if (!tmp || QUERY_FLAG (tmp, FLAG_WIZPASS)) 910 if (!tmp || QUERY_FLAG (tmp, FLAG_WIZPASS))
… …
948 else 940 else
949 { 941 {
950 /* Random teleporter */ 942 /* Random teleporter */
951 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp))) 943 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))
952 return; 944 return;
945
953 teleport (head, TELEPORTER, tmp); 946 teleport (head, TELEPORTER, tmp);
954 } 947 }
955} 948}
956
957 949
958/* This object will teleport someone to a different map 950/* This object will teleport someone to a different map
959 and will also apply changes to the player from its inventory. 951 and will also apply changes to the player from its inventory.
960 This was invented for giving classes, but there's no reason it 952 This was invented for giving classes, but there's no reason it
961 can't be generalized. 953 can't be generalized.
… …
1014 return; /* dm has created a firewall in his inventory */ 1006 return; /* dm has created a firewall in his inventory */
1015 1007
1016 spell = op->inv; 1008 spell = op->inv;
1017 1009
1018 if (!spell || spell->type != SPELL) 1010 if (!spell || spell->type != SPELL)
1019 spell = &op->other_arch->clone; 1011 spell = op->other_arch;
1020 1012
1021 if (!spell) 1013 if (!spell)
1022 { 1014 {
1023 LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y); 1015 LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y);
1024 return; 1016 return;
… …
1037 * it'll paralyze the victim for hp*his speed/op->speed 1029 * it'll paralyze the victim for hp*his speed/op->speed
1038 */ 1030 */
1039void 1031void
1040move_player_mover (object *op) 1032move_player_mover (object *op)
1041{ 1033{
1042 object *victim, *nextmover;
1043 int dir = op->stats.sp; 1034 int dir = op->stats.sp;
1044 sint16 nx, ny; 1035 sint16 nx, ny;
1045 maptile *m; 1036 maptile *m;
1046 1037
1047 /* Determine direction now for random movers so we do the right thing */ 1038 /* Determine direction now for random movers so we do the right thing */
1048 if (!dir) 1039 if (!dir)
1049 dir = rndm (1, 8); 1040 dir = rndm (1, 8);
1050 1041
1051 for (victim = GET_MAP_OB (op->map, op->x, op->y); victim != NULL; victim = victim->above) 1042 for (object *victim = op->ms ().bot; victim; victim = victim->above)
1052 { 1043 {
1053 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) && 1044 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) &&
1054 (victim->move_type & op->move_type || !victim->move_type)) 1045 (victim->move_type & op->move_type || !victim->move_type))
1055 { 1046 {
1056 1047
… …
1073 } 1064 }
1074 1065
1075 if (should_director_abort (op, victim)) 1066 if (should_director_abort (op, victim))
1076 return; 1067 return;
1077 1068
1078 for (nextmover = GET_MAP_OB (m, nx, ny); nextmover != NULL; nextmover = nextmover->above) 1069 for (object *nextmover = m->at (nx, ny).bot; nextmover; nextmover = nextmover->above)
1079 { 1070 {
1080 if (nextmover->type == PLAYERMOVER) 1071 if (nextmover->type == PLAYERMOVER)
1081 nextmover->speed_left = -.99; 1072 nextmover->speed_left = -.99f;
1073
1082 if (QUERY_FLAG (nextmover, FLAG_ALIVE)) 1074 if (QUERY_FLAG (nextmover, FLAG_ALIVE))
1083 {
1084 op->speed_left = -1.1; /* wait until the next thing gets out of the way */ 1075 op->speed_left = -1.1f; /* wait until the next thing gets out of the way */
1085 }
1086 } 1076 }
1087 1077
1088 if (victim->type == PLAYER) 1078 if (victim->type == PLAYER)
1089 { 1079 {
1090 /* only level >=1 movers move people */ 1080 /* only level >=1 movers move people */
… …
1094 * is cleared, otherwise the player will get stuck in 1084 * is cleared, otherwise the player will get stuck in
1095 * place. This can happen if the player used a spell to 1085 * place. This can happen if the player used a spell to
1096 * get to this space. 1086 * get to this space.
1097 */ 1087 */
1098 victim->contr->fire_on = 0; 1088 victim->contr->fire_on = 0;
1099 victim->speed_left = -FABS (victim->speed); 1089 victim->speed_left = 1.f;
1100 move_player (victim, dir); 1090 move_player (victim, dir);
1101 } 1091 }
1102 else 1092 else
1103 return; 1093 return;
1104 } 1094 }
… …
1108 if (!op->stats.maxsp && op->attacktype) 1098 if (!op->stats.maxsp && op->attacktype)
1109 op->stats.maxsp = 2; 1099 op->stats.maxsp = 2;
1110 1100
1111 if (op->attacktype) 1101 if (op->attacktype)
1112 { /* flag to paralyze the player */ 1102 { /* flag to paralyze the player */
1113
1114 victim->speed_left = -FABS (op->stats.maxsp * victim->speed / op->speed); 1103 victim->speed_left = max (-5.f, -FABS (op->stats.maxsp * victim->speed / op->speed));
1115 /* Not sure why, but for some chars on metalforge, they
1116 * would sometimes get -inf speed_left, and from the
1117 * description, it could only happen here, so just put
1118 * a lower sanity limit. My only guess is that the
1119 * mover has 0 speed.
1120 */
1121 if (victim->speed_left < -5.0)
1122 victim->speed_left = -5.0;
1123 } 1104 }
1124 } 1105 }
1125 } 1106 }
1126} 1107}
1127 1108
… …
1146 if (op->above == NULL) 1127 if (op->above == NULL)
1147 return; 1128 return;
1148 1129
1149 for (tmp = op->above; tmp; tmp = tmp->above) 1130 for (tmp = op->above; tmp; tmp = tmp->above)
1150 { 1131 {
1151 if (op->other_arch->name == tmp->arch->name) 1132 if (op->other_arch->archname == tmp->arch->archname)
1152 { 1133 {
1153 if (op->level <= 0) 1134 if (op->level <= 0)
1154 tmp->destroy (); 1135 tmp->destroy ();
1155 else 1136 else
1156 { 1137 {
… …
1178 * has to make sure that there is in fact space for the object. 1159 * has to make sure that there is in fact space for the object.
1179 * It should really do this for small objects also, but there is 1160 * It should really do this for small objects also, but there is
1180 * more concern with large objects, most notably a part being placed 1161 * more concern with large objects, most notably a part being placed
1181 * outside of the map which would cause the server to crash 1162 * outside of the map which would cause the server to crash
1182*/ 1163*/
1183
1184void 1164void
1185move_creator (object *creator) 1165move_creator (object *creator)
1186{ 1166{
1187 object *new_ob; 1167 object *new_ob;
1188 1168
… …
1190 { 1170 {
1191 creator->stats.hp = -1; 1171 creator->stats.hp = -1;
1192 return; 1172 return;
1193 } 1173 }
1194 1174
1195 if (creator->inv != NULL) 1175 if (creator->inv)
1196 { 1176 {
1197 object *ob; 1177 object *ob;
1198 int i; 1178 int i;
1199 object *ob_to_copy; 1179 object *ob_to_copy;
1200 1180
… …
1205 if (rndm (0, i) == 0) 1185 if (rndm (0, i) == 0)
1206 { 1186 {
1207 ob_to_copy = ob; 1187 ob_to_copy = ob;
1208 } 1188 }
1209 } 1189 }
1210 new_ob = object_create_clone (ob_to_copy); 1190 new_ob = ob_to_copy->deep_clone ();
1211 CLEAR_FLAG (new_ob, FLAG_IS_A_TEMPLATE); 1191 CLEAR_FLAG (new_ob, FLAG_IS_A_TEMPLATE);
1212 unflag_inv (new_ob, FLAG_IS_A_TEMPLATE); 1192 unflag_inv (new_ob, FLAG_IS_A_TEMPLATE);
1213 } 1193 }
1214 else 1194 else
1215 { 1195 {
1216 if (creator->other_arch == NULL) 1196 if (!creator->other_arch)
1217 { 1197 {
1218 LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n", 1198 LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n",
1219 &creator->name, &creator->map->path, creator->x, creator->y); 1199 &creator->name, &creator->map->path, creator->x, creator->y);
1220 return; 1200 return;
1221 } 1201 }
… …
1223 new_ob = object_create_arch (creator->other_arch); 1203 new_ob = object_create_arch (creator->other_arch);
1224 fix_generated_item (new_ob, creator, 0, 0, GT_MINIMAL); 1204 fix_generated_item (new_ob, creator, 0, 0, GT_MINIMAL);
1225 } 1205 }
1226 1206
1227 /* Make sure this multipart object fits */ 1207 /* Make sure this multipart object fits */
1228 if (new_ob->arch->more && ob_blocked (new_ob, creator->map, creator->x, creator->y)) 1208 if (new_ob->arch->more && new_ob->blocked (creator->map, creator->x, creator->y))
1229 { 1209 {
1230 new_ob->destroy (); 1210 new_ob->destroy ();
1231 return; 1211 return;
1232 } 1212 }
1213
1214 // for now lets try to identify everything generated here, it mostly
1215 // happens automated, so this will at least fix many identify-experience holes
1216 SET_FLAG (new_ob, FLAG_IDENTIFIED);
1233 1217
1234 insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y); 1218 insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);
1235 if (QUERY_FLAG (new_ob, FLAG_FREED)) 1219 if (QUERY_FLAG (new_ob, FLAG_FREED))
1236 return; 1220 return;
1237 1221
1238 if (creator->slaying) 1222 if (creator->slaying)
1239 {
1240 new_ob->name = new_ob->title = creator->slaying; 1223 new_ob->name = new_ob->title = creator->slaying;
1241 }
1242} 1224}
1243 1225
1244/* move_marker --peterm@soda.csua.berkeley.edu 1226/* move_marker --peterm@soda.csua.berkeley.edu
1245 when moved, a marker will search for a player sitting above 1227 when moved, a marker will search for a player sitting above
1246 it, and insert an invisible, weightless force into him 1228 it, and insert an invisible, weightless force into him
… …
1252void 1234void
1253move_marker (object *op) 1235move_marker (object *op)
1254{ 1236{
1255 if (object *tmp = op->ms ().player ()) 1237 if (object *tmp = op->ms ().player ())
1256 { 1238 {
1257 object *tmp2;
1258
1259 /* remove an old force with a slaying field == op->name */ 1239 /* remove an old force with a slaying field == op->name */
1260 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below) 1240 if (object *force = tmp->force_find (op->name))
1261 if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->name) 1241 force->destroy ();
1242
1243 if (!tmp->force_find (op->slaying))
1262 { 1244 {
1263 tmp2->destroy (); 1245 tmp->force_add (op->slaying, op->stats.food);
1264 break;
1265 }
1266 1246
1267 /* cycle through his inventory to look for the MARK we want to
1268 * place
1269 */
1270 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1271 if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->slaying)
1272 break;
1273
1274 /* if we didn't find our own MARK */
1275 if (!tmp2)
1276 {
1277 object *force = get_archetype (FORCE_NAME);
1278
1279 if (op->stats.food)
1280 {
1281 force->set_speed (0.01);
1282 force->speed_left = -op->stats.food;
1283 }
1284 else
1285 force->set_speed (0);
1286
1287 /* put in the lock code */
1288 force->slaying = op->slaying;
1289
1290 if (op->lore)
1291 force->lore = op->lore;
1292
1293 insert_ob_in_ob (force, tmp);
1294 if (op->msg) 1247 if (op->msg)
1295 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg); 1248 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg);
1296 1249
1297 if (op->stats.hp > 0) 1250 if (op->stats.hp > 0)
1298 { 1251 {
1299 op->stats.hp--; 1252 op->stats.hp--;
1253
1300 if (op->stats.hp == 0) 1254 if (op->stats.hp == 0)
1301 { 1255 {
1302 /* marker expires--granted mark number limit */ 1256 /* marker expires--granted mark number limit */
1303 op->destroy (); 1257 op->destroy ();
1304 return; 1258 return;
… …
1306 } 1260 }
1307 } 1261 }
1308 } 1262 }
1309} 1263}
1310 1264
1311int 1265void
1312process_object (object *op) 1266process_object (object *op)
1313{ 1267{
1314 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 1268 if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))
1315 return 0; 1269 return;
1316 1270
1317 if (INVOKE_OBJECT (TICK, op)) 1271 if (expect_false (INVOKE_OBJECT (TICK, op)))
1318 return 0; 1272 return;
1319 1273
1320 if (QUERY_FLAG (op, FLAG_MONSTER)) 1274 if (QUERY_FLAG (op, FLAG_MONSTER))
1321 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED)) 1275 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED))
1322 return 1; 1276 return;
1323 1277
1324 if (QUERY_FLAG (op, FLAG_ANIMATE) && op->anim_speed == 0) 1278 if (QUERY_FLAG (op, FLAG_ANIMATE) && op->anim_speed == 0)
1325 { 1279 {
1326 if (op->type == PLAYER)
1327 animate_object (op, op->facing);
1328 else
1329 animate_object (op, op->direction); 1280 animate_object (op, op->contr ? op->facing : op->direction);
1330 1281
1331 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1282 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1332 make_sure_seen (op); 1283 make_sure_seen (op);
1333 } 1284 }
1334 1285
1286 if (expect_false (
1287 op->flag [FLAG_GENERATOR]
1288 || op->flag [FLAG_CHANGING]
1289 || op->flag [FLAG_IS_USED_UP]
1290 ))
1291 {
1335 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state) 1292 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state)
1336 { 1293 {
1337 change_object (op); 1294 change_object (op);
1338 return 1; 1295 return;
1339 } 1296 }
1340 1297
1341 if (QUERY_FLAG (op, FLAG_GENERATOR) && !QUERY_FLAG (op, FLAG_FRIENDLY)) 1298 if (QUERY_FLAG (op, FLAG_GENERATOR) && !QUERY_FLAG (op, FLAG_FRIENDLY))
1342 generate_monster (op); 1299 generate_monster (op);
1343 1300
1344 if (QUERY_FLAG (op, FLAG_IS_USED_UP) && --op->stats.food <= 0) 1301 if (QUERY_FLAG (op, FLAG_IS_USED_UP) && --op->stats.food <= 0)
1345 { 1302 {
1346 if (QUERY_FLAG (op, FLAG_APPLIED)) 1303 if (QUERY_FLAG (op, FLAG_APPLIED))
1347 remove_force (op); 1304 remove_force (op);
1348 else 1305 else
1349 { 1306 {
1350 /* IF necessary, delete the item from the players inventory */ 1307 op->remove (); // TODO: really necessary?
1351 object *pl = op->in_player ();
1352 1308
1353 if (pl)
1354 esrv_del_item (pl->contr, op->count);
1355
1356 op->remove ();
1357
1358 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1309 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1359 make_sure_not_seen (op); 1310 make_sure_not_seen (op);
1360 1311
1361 op->destroy (); 1312 op->drop_and_destroy ();
1362 } 1313 }
1363 1314
1364 return 1; 1315 return;
1316 }
1365 } 1317 }
1366 1318
1367 switch (op->type) 1319 switch (op->type)
1368 { 1320 {
1369 case SPELL_EFFECT: 1321 case SPELL_EFFECT:
1370 move_spell_effect (op); 1322 move_spell_effect (op);
1371 return 1; 1323 break;
1372 1324
1373 case ROD: 1325 case ROD:
1374 case HORN: 1326 case HORN:
1375 regenerate_rod (op); 1327 regenerate_rod (op);
1376 return 1; 1328 break;
1377 1329
1378 case FORCE: 1330 case FORCE:
1379 case POTION_EFFECT: 1331 case POTION_EFFECT:
1380 remove_force (op); 1332 remove_force (op);
1381 return 1; 1333 break;
1382 1334
1383 case BLINDNESS: 1335 case BLINDNESS:
1384 remove_blindness (op); 1336 remove_blindness (op);
1385 return 0; 1337 break;
1386 1338
1387 case POISONING: 1339 case POISONING:
1388 poison_more (op); 1340 poison_more (op);
1389 return 0; 1341 break;
1390 1342
1391 case DISEASE: 1343 case DISEASE:
1392 move_disease (op); 1344 move_disease (op);
1393 return 0; 1345 break;
1394 1346
1395 case SYMPTOM: 1347 case SYMPTOM:
1396 move_symptom (op); 1348 move_symptom (op);
1397 return 0; 1349 break;
1398 1350
1399 case THROWN_OBJ: 1351 case THROWN_OBJ:
1400 case ARROW: 1352 case ARROW:
1401 move_arrow (op); 1353 move_arrow (op);
1402 return 0; 1354 break;
1403 1355
1404 case DOOR: 1356 case DOOR:
1405 remove_door (op); 1357 remove_door (op);
1406 return 0; 1358 break;
1407 1359
1408 case LOCKED_DOOR: 1360 case LOCKED_DOOR:
1409 remove_door2 (op); 1361 remove_door2 (op);
1410 return 0; 1362 break;
1411 1363
1412 case TELEPORTER: 1364 case TELEPORTER:
1413 move_teleporter (op); 1365 move_teleporter (op);
1414 return 0; 1366 break;
1415 1367
1416 case GOLEM: 1368 case GOLEM:
1417 move_golem (op); 1369 move_golem (op);
1418 return 0; 1370 break;
1419 1371
1420 case EARTHWALL: 1372 case EARTHWALL:
1421 hit_player (op, 2, op, AT_PHYSICAL, 1); 1373 hit_player (op, 2, op, AT_PHYSICAL, 1);
1422 return 0; 1374 break;
1423 1375
1424 case FIREWALL: 1376 case FIREWALL:
1425 move_firewall (op); 1377 move_firewall (op);
1426 if (op->stats.maxsp) 1378 if (op->stats.maxsp)
1427 animate_turning (op); 1379 animate_turning (op);
1428 return 0; 1380 break;
1429 1381
1430 case MOOD_FLOOR: 1382 case MOOD_FLOOR:
1431 do_mood_floor (op); 1383 do_mood_floor (op);
1432 return 0; 1384 break;
1433 1385
1434 case GATE: 1386 case GATE:
1435 move_gate (op); 1387 move_gate (op);
1436 return 0; 1388 break;
1437 1389
1438 case TIMED_GATE: 1390 case TIMED_GATE:
1439 move_timed_gate (op); 1391 move_timed_gate (op);
1440 return 0; 1392 break;
1441 1393
1442 case TRIGGER: 1394 case TRIGGER:
1443 case TRIGGER_BUTTON: 1395 case TRIGGER_BUTTON:
1444 case TRIGGER_PEDESTAL: 1396 case TRIGGER_PEDESTAL:
1445 case TRIGGER_ALTAR: 1397 case TRIGGER_ALTAR:
1446 animate_trigger (op); 1398 animate_trigger (op);
1447 return 0; 1399 break;
1448 1400
1449 case DETECTOR: 1401 case DETECTOR:
1450 move_detector (op); 1402 move_detector (op);
1451 1403
1452 case DIRECTOR: 1404 case DIRECTOR:
1453 if (op->stats.maxsp) 1405 if (op->stats.maxsp)
1454 animate_turning (op); 1406 animate_turning (op);
1455 return 0; 1407 break;
1456 1408
1457 case HOLE: 1409 case HOLE:
1458 move_hole (op); 1410 move_hole (op);
1459 return 0; 1411 break;
1460 1412
1461 case DEEP_SWAMP: 1413 case DEEP_SWAMP:
1462 move_deep_swamp (op); 1414 move_deep_swamp (op);
1463 return 0; 1415 break;
1464 1416
1465 case RUNE: 1417 case RUNE:
1466 case TRAP: 1418 case TRAP:
1467 move_rune (op); 1419 move_rune (op);
1468 return 0; 1420 break;
1469 1421
1470 case PLAYERMOVER: 1422 case PLAYERMOVER:
1471 move_player_mover (op); 1423 move_player_mover (op);
1472 return 0; 1424 break;
1473 1425
1474 case CREATOR: 1426 case CREATOR:
1475 move_creator (op); 1427 move_creator (op);
1476 return 0; 1428 break;
1477 1429
1478 case MARKER: 1430 case MARKER:
1479 move_marker (op); 1431 move_marker (op);
1480 return 0; 1432 break;
1481 1433
1482 case PLAYER_CHANGER: 1434 case PLAYER_CHANGER:
1483 move_player_changer (op); 1435 move_player_changer (op);
1484 return 0; 1436 break;
1485 1437
1486 case PEACEMAKER: 1438 case PEACEMAKER:
1487 move_peacemaker (op); 1439 move_peacemaker (op);
1488 return 0; 1440 break;
1489 }
1490 1441
1491 return 0; 1442 case PLAYER:
1443 // players have their own speed-management, so undo the --speed_left
1444 ++op->speed_left;
1445 break;
1446 }
1492} 1447}
1448

Diff Legend

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