1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | CrossFire, A Multiplayer game for X-windows |
3 | |
3 | |
|
|
4 | Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | |
7 | This program is free software; you can redistribute it and/or modify |
8 | This program is free software; you can redistribute it and/or modify |
8 | 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 |
… | |
… | |
36 | |
37 | |
37 | int nrofallocobjects = 0; |
38 | int nrofallocobjects = 0; |
38 | static UUID uuid; |
39 | static UUID uuid; |
39 | const uint64 UUID_SKIP = 1<<19; |
40 | const uint64 UUID_SKIP = 1<<19; |
40 | |
41 | |
41 | object *active_objects; /* List of active objects that need to be processed */ |
42 | objectvec objects; |
|
|
43 | activevec actives; |
42 | |
44 | |
43 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
45 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
44 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
46 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
45 | }; |
47 | }; |
46 | short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
48 | short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
… | |
… | |
141 | * objects with lists are rare, and lists stay short. If not, use a |
143 | * objects with lists are rare, and lists stay short. If not, use a |
142 | * different structure or at least keep the lists sorted... |
144 | * different structure or at least keep the lists sorted... |
143 | */ |
145 | */ |
144 | |
146 | |
145 | /* For each field in wants, */ |
147 | /* For each field in wants, */ |
146 | for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) |
148 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
147 | { |
149 | { |
148 | key_value *has_field; |
150 | key_value *has_field; |
149 | |
151 | |
150 | /* Look for a field in has with the same key. */ |
152 | /* Look for a field in has with the same key. */ |
151 | has_field = get_ob_key_link (has, wants_field->key); |
153 | has_field = get_ob_key_link (has, wants_field->key); |
… | |
… | |
190 | * Check nrof variable *before* calling can_merge() |
192 | * Check nrof variable *before* calling can_merge() |
191 | * |
193 | * |
192 | * Improvements made with merge: Better checking on potion, and also |
194 | * Improvements made with merge: Better checking on potion, and also |
193 | * check weight |
195 | * check weight |
194 | */ |
196 | */ |
195 | |
|
|
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
197 | bool object::can_merge_slow (object *ob1, object *ob2) |
197 | { |
198 | { |
198 | /* A couple quicksanity checks */ |
199 | /* A couple quicksanity checks */ |
199 | if (ob1 == ob2 |
200 | if (ob1 == ob2 |
200 | || ob1->type != ob2->type |
201 | || ob1->type != ob2->type |
… | |
… | |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
222 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
222 | |
223 | |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
224 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
225 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
225 | |
226 | |
226 | if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
227 | if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
227 | || ob1->arch != ob2->arch |
228 | || ob1->arch != ob2->arch |
228 | || ob1->name != ob2->name |
229 | || ob1->name != ob2->name |
229 | || ob1->title != ob2->title |
230 | || ob1->title != ob2->title |
230 | || ob1->msg != ob2->msg |
231 | || ob1->msg != ob2->msg |
231 | || ob1->weight != ob2->weight |
232 | || ob1->weight != ob2->weight |
… | |
… | |
277 | |
278 | |
278 | /* Note sure why the following is the case - either the object has to |
279 | /* Note sure why the following is the case - either the object has to |
279 | * be animated or have a very low speed. Is this an attempted monster |
280 | * be animated or have a very low speed. Is this an attempted monster |
280 | * check? |
281 | * check? |
281 | */ |
282 | */ |
282 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) |
283 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) |
283 | return 0; |
284 | return 0; |
284 | |
285 | |
285 | switch (ob1->type) |
286 | switch (ob1->type) |
286 | { |
287 | { |
287 | case SCROLL: |
288 | case SCROLL: |
… | |
… | |
364 | { |
365 | { |
365 | if (!op) |
366 | if (!op) |
366 | return strdup ("[NULLOBJ]"); |
367 | return strdup ("[NULLOBJ]"); |
367 | |
368 | |
368 | object_freezer freezer; |
369 | object_freezer freezer; |
369 | save_object (freezer, op, 3); |
370 | save_object (freezer, op, 1); |
370 | return freezer.as_string (); |
371 | return freezer.as_string (); |
371 | } |
372 | } |
372 | |
373 | |
373 | /* |
374 | /* |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
375 | * get_nearest_part(multi-object, object 2) returns the part of the |
… | |
… | |
391 | } |
392 | } |
392 | |
393 | |
393 | /* |
394 | /* |
394 | * Returns the object which has the count-variable equal to the argument. |
395 | * Returns the object which has the count-variable equal to the argument. |
395 | */ |
396 | */ |
396 | |
|
|
397 | object * |
397 | object * |
398 | find_object (tag_t i) |
398 | find_object (tag_t i) |
399 | { |
399 | { |
400 | for (object *op = object::first; op; op = op->next) |
400 | return ((unsigned int)i) < objects.size () |
401 | if (op->count == i) |
401 | ? objects [i] |
402 | return op; |
402 | : 0; |
403 | |
|
|
404 | return 0; |
|
|
405 | } |
403 | } |
406 | |
404 | |
407 | /* |
405 | /* |
408 | * Returns the first object which has a name equal to the argument. |
406 | * Returns the first object which has a name equal to the argument. |
409 | * Used only by the patch command, but not all that useful. |
407 | * Used only by the patch command, but not all that useful. |
410 | * Enables features like "patch <name-of-other-player> food 999" |
408 | * Enables features like "patch <name-of-other-player> food 999" |
411 | */ |
409 | */ |
412 | |
|
|
413 | object * |
410 | object * |
414 | find_object_name (const char *str) |
411 | find_object_name (const char *str) |
415 | { |
412 | { |
416 | shstr_cmp str_ (str); |
413 | shstr_cmp str_ (str); |
417 | object *op; |
414 | object *op; |
418 | |
415 | |
419 | for (op = object::first; op != NULL; op = op->next) |
416 | for_all_objects (op) |
420 | if (op->name == str_) |
417 | if (op->name == str_) |
421 | break; |
418 | break; |
422 | |
419 | |
423 | return op; |
420 | return op; |
424 | } |
421 | } |
… | |
… | |
467 | } |
464 | } |
468 | |
465 | |
469 | op->key_values = 0; |
466 | op->key_values = 0; |
470 | } |
467 | } |
471 | |
468 | |
472 | void object::clear () |
|
|
473 | { |
|
|
474 | attachable_base::clear (); |
|
|
475 | |
|
|
476 | free_key_values (this); |
|
|
477 | |
|
|
478 | owner = 0; |
|
|
479 | name = 0; |
|
|
480 | name_pl = 0; |
|
|
481 | title = 0; |
|
|
482 | race = 0; |
|
|
483 | slaying = 0; |
|
|
484 | skill = 0; |
|
|
485 | msg = 0; |
|
|
486 | lore = 0; |
|
|
487 | custom_name = 0; |
|
|
488 | materialname = 0; |
|
|
489 | contr = 0; |
|
|
490 | below = 0; |
|
|
491 | above = 0; |
|
|
492 | inv = 0; |
|
|
493 | container = 0; |
|
|
494 | env = 0; |
|
|
495 | more = 0; |
|
|
496 | head = 0; |
|
|
497 | map = 0; |
|
|
498 | active_next = 0; |
|
|
499 | active_prev = 0; |
|
|
500 | |
|
|
501 | memset (static_cast<object_pod *>(this), 0, sizeof (object_pod)); |
|
|
502 | |
|
|
503 | SET_FLAG (this, FLAG_REMOVED); |
|
|
504 | |
|
|
505 | /* What is not cleared is next, prev, and count */ |
|
|
506 | |
|
|
507 | expmul = 1.0; |
|
|
508 | face = blank_face; |
|
|
509 | |
|
|
510 | if (settings.casting_time) |
|
|
511 | casting_time = -1; |
|
|
512 | } |
|
|
513 | |
|
|
514 | /* |
469 | /* |
515 | * copy_to first frees everything allocated by the dst object, |
470 | * copy_to first frees everything allocated by the dst object, |
516 | * and then copies the contents of itself into the second |
471 | * and then copies the contents of itself into the second |
517 | * object, allocating what needs to be allocated. Basically, any |
472 | * object, allocating what needs to be allocated. Basically, any |
518 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
473 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
… | |
… | |
524 | { |
479 | { |
525 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
480 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
526 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
481 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
527 | |
482 | |
528 | *(object_copy *)dst = *this; |
483 | *(object_copy *)dst = *this; |
529 | *(object_pod *)dst = *this; |
|
|
530 | |
|
|
531 | if (self || cb) |
|
|
532 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
|
|
533 | |
484 | |
534 | if (is_freed) |
485 | if (is_freed) |
535 | SET_FLAG (dst, FLAG_FREED); |
486 | SET_FLAG (dst, FLAG_FREED); |
536 | |
487 | |
537 | if (is_removed) |
488 | if (is_removed) |
… | |
… | |
568 | tail = new_link; |
519 | tail = new_link; |
569 | } |
520 | } |
570 | } |
521 | } |
571 | } |
522 | } |
572 | |
523 | |
573 | update_ob_speed (dst); |
524 | dst->set_speed (dst->speed); |
574 | } |
525 | } |
575 | |
526 | |
576 | object * |
527 | object * |
577 | object::clone () |
528 | object::clone () |
578 | { |
529 | { |
… | |
… | |
584 | /* |
535 | /* |
585 | * If an object with the IS_TURNABLE() flag needs to be turned due |
536 | * If an object with the IS_TURNABLE() flag needs to be turned due |
586 | * to the closest player being on the other side, this function can |
537 | * to the closest player being on the other side, this function can |
587 | * be called to update the face variable, _and_ how it looks on the map. |
538 | * be called to update the face variable, _and_ how it looks on the map. |
588 | */ |
539 | */ |
589 | |
|
|
590 | void |
540 | void |
591 | update_turn_face (object *op) |
541 | update_turn_face (object *op) |
592 | { |
542 | { |
593 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) |
543 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
594 | return; |
544 | return; |
|
|
545 | |
595 | SET_ANIMATION (op, op->direction); |
546 | SET_ANIMATION (op, op->direction); |
596 | update_object (op, UP_OBJ_FACE); |
547 | update_object (op, UP_OBJ_FACE); |
597 | } |
548 | } |
598 | |
549 | |
599 | /* |
550 | /* |
600 | * Updates the speed of an object. If the speed changes from 0 to another |
551 | * Updates the speed of an object. If the speed changes from 0 to another |
601 | * value, or vice versa, then add/remove the object from the active list. |
552 | * value, or vice versa, then add/remove the object from the active list. |
602 | * This function needs to be called whenever the speed of an object changes. |
553 | * This function needs to be called whenever the speed of an object changes. |
603 | */ |
554 | */ |
604 | void |
555 | void |
605 | update_ob_speed (object *op) |
556 | object::set_speed (float speed) |
606 | { |
557 | { |
607 | extern int arch_init; |
558 | if (flag [FLAG_FREED] && speed) |
608 | |
|
|
609 | /* No reason putting the archetypes objects on the speed list, |
|
|
610 | * since they never really need to be updated. |
|
|
611 | */ |
|
|
612 | |
|
|
613 | if (QUERY_FLAG (op, FLAG_FREED) && op->speed) |
|
|
614 | { |
559 | { |
615 | LOG (llevError, "Object %s is freed but has speed.\n", &op->name); |
560 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
616 | #ifdef MANY_CORES |
|
|
617 | abort (); |
|
|
618 | #else |
|
|
619 | op->speed = 0; |
561 | speed = 0; |
620 | #endif |
|
|
621 | } |
|
|
622 | |
|
|
623 | if (arch_init) |
|
|
624 | return; |
|
|
625 | |
|
|
626 | if (FABS (op->speed) > MIN_ACTIVE_SPEED) |
|
|
627 | { |
562 | } |
628 | /* If already on active list, don't do anything */ |
|
|
629 | if (op->active_next || op->active_prev || op == active_objects) |
|
|
630 | return; |
|
|
631 | |
563 | |
632 | /* process_events() expects us to insert the object at the beginning |
564 | this->speed = speed; |
633 | * of the list. */ |
|
|
634 | op->active_next = active_objects; |
|
|
635 | |
565 | |
636 | if (op->active_next != NULL) |
566 | if (has_active_speed ()) |
637 | op->active_next->active_prev = op; |
567 | activate (); |
638 | |
|
|
639 | active_objects = op; |
|
|
640 | } |
|
|
641 | else |
568 | else |
642 | { |
569 | deactivate (); |
643 | /* If not on the active list, nothing needs to be done */ |
|
|
644 | if (!op->active_next && !op->active_prev && op != active_objects) |
|
|
645 | return; |
|
|
646 | |
|
|
647 | if (op->active_prev == NULL) |
|
|
648 | { |
|
|
649 | active_objects = op->active_next; |
|
|
650 | |
|
|
651 | if (op->active_next != NULL) |
|
|
652 | op->active_next->active_prev = NULL; |
|
|
653 | } |
|
|
654 | else |
|
|
655 | { |
|
|
656 | op->active_prev->active_next = op->active_next; |
|
|
657 | |
|
|
658 | if (op->active_next) |
|
|
659 | op->active_next->active_prev = op->active_prev; |
|
|
660 | } |
|
|
661 | |
|
|
662 | op->active_next = NULL; |
|
|
663 | op->active_prev = NULL; |
|
|
664 | } |
|
|
665 | } |
|
|
666 | |
|
|
667 | /* This function removes object 'op' from the list of active |
|
|
668 | * objects. |
|
|
669 | * This should only be used for style maps or other such |
|
|
670 | * reference maps where you don't want an object that isn't |
|
|
671 | * in play chewing up cpu time getting processed. |
|
|
672 | * The reverse of this is to call update_ob_speed, which |
|
|
673 | * will do the right thing based on the speed of the object. |
|
|
674 | */ |
|
|
675 | void |
|
|
676 | remove_from_active_list (object *op) |
|
|
677 | { |
|
|
678 | /* If not on the active list, nothing needs to be done */ |
|
|
679 | if (!op->active_next && !op->active_prev && op != active_objects) |
|
|
680 | return; |
|
|
681 | |
|
|
682 | if (op->active_prev == NULL) |
|
|
683 | { |
|
|
684 | active_objects = op->active_next; |
|
|
685 | if (op->active_next != NULL) |
|
|
686 | op->active_next->active_prev = NULL; |
|
|
687 | } |
|
|
688 | else |
|
|
689 | { |
|
|
690 | op->active_prev->active_next = op->active_next; |
|
|
691 | if (op->active_next) |
|
|
692 | op->active_next->active_prev = op->active_prev; |
|
|
693 | } |
|
|
694 | op->active_next = NULL; |
|
|
695 | op->active_prev = NULL; |
|
|
696 | } |
570 | } |
697 | |
571 | |
698 | /* |
572 | /* |
699 | * update_object() updates the the map. |
573 | * update_object() updates the the map. |
700 | * It takes into account invisible objects (and represent squares covered |
574 | * It takes into account invisible objects (and represent squares covered |
… | |
… | |
737 | */ |
611 | */ |
738 | if (!op->map || op->map->in_memory == MAP_SAVING) |
612 | if (!op->map || op->map->in_memory == MAP_SAVING) |
739 | return; |
613 | return; |
740 | |
614 | |
741 | /* make sure the object is within map boundaries */ |
615 | /* make sure the object is within map boundaries */ |
742 | if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) |
616 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
743 | { |
617 | { |
744 | LOG (llevError, "update_object() called for object out of map!\n"); |
618 | LOG (llevError, "update_object() called for object out of map!\n"); |
745 | #ifdef MANY_CORES |
619 | #ifdef MANY_CORES |
746 | abort (); |
620 | abort (); |
747 | #endif |
621 | #endif |
748 | return; |
622 | return; |
749 | } |
623 | } |
750 | |
624 | |
751 | mapspace &m = op->ms (); |
625 | mapspace &m = op->ms (); |
752 | |
626 | |
753 | if (m.flags_ & P_NEED_UPDATE) |
627 | if (!(m.flags_ & P_UPTODATE)) |
754 | /* nop */; |
628 | /* nop */; |
755 | else if (action == UP_OBJ_INSERT) |
629 | else if (action == UP_OBJ_INSERT) |
756 | { |
630 | { |
757 | // this is likely overkill, TODO: revisit (schmorp) |
631 | // this is likely overkill, TODO: revisit (schmorp) |
758 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
632 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
… | |
… | |
767 | /* This isn't perfect, but I don't expect a lot of objects to |
641 | /* This isn't perfect, but I don't expect a lot of objects to |
768 | * to have move_allow right now. |
642 | * to have move_allow right now. |
769 | */ |
643 | */ |
770 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
644 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
771 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
645 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
772 | m.flags_ = P_NEED_UPDATE; |
646 | m.flags_ = 0; |
773 | } |
647 | } |
774 | /* if the object is being removed, we can't make intelligent |
648 | /* if the object is being removed, we can't make intelligent |
775 | * decisions, because remove_ob can't really pass the object |
649 | * decisions, because remove_ob can't really pass the object |
776 | * that is being removed. |
650 | * that is being removed. |
777 | */ |
651 | */ |
778 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
652 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
779 | m.flags_ = P_NEED_UPDATE; |
653 | m.flags_ = 0; |
780 | else if (action == UP_OBJ_FACE) |
654 | else if (action == UP_OBJ_FACE) |
781 | /* Nothing to do for that case */ ; |
655 | /* Nothing to do for that case */ ; |
782 | else |
656 | else |
783 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
657 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
784 | |
658 | |
785 | if (op->more) |
659 | if (op->more) |
786 | update_object (op->more, action); |
660 | update_object (op->more, action); |
787 | } |
661 | } |
788 | |
662 | |
789 | object::vector object::mortals; |
|
|
790 | object::vector object::objects; // not yet used |
|
|
791 | object *object::first; |
663 | object *object::first; |
792 | |
|
|
793 | void object::free_mortals () |
|
|
794 | { |
|
|
795 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
|
|
796 | if ((*i)->refcnt) |
|
|
797 | ++i; // further delay freeing |
|
|
798 | else |
|
|
799 | { |
|
|
800 | delete *i; |
|
|
801 | mortals.erase (i); |
|
|
802 | } |
|
|
803 | } |
|
|
804 | |
664 | |
805 | object::object () |
665 | object::object () |
806 | { |
666 | { |
807 | SET_FLAG (this, FLAG_REMOVED); |
667 | SET_FLAG (this, FLAG_REMOVED); |
808 | |
668 | |
… | |
… | |
815 | free_key_values (this); |
675 | free_key_values (this); |
816 | } |
676 | } |
817 | |
677 | |
818 | void object::link () |
678 | void object::link () |
819 | { |
679 | { |
820 | count = ++ob_count; |
|
|
821 | uuid = gen_uuid (); |
680 | uuid = gen_uuid (); |
822 | |
681 | |
823 | prev = 0; |
682 | objects.insert (this); |
824 | next = object::first; |
|
|
825 | |
|
|
826 | if (object::first) |
|
|
827 | object::first->prev = this; |
|
|
828 | |
|
|
829 | object::first = this; |
|
|
830 | } |
683 | } |
831 | |
684 | |
832 | void object::unlink () |
685 | void object::unlink () |
833 | { |
686 | { |
834 | if (this == object::first) |
687 | objects.erase (this); |
835 | object::first = next; |
688 | } |
836 | |
689 | |
837 | /* Remove this object from the list of used objects */ |
690 | void |
838 | if (prev) prev->next = next; |
691 | object::activate () |
839 | if (next) next->prev = prev; |
692 | { |
|
|
693 | /* If already on active list, don't do anything */ |
|
|
694 | if (active) |
|
|
695 | return; |
840 | |
696 | |
841 | prev = 0; |
697 | if (has_active_speed ()) |
842 | next = 0; |
698 | actives.insert (this); |
|
|
699 | } |
|
|
700 | |
|
|
701 | void |
|
|
702 | object::activate_recursive () |
|
|
703 | { |
|
|
704 | activate (); |
|
|
705 | |
|
|
706 | for (object *op = inv; op; op = op->below) |
|
|
707 | op->activate_recursive (); |
|
|
708 | } |
|
|
709 | |
|
|
710 | /* This function removes object 'op' from the list of active |
|
|
711 | * objects. |
|
|
712 | * This should only be used for style maps or other such |
|
|
713 | * reference maps where you don't want an object that isn't |
|
|
714 | * in play chewing up cpu time getting processed. |
|
|
715 | * The reverse of this is to call update_ob_speed, which |
|
|
716 | * will do the right thing based on the speed of the object. |
|
|
717 | */ |
|
|
718 | void |
|
|
719 | object::deactivate () |
|
|
720 | { |
|
|
721 | /* If not on the active list, nothing needs to be done */ |
|
|
722 | if (!active) |
|
|
723 | return; |
|
|
724 | |
|
|
725 | actives.erase (this); |
|
|
726 | } |
|
|
727 | |
|
|
728 | void |
|
|
729 | object::deactivate_recursive () |
|
|
730 | { |
|
|
731 | for (object *op = inv; op; op = op->below) |
|
|
732 | op->deactivate_recursive (); |
|
|
733 | |
|
|
734 | deactivate (); |
|
|
735 | } |
|
|
736 | |
|
|
737 | void |
|
|
738 | object::set_flag_inv (int flag, int value) |
|
|
739 | { |
|
|
740 | for (object *op = inv; op; op = op->below) |
|
|
741 | { |
|
|
742 | op->flag [flag] = value; |
|
|
743 | op->set_flag_inv (flag, value); |
|
|
744 | } |
|
|
745 | } |
|
|
746 | |
|
|
747 | /* |
|
|
748 | * Remove and free all objects in the inventory of the given object. |
|
|
749 | * object.c ? |
|
|
750 | */ |
|
|
751 | void |
|
|
752 | object::destroy_inv (bool drop_to_ground) |
|
|
753 | { |
|
|
754 | // need to check first, because the checks below might segfault |
|
|
755 | // as we might be on an invalid mapspace and crossfire code |
|
|
756 | // is too buggy to ensure that the inventory is empty. |
|
|
757 | // corollary: if you create arrows etc. with stuff in tis inventory, |
|
|
758 | // cf will crash below with off-map x and y |
|
|
759 | if (!inv) |
|
|
760 | return; |
|
|
761 | |
|
|
762 | /* Only if the space blocks everything do we not process - |
|
|
763 | * if some form of movement is allowed, let objects |
|
|
764 | * drop on that space. |
|
|
765 | */ |
|
|
766 | if (!drop_to_ground |
|
|
767 | || !map |
|
|
768 | || map->in_memory != MAP_IN_MEMORY |
|
|
769 | || ms ().move_block == MOVE_ALL) |
|
|
770 | { |
|
|
771 | while (inv) |
|
|
772 | { |
|
|
773 | inv->destroy_inv (drop_to_ground); |
|
|
774 | inv->destroy (); |
|
|
775 | } |
|
|
776 | } |
|
|
777 | else |
|
|
778 | { /* Put objects in inventory onto this space */ |
|
|
779 | while (inv) |
|
|
780 | { |
|
|
781 | object *op = inv; |
|
|
782 | |
|
|
783 | if (op->flag [FLAG_STARTEQUIP] |
|
|
784 | || op->flag [FLAG_NO_DROP] |
|
|
785 | || op->type == RUNE |
|
|
786 | || op->type == TRAP |
|
|
787 | || op->flag [FLAG_IS_A_TEMPLATE]) |
|
|
788 | op->destroy (); |
|
|
789 | else |
|
|
790 | map->insert (op, x, y); |
|
|
791 | } |
|
|
792 | } |
843 | } |
793 | } |
844 | |
794 | |
845 | object *object::create () |
795 | object *object::create () |
846 | { |
796 | { |
847 | object *op = new object; |
797 | object *op = new object; |
848 | op->link (); |
798 | op->link (); |
849 | return op; |
799 | return op; |
850 | } |
800 | } |
851 | |
801 | |
852 | /* |
802 | void |
853 | * free_object() frees everything allocated by an object, removes |
803 | object::do_destroy () |
854 | * it from the list of used objects, and puts it on the list of |
|
|
855 | * free objects. The IS_FREED() flag is set in the object. |
|
|
856 | * The object must have been removed by remove_ob() first for |
|
|
857 | * this function to succeed. |
|
|
858 | * |
|
|
859 | * If destroy_inventory is set, free inventory as well. Else drop items in |
|
|
860 | * inventory to the ground. |
|
|
861 | */ |
|
|
862 | void object::destroy (bool destroy_inventory) |
|
|
863 | { |
804 | { |
864 | if (QUERY_FLAG (this, FLAG_FREED)) |
805 | if (flag [FLAG_IS_LINKED]) |
|
|
806 | remove_button_link (this); |
|
|
807 | |
|
|
808 | if (flag [FLAG_FRIENDLY]) |
|
|
809 | remove_friendly_object (this); |
|
|
810 | |
|
|
811 | if (!flag [FLAG_REMOVED]) |
|
|
812 | remove (); |
|
|
813 | |
|
|
814 | if (flag [FLAG_FREED]) |
865 | return; |
815 | return; |
866 | |
816 | |
867 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
817 | set_speed (0); |
868 | remove_friendly_object (this); |
|
|
869 | |
818 | |
870 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
819 | flag [FLAG_FREED] = 1; |
871 | remove (); |
|
|
872 | |
820 | |
873 | SET_FLAG (this, FLAG_FREED); |
821 | attachable::do_destroy (); |
874 | |
822 | |
875 | if (more) |
823 | destroy_inv (true); |
876 | { |
824 | unlink (); |
877 | more->destroy (destroy_inventory); |
|
|
878 | more = 0; |
|
|
879 | } |
|
|
880 | |
|
|
881 | if (inv) |
|
|
882 | { |
|
|
883 | /* Only if the space blocks everything do we not process - |
|
|
884 | * if some form of movement is allowed, let objects |
|
|
885 | * drop on that space. |
|
|
886 | */ |
|
|
887 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
|
|
888 | { |
|
|
889 | object *op = inv; |
|
|
890 | |
|
|
891 | while (op) |
|
|
892 | { |
|
|
893 | object *tmp = op->below; |
|
|
894 | op->destroy (destroy_inventory); |
|
|
895 | op = tmp; |
|
|
896 | } |
|
|
897 | } |
|
|
898 | else |
|
|
899 | { /* Put objects in inventory onto this space */ |
|
|
900 | object *op = inv; |
|
|
901 | |
|
|
902 | while (op) |
|
|
903 | { |
|
|
904 | object *tmp = op->below; |
|
|
905 | |
|
|
906 | op->remove (); |
|
|
907 | |
|
|
908 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
|
|
909 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
|
|
910 | op->destroy (); |
|
|
911 | else |
|
|
912 | { |
|
|
913 | op->x = x; |
|
|
914 | op->y = y; |
|
|
915 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
916 | } |
|
|
917 | |
|
|
918 | op = tmp; |
|
|
919 | } |
|
|
920 | } |
|
|
921 | } |
|
|
922 | |
825 | |
923 | // hack to ensure that freed objects still have a valid map |
826 | // hack to ensure that freed objects still have a valid map |
924 | { |
827 | { |
925 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
828 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
926 | |
829 | |
… | |
… | |
930 | |
833 | |
931 | freed_map->name = "/internal/freed_objects_map"; |
834 | freed_map->name = "/internal/freed_objects_map"; |
932 | freed_map->width = 3; |
835 | freed_map->width = 3; |
933 | freed_map->height = 3; |
836 | freed_map->height = 3; |
934 | |
837 | |
935 | freed_map->allocate (); |
838 | freed_map->alloc (); |
|
|
839 | freed_map->in_memory = MAP_IN_MEMORY; |
936 | } |
840 | } |
937 | |
841 | |
938 | map = freed_map; |
842 | map = freed_map; |
939 | x = 1; |
843 | x = 1; |
940 | y = 1; |
844 | y = 1; |
941 | } |
845 | } |
942 | |
846 | |
|
|
847 | head = 0; |
|
|
848 | |
|
|
849 | if (more) |
|
|
850 | { |
|
|
851 | more->destroy (); |
|
|
852 | more = 0; |
|
|
853 | } |
|
|
854 | |
943 | // clear those pointers that likely might have circular references to us |
855 | // clear those pointers that likely might have circular references to us |
944 | owner = 0; |
856 | owner = 0; |
945 | enemy = 0; |
857 | enemy = 0; |
946 | attacked_by = 0; |
858 | attacked_by = 0; |
|
|
859 | } |
947 | |
860 | |
948 | // only relevant for players(?), but make sure of it anyways |
861 | void |
949 | contr = 0; |
862 | object::destroy (bool destroy_inventory) |
|
|
863 | { |
|
|
864 | if (destroyed ()) |
|
|
865 | return; |
950 | |
866 | |
951 | /* Remove object from the active list */ |
867 | if (destroy_inventory) |
952 | speed = 0; |
868 | destroy_inv (false); |
953 | update_ob_speed (this); |
|
|
954 | |
869 | |
955 | unlink (); |
870 | attachable::destroy (); |
956 | |
|
|
957 | mortals.push_back (this); |
|
|
958 | } |
871 | } |
959 | |
872 | |
960 | /* |
873 | /* |
961 | * sub_weight() recursively (outwards) subtracts a number from the |
874 | * sub_weight() recursively (outwards) subtracts a number from the |
962 | * weight of an object (and what is carried by it's environment(s)). |
875 | * weight of an object (and what is carried by it's environment(s)). |
… | |
… | |
986 | object::remove () |
899 | object::remove () |
987 | { |
900 | { |
988 | object *tmp, *last = 0; |
901 | object *tmp, *last = 0; |
989 | object *otmp; |
902 | object *otmp; |
990 | |
903 | |
991 | int check_walk_off; |
|
|
992 | |
|
|
993 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
904 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
994 | return; |
905 | return; |
995 | |
906 | |
996 | SET_FLAG (this, FLAG_REMOVED); |
907 | SET_FLAG (this, FLAG_REMOVED); |
|
|
908 | INVOKE_OBJECT (REMOVE, this); |
997 | |
909 | |
998 | if (more) |
910 | if (more) |
999 | more->remove (); |
911 | more->remove (); |
1000 | |
912 | |
1001 | /* |
913 | /* |
… | |
… | |
1012 | /* NO_FIX_PLAYER is set when a great many changes are being |
924 | /* NO_FIX_PLAYER is set when a great many changes are being |
1013 | * made to players inventory. If set, avoiding the call |
925 | * made to players inventory. If set, avoiding the call |
1014 | * to save cpu time. |
926 | * to save cpu time. |
1015 | */ |
927 | */ |
1016 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
928 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1017 | fix_player (otmp); |
929 | otmp->update_stats (); |
1018 | |
930 | |
1019 | if (above != NULL) |
931 | if (above) |
1020 | above->below = below; |
932 | above->below = below; |
1021 | else |
933 | else |
1022 | env->inv = below; |
934 | env->inv = below; |
1023 | |
935 | |
1024 | if (below != NULL) |
936 | if (below) |
1025 | below->above = above; |
937 | below->above = above; |
1026 | |
938 | |
1027 | /* we set up values so that it could be inserted into |
939 | /* we set up values so that it could be inserted into |
1028 | * the map, but we don't actually do that - it is up |
940 | * the map, but we don't actually do that - it is up |
1029 | * to the caller to decide what we want to do. |
941 | * to the caller to decide what we want to do. |
… | |
… | |
1033 | above = 0, below = 0; |
945 | above = 0, below = 0; |
1034 | env = 0; |
946 | env = 0; |
1035 | } |
947 | } |
1036 | else if (map) |
948 | else if (map) |
1037 | { |
949 | { |
1038 | /* Re did the following section of code - it looks like it had |
950 | if (type == PLAYER) |
1039 | * lots of logic for things we no longer care about |
|
|
1040 | */ |
951 | { |
|
|
952 | --map->players; |
|
|
953 | map->touch (); |
|
|
954 | } |
|
|
955 | |
|
|
956 | map->dirty = true; |
1041 | |
957 | |
1042 | /* link the object above us */ |
958 | /* link the object above us */ |
1043 | if (above) |
959 | if (above) |
1044 | above->below = below; |
960 | above->below = below; |
1045 | else |
961 | else |
… | |
… | |
1063 | dump = dump_object (GET_MAP_OB (map, x, y)); |
979 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1064 | LOG (llevError, "%s\n", dump); |
980 | LOG (llevError, "%s\n", dump); |
1065 | free (dump); |
981 | free (dump); |
1066 | } |
982 | } |
1067 | |
983 | |
1068 | map->at (x, y).bottom = above; /* goes on above it. */ |
984 | map->at (x, y).bot = above; /* goes on above it. */ |
1069 | } |
985 | } |
1070 | |
986 | |
1071 | above = 0; |
987 | above = 0; |
1072 | below = 0; |
988 | below = 0; |
1073 | |
989 | |
1074 | if (map->in_memory == MAP_SAVING) |
990 | if (map->in_memory == MAP_SAVING) |
1075 | return; |
991 | return; |
1076 | |
992 | |
1077 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
993 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1078 | |
994 | |
1079 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
995 | for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) |
1080 | { |
996 | { |
1081 | /* No point updating the players look faces if he is the object |
997 | /* No point updating the players look faces if he is the object |
1082 | * being removed. |
998 | * being removed. |
1083 | */ |
999 | */ |
1084 | |
1000 | |
… | |
… | |
1088 | * removed (most likely destroyed), update the player view |
1004 | * removed (most likely destroyed), update the player view |
1089 | * appropriately. |
1005 | * appropriately. |
1090 | */ |
1006 | */ |
1091 | if (tmp->container == this) |
1007 | if (tmp->container == this) |
1092 | { |
1008 | { |
1093 | CLEAR_FLAG (this, FLAG_APPLIED); |
1009 | flag [FLAG_APPLIED] = 0; |
1094 | tmp->container = 0; |
1010 | tmp->container = 0; |
1095 | } |
1011 | } |
1096 | |
1012 | |
|
|
1013 | if (tmp->contr->ns) |
1097 | tmp->contr->ns->floorbox_update (); |
1014 | tmp->contr->ns->floorbox_update (); |
1098 | } |
1015 | } |
1099 | |
1016 | |
1100 | /* See if player moving off should effect something */ |
1017 | /* See if object moving off should effect something */ |
1101 | if (check_walk_off |
1018 | if (check_walk_off |
1102 | && ((move_type & tmp->move_off) |
1019 | && ((move_type & tmp->move_off) |
1103 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1020 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1104 | { |
1021 | { |
1105 | move_apply (tmp, this, 0); |
1022 | move_apply (tmp, this, 0); |
… | |
… | |
1107 | if (destroyed ()) |
1024 | if (destroyed ()) |
1108 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1025 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1109 | } |
1026 | } |
1110 | |
1027 | |
1111 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1028 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1112 | |
1029 | //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp) |
1113 | if (tmp->above == tmp) |
1030 | if (tmp->above == tmp) |
1114 | tmp->above = 0; |
1031 | tmp->above = 0; |
1115 | |
1032 | |
1116 | last = tmp; |
1033 | last = tmp; |
1117 | } |
1034 | } |
1118 | |
1035 | |
1119 | /* last == NULL of there are no objects on this space */ |
1036 | /* last == NULL if there are no objects on this space */ |
|
|
1037 | //TODO: this makes little sense, why only update the topmost object? |
1120 | if (!last) |
1038 | if (!last) |
1121 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1039 | map->at (x, y).flags_ = 0; |
1122 | else |
1040 | else |
1123 | update_object (last, UP_OBJ_REMOVE); |
1041 | update_object (last, UP_OBJ_REMOVE); |
1124 | |
1042 | |
1125 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1043 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1126 | update_all_los (map, x, y); |
1044 | update_all_los (map, x, y); |
1127 | } |
1045 | } |
1128 | } |
1046 | } |
1129 | |
1047 | |
1130 | /* |
1048 | /* |
… | |
… | |
1139 | merge_ob (object *op, object *top) |
1057 | merge_ob (object *op, object *top) |
1140 | { |
1058 | { |
1141 | if (!op->nrof) |
1059 | if (!op->nrof) |
1142 | return 0; |
1060 | return 0; |
1143 | |
1061 | |
1144 | if (top == NULL) |
1062 | if (top) |
1145 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
1063 | for (top = op; top && top->above; top = top->above) |
|
|
1064 | ; |
1146 | |
1065 | |
1147 | for (; top != NULL; top = top->below) |
1066 | for (; top; top = top->below) |
1148 | { |
1067 | { |
1149 | if (top == op) |
1068 | if (top == op) |
1150 | continue; |
1069 | continue; |
1151 | |
1070 | |
1152 | if (object::can_merge (op, top)) |
1071 | if (object::can_merge (op, top)) |
… | |
… | |
1168 | * job preparing multi-part monsters |
1087 | * job preparing multi-part monsters |
1169 | */ |
1088 | */ |
1170 | object * |
1089 | object * |
1171 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1090 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1172 | { |
1091 | { |
1173 | object *tmp; |
|
|
1174 | |
|
|
1175 | if (op->head) |
|
|
1176 | op = op->head; |
|
|
1177 | |
|
|
1178 | for (tmp = op; tmp; tmp = tmp->more) |
1092 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1179 | { |
1093 | { |
1180 | tmp->x = x + tmp->arch->clone.x; |
1094 | tmp->x = x + tmp->arch->clone.x; |
1181 | tmp->y = y + tmp->arch->clone.y; |
1095 | tmp->y = y + tmp->arch->clone.y; |
1182 | } |
1096 | } |
1183 | |
1097 | |
… | |
… | |
1202 | * Return value: |
1116 | * Return value: |
1203 | * new object if 'op' was merged with other object |
1117 | * new object if 'op' was merged with other object |
1204 | * NULL if 'op' was destroyed |
1118 | * NULL if 'op' was destroyed |
1205 | * just 'op' otherwise |
1119 | * just 'op' otherwise |
1206 | */ |
1120 | */ |
1207 | |
|
|
1208 | object * |
1121 | object * |
1209 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1122 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1210 | { |
1123 | { |
1211 | object *tmp, *top, *floor = NULL; |
1124 | object *tmp, *top, *floor = NULL; |
1212 | sint16 x, y; |
1125 | sint16 x, y; |
… | |
… | |
1215 | { |
1128 | { |
1216 | LOG (llevError, "Trying to insert freed object!\n"); |
1129 | LOG (llevError, "Trying to insert freed object!\n"); |
1217 | return NULL; |
1130 | return NULL; |
1218 | } |
1131 | } |
1219 | |
1132 | |
1220 | if (m == NULL) |
1133 | if (!m) |
1221 | { |
1134 | { |
1222 | char *dump = dump_object (op); |
1135 | char *dump = dump_object (op); |
1223 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1136 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1224 | free (dump); |
1137 | free (dump); |
1225 | return op; |
1138 | return op; |
… | |
… | |
1246 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
1159 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
1247 | free (dump); |
1160 | free (dump); |
1248 | return op; |
1161 | return op; |
1249 | } |
1162 | } |
1250 | |
1163 | |
1251 | if (op->more != NULL) |
1164 | if (op->more) |
1252 | { |
1165 | { |
1253 | /* The part may be on a different map. */ |
1166 | /* The part may be on a different map. */ |
1254 | |
1167 | |
1255 | object *more = op->more; |
1168 | object *more = op->more; |
1256 | |
1169 | |
1257 | /* We really need the caller to normalize coordinates - if |
1170 | /* We really need the caller to normalise coordinates - if |
1258 | * we set the map, that doesn't work if the location is within |
1171 | * we set the map, that doesn't work if the location is within |
1259 | * a map and this is straddling an edge. So only if coordinate |
1172 | * a map and this is straddling an edge. So only if coordinate |
1260 | * is clear wrong do we normalize it. |
1173 | * is clear wrong do we normalise it. |
1261 | */ |
1174 | */ |
1262 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
1175 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
1263 | more->map = get_map_from_coord (m, &more->x, &more->y); |
1176 | more->map = get_map_from_coord (m, &more->x, &more->y); |
1264 | else if (!more->map) |
1177 | else if (!more->map) |
1265 | { |
1178 | { |
… | |
… | |
1272 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1185 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1273 | { |
1186 | { |
1274 | if (!op->head) |
1187 | if (!op->head) |
1275 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1188 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1276 | |
1189 | |
1277 | return NULL; |
1190 | return 0; |
1278 | } |
1191 | } |
1279 | } |
1192 | } |
1280 | |
1193 | |
1281 | CLEAR_FLAG (op, FLAG_REMOVED); |
1194 | CLEAR_FLAG (op, FLAG_REMOVED); |
1282 | |
1195 | |
… | |
… | |
1289 | y = op->y; |
1202 | y = op->y; |
1290 | |
1203 | |
1291 | /* this has to be done after we translate the coordinates. |
1204 | /* this has to be done after we translate the coordinates. |
1292 | */ |
1205 | */ |
1293 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1206 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1294 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1207 | for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) |
1295 | if (object::can_merge (op, tmp)) |
1208 | if (object::can_merge (op, tmp)) |
1296 | { |
1209 | { |
1297 | op->nrof += tmp->nrof; |
1210 | op->nrof += tmp->nrof; |
1298 | tmp->destroy (); |
1211 | tmp->destroy (); |
1299 | } |
1212 | } |
… | |
… | |
1316 | op->below = originator->below; |
1229 | op->below = originator->below; |
1317 | |
1230 | |
1318 | if (op->below) |
1231 | if (op->below) |
1319 | op->below->above = op; |
1232 | op->below->above = op; |
1320 | else |
1233 | else |
1321 | op->ms ().bottom = op; |
1234 | op->ms ().bot = op; |
1322 | |
1235 | |
1323 | /* since *below* originator, no need to update top */ |
1236 | /* since *below* originator, no need to update top */ |
1324 | originator->below = op; |
1237 | originator->below = op; |
1325 | } |
1238 | } |
1326 | else |
1239 | else |
1327 | { |
1240 | { |
1328 | /* If there are other objects, then */ |
1241 | /* If there are other objects, then */ |
1329 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1242 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1330 | { |
1243 | { |
1331 | object *last = NULL; |
1244 | object *last = 0; |
1332 | |
1245 | |
1333 | /* |
1246 | /* |
1334 | * If there are multiple objects on this space, we do some trickier handling. |
1247 | * If there are multiple objects on this space, we do some trickier handling. |
1335 | * We've already dealt with merging if appropriate. |
1248 | * We've already dealt with merging if appropriate. |
1336 | * Generally, we want to put the new object on top. But if |
1249 | * Generally, we want to put the new object on top. But if |
… | |
… | |
1340 | * once we get to them. This reduces the need to traverse over all of |
1253 | * once we get to them. This reduces the need to traverse over all of |
1341 | * them when adding another one - this saves quite a bit of cpu time |
1254 | * them when adding another one - this saves quite a bit of cpu time |
1342 | * when lots of spells are cast in one area. Currently, it is presumed |
1255 | * when lots of spells are cast in one area. Currently, it is presumed |
1343 | * that flying non pickable objects are spell objects. |
1256 | * that flying non pickable objects are spell objects. |
1344 | */ |
1257 | */ |
1345 | |
|
|
1346 | while (top != NULL) |
1258 | while (top) |
1347 | { |
1259 | { |
1348 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1260 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1349 | floor = top; |
1261 | floor = top; |
1350 | |
1262 | |
1351 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1263 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
… | |
… | |
1404 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1316 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1405 | |
1317 | |
1406 | if (op->above) |
1318 | if (op->above) |
1407 | op->above->below = op; |
1319 | op->above->below = op; |
1408 | |
1320 | |
1409 | op->below = NULL; |
1321 | op->below = 0; |
1410 | op->ms ().bottom = op; |
1322 | op->ms ().bot = op; |
1411 | } |
1323 | } |
1412 | else |
1324 | else |
1413 | { /* get inserted into the stack above top */ |
1325 | { /* get inserted into the stack above top */ |
1414 | op->above = top->above; |
1326 | op->above = top->above; |
1415 | |
1327 | |
… | |
… | |
1418 | |
1330 | |
1419 | op->below = top; |
1331 | op->below = top; |
1420 | top->above = op; |
1332 | top->above = op; |
1421 | } |
1333 | } |
1422 | |
1334 | |
1423 | if (op->above == NULL) |
1335 | if (!op->above) |
1424 | op->ms ().top = op; |
1336 | op->ms ().top = op; |
1425 | } /* else not INS_BELOW_ORIGINATOR */ |
1337 | } /* else not INS_BELOW_ORIGINATOR */ |
1426 | |
1338 | |
1427 | if (op->type == PLAYER) |
1339 | if (op->type == PLAYER) |
|
|
1340 | { |
1428 | op->contr->do_los = 1; |
1341 | op->contr->do_los = 1; |
|
|
1342 | ++op->map->players; |
|
|
1343 | op->map->touch (); |
|
|
1344 | } |
|
|
1345 | |
|
|
1346 | op->map->dirty = true; |
1429 | |
1347 | |
1430 | /* If we have a floor, we know the player, if any, will be above |
1348 | /* If we have a floor, we know the player, if any, will be above |
1431 | * it, so save a few ticks and start from there. |
1349 | * it, so save a few ticks and start from there. |
1432 | */ |
1350 | */ |
1433 | if (!(flag & INS_MAP_LOAD)) |
1351 | if (!(flag & INS_MAP_LOAD)) |
1434 | if (object *pl = op->ms ().player ()) |
1352 | if (object *pl = op->ms ().player ()) |
|
|
1353 | if (pl->contr->ns) |
1435 | pl->contr->ns->floorbox_update (); |
1354 | pl->contr->ns->floorbox_update (); |
1436 | |
1355 | |
1437 | /* If this object glows, it may affect lighting conditions that are |
1356 | /* If this object glows, it may affect lighting conditions that are |
1438 | * visible to others on this map. But update_all_los is really |
1357 | * visible to others on this map. But update_all_los is really |
1439 | * an inefficient way to do this, as it means los for all players |
1358 | * an inefficient way to do this, as it means los for all players |
1440 | * on the map will get recalculated. The players could very well |
1359 | * on the map will get recalculated. The players could very well |
1441 | * be far away from this change and not affected in any way - |
1360 | * be far away from this change and not affected in any way - |
1442 | * this should get redone to only look for players within range, |
1361 | * this should get redone to only look for players within range, |
1443 | * or just updating the P_NEED_UPDATE for spaces within this area |
1362 | * or just updating the P_UPTODATE for spaces within this area |
1444 | * of effect may be sufficient. |
1363 | * of effect may be sufficient. |
1445 | */ |
1364 | */ |
1446 | if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) |
1365 | if (op->map->darkness && (op->glow_radius != 0)) |
1447 | update_all_los (op->map, op->x, op->y); |
1366 | update_all_los (op->map, op->x, op->y); |
1448 | |
1367 | |
1449 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1368 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1450 | update_object (op, UP_OBJ_INSERT); |
1369 | update_object (op, UP_OBJ_INSERT); |
|
|
1370 | |
|
|
1371 | INVOKE_OBJECT (INSERT, op); |
1451 | |
1372 | |
1452 | /* Don't know if moving this to the end will break anything. However, |
1373 | /* Don't know if moving this to the end will break anything. However, |
1453 | * we want to have floorbox_update called before calling this. |
1374 | * we want to have floorbox_update called before calling this. |
1454 | * |
1375 | * |
1455 | * check_move_on() must be after this because code called from |
1376 | * check_move_on() must be after this because code called from |
… | |
… | |
1460 | |
1381 | |
1461 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1382 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1462 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1383 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1463 | { |
1384 | { |
1464 | if (check_move_on (op, originator)) |
1385 | if (check_move_on (op, originator)) |
1465 | return NULL; |
1386 | return 0; |
1466 | |
1387 | |
1467 | /* If we are a multi part object, lets work our way through the check |
1388 | /* If we are a multi part object, lets work our way through the check |
1468 | * walk on's. |
1389 | * walk on's. |
1469 | */ |
1390 | */ |
1470 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1391 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1471 | if (check_move_on (tmp, originator)) |
1392 | if (check_move_on (tmp, originator)) |
1472 | return NULL; |
1393 | return 0; |
1473 | } |
1394 | } |
1474 | |
1395 | |
1475 | return op; |
1396 | return op; |
1476 | } |
1397 | } |
1477 | |
1398 | |
… | |
… | |
1484 | { |
1405 | { |
1485 | object *tmp, *tmp1; |
1406 | object *tmp, *tmp1; |
1486 | |
1407 | |
1487 | /* first search for itself and remove any old instances */ |
1408 | /* first search for itself and remove any old instances */ |
1488 | |
1409 | |
1489 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1410 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1490 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1411 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1491 | tmp->destroy (); |
1412 | tmp->destroy (); |
1492 | |
1413 | |
1493 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1414 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1494 | |
1415 | |
1495 | tmp1->x = op->x; |
1416 | tmp1->x = op->x; |
1496 | tmp1->y = op->y; |
1417 | tmp1->y = op->y; |
1497 | insert_ob_in_map (tmp1, op->map, op, 0); |
1418 | insert_ob_in_map (tmp1, op->map, op, 0); |
|
|
1419 | } |
|
|
1420 | |
|
|
1421 | object * |
|
|
1422 | object::insert_at (object *where, object *originator, int flags) |
|
|
1423 | { |
|
|
1424 | where->map->insert (this, where->x, where->y, originator, flags); |
1498 | } |
1425 | } |
1499 | |
1426 | |
1500 | /* |
1427 | /* |
1501 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1428 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1502 | * is returned contains nr objects, and the remaining parts contains |
1429 | * is returned contains nr objects, and the remaining parts contains |
1503 | * the rest (or is removed and freed if that number is 0). |
1430 | * the rest (or is removed and freed if that number is 0). |
1504 | * On failure, NULL is returned, and the reason put into the |
1431 | * On failure, NULL is returned, and the reason put into the |
1505 | * global static errmsg array. |
1432 | * global static errmsg array. |
1506 | */ |
1433 | */ |
1507 | |
|
|
1508 | object * |
1434 | object * |
1509 | get_split_ob (object *orig_ob, uint32 nr) |
1435 | get_split_ob (object *orig_ob, uint32 nr) |
1510 | { |
1436 | { |
1511 | object *newob; |
1437 | object *newob; |
1512 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1438 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
… | |
… | |
1548 | |
1474 | |
1549 | object * |
1475 | object * |
1550 | decrease_ob_nr (object *op, uint32 i) |
1476 | decrease_ob_nr (object *op, uint32 i) |
1551 | { |
1477 | { |
1552 | object *tmp; |
1478 | object *tmp; |
1553 | player *pl; |
|
|
1554 | |
1479 | |
1555 | if (i == 0) /* objects with op->nrof require this check */ |
1480 | if (i == 0) /* objects with op->nrof require this check */ |
1556 | return op; |
1481 | return op; |
1557 | |
1482 | |
1558 | if (i > op->nrof) |
1483 | if (i > op->nrof) |
… | |
… | |
1571 | * IMO, searching through all the players will mostly |
1496 | * IMO, searching through all the players will mostly |
1572 | * likely be quicker than following op->env to the map, |
1497 | * likely be quicker than following op->env to the map, |
1573 | * and then searching the map for a player. |
1498 | * and then searching the map for a player. |
1574 | */ |
1499 | */ |
1575 | if (!tmp) |
1500 | if (!tmp) |
1576 | { |
1501 | for_all_players (pl) |
1577 | for (pl = first_player; pl; pl = pl->next) |
|
|
1578 | if (pl->ob->container == op->env) |
1502 | if (pl->ob->container == op->env) |
1579 | { |
1503 | { |
1580 | tmp = pl->ob; |
1504 | tmp = pl->ob; |
1581 | break; |
1505 | break; |
1582 | } |
1506 | } |
1583 | } |
|
|
1584 | |
1507 | |
1585 | if (i < op->nrof) |
1508 | if (i < op->nrof) |
1586 | { |
1509 | { |
1587 | sub_weight (op->env, op->weight * i); |
1510 | sub_weight (op->env, op->weight * i); |
1588 | op->nrof -= i; |
1511 | op->nrof -= i; |
… | |
… | |
1724 | add_weight (this, (op->weight + op->carrying)); |
1647 | add_weight (this, (op->weight + op->carrying)); |
1725 | |
1648 | |
1726 | otmp = this->in_player (); |
1649 | otmp = this->in_player (); |
1727 | if (otmp && otmp->contr) |
1650 | if (otmp && otmp->contr) |
1728 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1651 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1729 | fix_player (otmp); |
1652 | otmp->update_stats (); |
1730 | |
1653 | |
1731 | op->map = 0; |
1654 | op->map = 0; |
1732 | op->env = this; |
1655 | op->env = this; |
1733 | op->above = 0; |
1656 | op->above = 0; |
1734 | op->below = 0; |
1657 | op->below = 0; |
… | |
… | |
1738 | if ((op->glow_radius != 0) && map) |
1661 | if ((op->glow_radius != 0) && map) |
1739 | { |
1662 | { |
1740 | #ifdef DEBUG_LIGHTS |
1663 | #ifdef DEBUG_LIGHTS |
1741 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1664 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1742 | #endif /* DEBUG_LIGHTS */ |
1665 | #endif /* DEBUG_LIGHTS */ |
1743 | if (MAP_DARKNESS (map)) |
1666 | if (map->darkness) |
1744 | update_all_los (map, x, y); |
1667 | update_all_los (map, x, y); |
1745 | } |
1668 | } |
1746 | |
1669 | |
1747 | /* Client has no idea of ordering so lets not bother ordering it here. |
1670 | /* Client has no idea of ordering so lets not bother ordering it here. |
1748 | * It sure simplifies this function... |
1671 | * It sure simplifies this function... |
… | |
… | |
1753 | { |
1676 | { |
1754 | op->below = inv; |
1677 | op->below = inv; |
1755 | op->below->above = op; |
1678 | op->below->above = op; |
1756 | inv = op; |
1679 | inv = op; |
1757 | } |
1680 | } |
|
|
1681 | |
|
|
1682 | INVOKE_OBJECT (INSERT, this); |
1758 | |
1683 | |
1759 | return op; |
1684 | return op; |
1760 | } |
1685 | } |
1761 | |
1686 | |
1762 | /* |
1687 | /* |
… | |
… | |
1777 | * |
1702 | * |
1778 | * MSW 2001-07-08: Check all objects on space, not just those below |
1703 | * MSW 2001-07-08: Check all objects on space, not just those below |
1779 | * object being inserted. insert_ob_in_map may not put new objects |
1704 | * object being inserted. insert_ob_in_map may not put new objects |
1780 | * on top. |
1705 | * on top. |
1781 | */ |
1706 | */ |
1782 | |
|
|
1783 | int |
1707 | int |
1784 | check_move_on (object *op, object *originator) |
1708 | check_move_on (object *op, object *originator) |
1785 | { |
1709 | { |
1786 | object *tmp; |
1710 | object *tmp; |
1787 | maptile *m = op->map; |
1711 | maptile *m = op->map; |
… | |
… | |
1814 | |
1738 | |
1815 | /* The objects have to be checked from top to bottom. |
1739 | /* The objects have to be checked from top to bottom. |
1816 | * Hence, we first go to the top: |
1740 | * Hence, we first go to the top: |
1817 | */ |
1741 | */ |
1818 | |
1742 | |
1819 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) |
1743 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
1820 | { |
1744 | { |
1821 | /* Trim the search when we find the first other spell effect |
1745 | /* Trim the search when we find the first other spell effect |
1822 | * this helps performance so that if a space has 50 spell objects, |
1746 | * this helps performance so that if a space has 50 spell objects, |
1823 | * we don't need to check all of them. |
1747 | * we don't need to check all of them. |
1824 | */ |
1748 | */ |
… | |
… | |
1879 | /* |
1803 | /* |
1880 | * present_arch(arch, map, x, y) searches for any objects with |
1804 | * present_arch(arch, map, x, y) searches for any objects with |
1881 | * a matching archetype at the given map and coordinates. |
1805 | * a matching archetype at the given map and coordinates. |
1882 | * The first matching object is returned, or NULL if none. |
1806 | * The first matching object is returned, or NULL if none. |
1883 | */ |
1807 | */ |
1884 | |
|
|
1885 | object * |
1808 | object * |
1886 | present_arch (const archetype *at, maptile *m, int x, int y) |
1809 | present_arch (const archetype *at, maptile *m, int x, int y) |
1887 | { |
1810 | { |
1888 | object * |
|
|
1889 | tmp; |
|
|
1890 | |
|
|
1891 | if (m == NULL || out_of_map (m, x, y)) |
1811 | if (!m || out_of_map (m, x, y)) |
1892 | { |
1812 | { |
1893 | LOG (llevError, "Present_arch called outside map.\n"); |
1813 | LOG (llevError, "Present_arch called outside map.\n"); |
1894 | return NULL; |
1814 | return NULL; |
1895 | } |
1815 | } |
1896 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1816 | |
|
|
1817 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1897 | if (tmp->arch == at) |
1818 | if (tmp->arch == at) |
1898 | return tmp; |
1819 | return tmp; |
|
|
1820 | |
1899 | return NULL; |
1821 | return NULL; |
1900 | } |
1822 | } |
1901 | |
1823 | |
1902 | /* |
1824 | /* |
1903 | * present(type, map, x, y) searches for any objects with |
1825 | * present(type, map, x, y) searches for any objects with |
1904 | * a matching type variable at the given map and coordinates. |
1826 | * a matching type variable at the given map and coordinates. |
1905 | * The first matching object is returned, or NULL if none. |
1827 | * The first matching object is returned, or NULL if none. |
1906 | */ |
1828 | */ |
1907 | |
|
|
1908 | object * |
1829 | object * |
1909 | present (unsigned char type, maptile *m, int x, int y) |
1830 | present (unsigned char type, maptile *m, int x, int y) |
1910 | { |
1831 | { |
1911 | object * |
|
|
1912 | tmp; |
|
|
1913 | |
|
|
1914 | if (out_of_map (m, x, y)) |
1832 | if (out_of_map (m, x, y)) |
1915 | { |
1833 | { |
1916 | LOG (llevError, "Present called outside map.\n"); |
1834 | LOG (llevError, "Present called outside map.\n"); |
1917 | return NULL; |
1835 | return NULL; |
1918 | } |
1836 | } |
1919 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1837 | |
|
|
1838 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1920 | if (tmp->type == type) |
1839 | if (tmp->type == type) |
1921 | return tmp; |
1840 | return tmp; |
|
|
1841 | |
1922 | return NULL; |
1842 | return NULL; |
1923 | } |
1843 | } |
1924 | |
1844 | |
1925 | /* |
1845 | /* |
1926 | * present_in_ob(type, object) searches for any objects with |
1846 | * present_in_ob(type, object) searches for any objects with |
1927 | * a matching type variable in the inventory of the given object. |
1847 | * a matching type variable in the inventory of the given object. |
1928 | * The first matching object is returned, or NULL if none. |
1848 | * The first matching object is returned, or NULL if none. |
1929 | */ |
1849 | */ |
1930 | |
|
|
1931 | object * |
1850 | object * |
1932 | present_in_ob (unsigned char type, const object *op) |
1851 | present_in_ob (unsigned char type, const object *op) |
1933 | { |
1852 | { |
1934 | object * |
|
|
1935 | tmp; |
|
|
1936 | |
|
|
1937 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1853 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1938 | if (tmp->type == type) |
1854 | if (tmp->type == type) |
1939 | return tmp; |
1855 | return tmp; |
|
|
1856 | |
1940 | return NULL; |
1857 | return NULL; |
1941 | } |
1858 | } |
1942 | |
1859 | |
1943 | /* |
1860 | /* |
1944 | * present_in_ob (type, str, object) searches for any objects with |
1861 | * present_in_ob (type, str, object) searches for any objects with |
… | |
… | |
1952 | * str is the string to match against. Note that we match against |
1869 | * str is the string to match against. Note that we match against |
1953 | * the object name, not the archetype name. this is so that the |
1870 | * the object name, not the archetype name. this is so that the |
1954 | * spell code can use one object type (force), but change it's name |
1871 | * spell code can use one object type (force), but change it's name |
1955 | * to be unique. |
1872 | * to be unique. |
1956 | */ |
1873 | */ |
1957 | |
|
|
1958 | object * |
1874 | object * |
1959 | present_in_ob_by_name (int type, const char *str, const object *op) |
1875 | present_in_ob_by_name (int type, const char *str, const object *op) |
1960 | { |
1876 | { |
1961 | object * |
|
|
1962 | tmp; |
|
|
1963 | |
|
|
1964 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1877 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1965 | { |
|
|
1966 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1878 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1967 | return tmp; |
1879 | return tmp; |
1968 | } |
1880 | |
1969 | return NULL; |
1881 | return 0; |
1970 | } |
1882 | } |
1971 | |
1883 | |
1972 | /* |
1884 | /* |
1973 | * present_arch_in_ob(archetype, object) searches for any objects with |
1885 | * present_arch_in_ob(archetype, object) searches for any objects with |
1974 | * a matching archetype in the inventory of the given object. |
1886 | * a matching archetype in the inventory of the given object. |
1975 | * The first matching object is returned, or NULL if none. |
1887 | * The first matching object is returned, or NULL if none. |
1976 | */ |
1888 | */ |
1977 | |
|
|
1978 | object * |
1889 | object * |
1979 | present_arch_in_ob (const archetype *at, const object *op) |
1890 | present_arch_in_ob (const archetype *at, const object *op) |
1980 | { |
1891 | { |
1981 | object * |
|
|
1982 | tmp; |
|
|
1983 | |
|
|
1984 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1892 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1985 | if (tmp->arch == at) |
1893 | if (tmp->arch == at) |
1986 | return tmp; |
1894 | return tmp; |
|
|
1895 | |
1987 | return NULL; |
1896 | return NULL; |
1988 | } |
1897 | } |
1989 | |
1898 | |
1990 | /* |
1899 | /* |
1991 | * activate recursively a flag on an object inventory |
1900 | * activate recursively a flag on an object inventory |
1992 | */ |
1901 | */ |
1993 | void |
1902 | void |
1994 | flag_inv (object *op, int flag) |
1903 | flag_inv (object *op, int flag) |
1995 | { |
1904 | { |
1996 | object * |
|
|
1997 | tmp; |
|
|
1998 | |
|
|
1999 | if (op->inv) |
1905 | if (op->inv) |
2000 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1906 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2001 | { |
1907 | { |
2002 | SET_FLAG (tmp, flag); |
1908 | SET_FLAG (tmp, flag); |
2003 | flag_inv (tmp, flag); |
1909 | flag_inv (tmp, flag); |
2004 | } |
1910 | } |
2005 | } /* |
1911 | } |
|
|
1912 | |
|
|
1913 | /* |
2006 | * desactivate recursively a flag on an object inventory |
1914 | * deactivate recursively a flag on an object inventory |
2007 | */ |
1915 | */ |
2008 | void |
1916 | void |
2009 | unflag_inv (object *op, int flag) |
1917 | unflag_inv (object *op, int flag) |
2010 | { |
1918 | { |
2011 | object * |
|
|
2012 | tmp; |
|
|
2013 | |
|
|
2014 | if (op->inv) |
1919 | if (op->inv) |
2015 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1920 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2016 | { |
1921 | { |
2017 | CLEAR_FLAG (tmp, flag); |
1922 | CLEAR_FLAG (tmp, flag); |
2018 | unflag_inv (tmp, flag); |
1923 | unflag_inv (tmp, flag); |
2019 | } |
1924 | } |
2020 | } |
1925 | } |
… | |
… | |
2023 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
1928 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
2024 | * all it's inventory (recursively). |
1929 | * all it's inventory (recursively). |
2025 | * If checksums are used, a player will get set_cheat called for |
1930 | * If checksums are used, a player will get set_cheat called for |
2026 | * him/her-self and all object carried by a call to this function. |
1931 | * him/her-self and all object carried by a call to this function. |
2027 | */ |
1932 | */ |
2028 | |
|
|
2029 | void |
1933 | void |
2030 | set_cheat (object *op) |
1934 | set_cheat (object *op) |
2031 | { |
1935 | { |
2032 | SET_FLAG (op, FLAG_WAS_WIZ); |
1936 | SET_FLAG (op, FLAG_WAS_WIZ); |
2033 | flag_inv (op, FLAG_WAS_WIZ); |
1937 | flag_inv (op, FLAG_WAS_WIZ); |
… | |
… | |
2052 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1956 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2053 | * to know if the space in question will block the object. We can't use |
1957 | * to know if the space in question will block the object. We can't use |
2054 | * the archetype because that isn't correct if the monster has been |
1958 | * the archetype because that isn't correct if the monster has been |
2055 | * customized, changed states, etc. |
1959 | * customized, changed states, etc. |
2056 | */ |
1960 | */ |
2057 | |
|
|
2058 | int |
1961 | int |
2059 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1962 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2060 | { |
1963 | { |
2061 | int |
|
|
2062 | i, |
|
|
2063 | index = 0, flag; |
1964 | int index = 0, flag; |
2064 | static int |
|
|
2065 | altern[SIZEOFFREE]; |
1965 | int altern[SIZEOFFREE]; |
2066 | |
1966 | |
2067 | for (i = start; i < stop; i++) |
1967 | for (int i = start; i < stop; i++) |
2068 | { |
1968 | { |
2069 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
1969 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2070 | if (!flag) |
1970 | if (!flag) |
2071 | altern[index++] = i; |
1971 | altern [index++] = i; |
2072 | |
1972 | |
2073 | /* Basically, if we find a wall on a space, we cut down the search size. |
1973 | /* Basically, if we find a wall on a space, we cut down the search size. |
2074 | * In this way, we won't return spaces that are on another side of a wall. |
1974 | * In this way, we won't return spaces that are on another side of a wall. |
2075 | * This mostly work, but it cuts down the search size in all directions - |
1975 | * This mostly work, but it cuts down the search size in all directions - |
2076 | * if the space being examined only has a wall to the north and empty |
1976 | * if the space being examined only has a wall to the north and empty |
… | |
… | |
2092 | * find_first_free_spot(archetype, maptile, x, y) works like |
1992 | * find_first_free_spot(archetype, maptile, x, y) works like |
2093 | * find_free_spot(), but it will search max number of squares. |
1993 | * find_free_spot(), but it will search max number of squares. |
2094 | * But it will return the first available spot, not a random choice. |
1994 | * But it will return the first available spot, not a random choice. |
2095 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
1995 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2096 | */ |
1996 | */ |
2097 | |
|
|
2098 | int |
1997 | int |
2099 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
1998 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2100 | { |
1999 | { |
2101 | int |
|
|
2102 | i; |
|
|
2103 | |
|
|
2104 | for (i = 0; i < SIZEOFFREE; i++) |
2000 | for (int i = 0; i < SIZEOFFREE; i++) |
2105 | { |
|
|
2106 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2001 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2107 | return i; |
2002 | return i; |
2108 | } |
2003 | |
2109 | return -1; |
2004 | return -1; |
2110 | } |
2005 | } |
2111 | |
2006 | |
2112 | /* |
2007 | /* |
2113 | * The function permute(arr, begin, end) randomly reorders the array |
2008 | * The function permute(arr, begin, end) randomly reorders the array |
2114 | * arr[begin..end-1]. |
2009 | * arr[begin..end-1]. |
|
|
2010 | * now uses a fisher-yates shuffle, old permute was broken |
2115 | */ |
2011 | */ |
2116 | static void |
2012 | static void |
2117 | permute (int *arr, int begin, int end) |
2013 | permute (int *arr, int begin, int end) |
2118 | { |
2014 | { |
2119 | int |
2015 | arr += begin; |
2120 | i, |
|
|
2121 | j, |
|
|
2122 | tmp, |
|
|
2123 | len; |
|
|
2124 | |
|
|
2125 | len = end - begin; |
2016 | end -= begin; |
2126 | for (i = begin; i < end; i++) |
|
|
2127 | { |
|
|
2128 | j = begin + RANDOM () % len; |
|
|
2129 | |
2017 | |
2130 | tmp = arr[i]; |
2018 | while (--end) |
2131 | arr[i] = arr[j]; |
2019 | swap (arr [end], arr [RANDOM () % (end + 1)]); |
2132 | arr[j] = tmp; |
|
|
2133 | } |
|
|
2134 | } |
2020 | } |
2135 | |
2021 | |
2136 | /* new function to make monster searching more efficient, and effective! |
2022 | /* new function to make monster searching more efficient, and effective! |
2137 | * This basically returns a randomized array (in the passed pointer) of |
2023 | * This basically returns a randomized array (in the passed pointer) of |
2138 | * the spaces to find monsters. In this way, it won't always look for |
2024 | * the spaces to find monsters. In this way, it won't always look for |
… | |
… | |
2141 | * the 3x3 area will be searched, just not in a predictable order. |
2027 | * the 3x3 area will be searched, just not in a predictable order. |
2142 | */ |
2028 | */ |
2143 | void |
2029 | void |
2144 | get_search_arr (int *search_arr) |
2030 | get_search_arr (int *search_arr) |
2145 | { |
2031 | { |
2146 | int |
2032 | int i; |
2147 | i; |
|
|
2148 | |
2033 | |
2149 | for (i = 0; i < SIZEOFFREE; i++) |
2034 | for (i = 0; i < SIZEOFFREE; i++) |
2150 | { |
|
|
2151 | search_arr[i] = i; |
2035 | search_arr[i] = i; |
2152 | } |
|
|
2153 | |
2036 | |
2154 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2037 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2155 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2038 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2156 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2039 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2157 | } |
2040 | } |
… | |
… | |
2166 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2049 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2167 | * is actually want is going to try and move there. We need this info |
2050 | * is actually want is going to try and move there. We need this info |
2168 | * because we have to know what movement the thing looking to move |
2051 | * because we have to know what movement the thing looking to move |
2169 | * there is capable of. |
2052 | * there is capable of. |
2170 | */ |
2053 | */ |
2171 | |
|
|
2172 | int |
2054 | int |
2173 | find_dir (maptile *m, int x, int y, object *exclude) |
2055 | find_dir (maptile *m, int x, int y, object *exclude) |
2174 | { |
2056 | { |
2175 | int |
|
|
2176 | i, |
|
|
2177 | max = SIZEOFFREE, mflags; |
2057 | int i, max = SIZEOFFREE, mflags; |
2178 | |
2058 | |
2179 | sint16 nx, ny; |
2059 | sint16 nx, ny; |
2180 | object * |
2060 | object *tmp; |
2181 | tmp; |
|
|
2182 | maptile * |
2061 | maptile *mp; |
2183 | mp; |
|
|
2184 | |
2062 | |
2185 | MoveType blocked, move_type; |
2063 | MoveType blocked, move_type; |
2186 | |
2064 | |
2187 | if (exclude && exclude->head) |
2065 | if (exclude && exclude->head) |
2188 | { |
2066 | { |
… | |
… | |
2205 | |
2083 | |
2206 | if (mflags & P_OUT_OF_MAP) |
2084 | if (mflags & P_OUT_OF_MAP) |
2207 | max = maxfree[i]; |
2085 | max = maxfree[i]; |
2208 | else |
2086 | else |
2209 | { |
2087 | { |
2210 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2088 | mapspace &ms = mp->at (nx, ny); |
|
|
2089 | |
|
|
2090 | blocked = ms.move_block; |
2211 | |
2091 | |
2212 | if ((move_type & blocked) == move_type) |
2092 | if ((move_type & blocked) == move_type) |
2213 | max = maxfree[i]; |
2093 | max = maxfree[i]; |
2214 | else if (mflags & P_IS_ALIVE) |
2094 | else if (mflags & P_IS_ALIVE) |
2215 | { |
2095 | { |
2216 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) |
2096 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2217 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2097 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
|
|
2098 | && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2218 | break; |
2099 | break; |
2219 | |
2100 | |
2220 | if (tmp) |
2101 | if (tmp) |
2221 | return freedir[i]; |
2102 | return freedir[i]; |
2222 | } |
2103 | } |
… | |
… | |
2228 | |
2109 | |
2229 | /* |
2110 | /* |
2230 | * distance(object 1, object 2) will return the square of the |
2111 | * distance(object 1, object 2) will return the square of the |
2231 | * distance between the two given objects. |
2112 | * distance between the two given objects. |
2232 | */ |
2113 | */ |
2233 | |
|
|
2234 | int |
2114 | int |
2235 | distance (const object *ob1, const object *ob2) |
2115 | distance (const object *ob1, const object *ob2) |
2236 | { |
2116 | { |
2237 | int i; |
|
|
2238 | |
|
|
2239 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2117 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2240 | return i; |
|
|
2241 | } |
2118 | } |
2242 | |
2119 | |
2243 | /* |
2120 | /* |
2244 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2121 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2245 | * an object which has subtracted the x and y coordinates of another |
2122 | * an object which has subtracted the x and y coordinates of another |
2246 | * object, needs to travel toward it. |
2123 | * object, needs to travel toward it. |
2247 | */ |
2124 | */ |
2248 | |
|
|
2249 | int |
2125 | int |
2250 | find_dir_2 (int x, int y) |
2126 | find_dir_2 (int x, int y) |
2251 | { |
2127 | { |
2252 | int q; |
2128 | int q; |
2253 | |
2129 | |
… | |
… | |
2292 | int |
2168 | int |
2293 | absdir (int d) |
2169 | absdir (int d) |
2294 | { |
2170 | { |
2295 | while (d < 1) |
2171 | while (d < 1) |
2296 | d += 8; |
2172 | d += 8; |
|
|
2173 | |
2297 | while (d > 8) |
2174 | while (d > 8) |
2298 | d -= 8; |
2175 | d -= 8; |
|
|
2176 | |
2299 | return d; |
2177 | return d; |
2300 | } |
2178 | } |
2301 | |
2179 | |
2302 | /* |
2180 | /* |
2303 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2181 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
… | |
… | |
2305 | */ |
2183 | */ |
2306 | |
2184 | |
2307 | int |
2185 | int |
2308 | dirdiff (int dir1, int dir2) |
2186 | dirdiff (int dir1, int dir2) |
2309 | { |
2187 | { |
2310 | int |
2188 | int d; |
2311 | d; |
|
|
2312 | |
2189 | |
2313 | d = abs (dir1 - dir2); |
2190 | d = abs (dir1 - dir2); |
2314 | if (d > 4) |
2191 | if (d > 4) |
2315 | d = 8 - d; |
2192 | d = 8 - d; |
|
|
2193 | |
2316 | return d; |
2194 | return d; |
2317 | } |
2195 | } |
2318 | |
2196 | |
2319 | /* peterm: |
2197 | /* peterm: |
2320 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2198 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
… | |
… | |
2323 | * This basically means that if direction is 15, then it could either go |
2201 | * This basically means that if direction is 15, then it could either go |
2324 | * direction 4, 14, or 16 to get back to where we are. |
2202 | * direction 4, 14, or 16 to get back to where we are. |
2325 | * Moved from spell_util.c to object.c with the other related direction |
2203 | * Moved from spell_util.c to object.c with the other related direction |
2326 | * functions. |
2204 | * functions. |
2327 | */ |
2205 | */ |
2328 | |
|
|
2329 | int |
|
|
2330 | reduction_dir[SIZEOFFREE][3] = { |
2206 | int reduction_dir[SIZEOFFREE][3] = { |
2331 | {0, 0, 0}, /* 0 */ |
2207 | {0, 0, 0}, /* 0 */ |
2332 | {0, 0, 0}, /* 1 */ |
2208 | {0, 0, 0}, /* 1 */ |
2333 | {0, 0, 0}, /* 2 */ |
2209 | {0, 0, 0}, /* 2 */ |
2334 | {0, 0, 0}, /* 3 */ |
2210 | {0, 0, 0}, /* 3 */ |
2335 | {0, 0, 0}, /* 4 */ |
2211 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2485 | /* Basically, we save the content of the string to a temp file, then call */ |
2361 | /* Basically, we save the content of the string to a temp file, then call */ |
2486 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2362 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2487 | /* but it was simple to make and allows reusing the load_object function. */ |
2363 | /* but it was simple to make and allows reusing the load_object function. */ |
2488 | /* Remember not to use load_object_str in a time-critical situation. */ |
2364 | /* Remember not to use load_object_str in a time-critical situation. */ |
2489 | /* Also remember that multiparts objects are not supported for now. */ |
2365 | /* Also remember that multiparts objects are not supported for now. */ |
2490 | |
|
|
2491 | object * |
2366 | object * |
2492 | load_object_str (const char *obstr) |
2367 | load_object_str (const char *obstr) |
2493 | { |
2368 | { |
2494 | object *op; |
2369 | object *op; |
2495 | char filename[MAX_BUF]; |
2370 | char filename[MAX_BUF]; |
… | |
… | |
2525 | * returns NULL if no match. |
2400 | * returns NULL if no match. |
2526 | */ |
2401 | */ |
2527 | object * |
2402 | object * |
2528 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2403 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2529 | { |
2404 | { |
2530 | object *tmp; |
|
|
2531 | |
|
|
2532 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2405 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
2533 | if (tmp->type == type && tmp->subtype == subtype) |
2406 | if (tmp->type == type && tmp->subtype == subtype) |
2534 | return tmp; |
2407 | return tmp; |
2535 | |
2408 | |
2536 | return NULL; |
2409 | return 0; |
2537 | } |
2410 | } |
2538 | |
2411 | |
2539 | /* If ob has a field named key, return the link from the list, |
2412 | /* If ob has a field named key, return the link from the list, |
2540 | * otherwise return NULL. |
2413 | * otherwise return NULL. |
2541 | * |
2414 | * |
… | |
… | |
2543 | * do the desired thing. |
2416 | * do the desired thing. |
2544 | */ |
2417 | */ |
2545 | key_value * |
2418 | key_value * |
2546 | get_ob_key_link (const object *ob, const char *key) |
2419 | get_ob_key_link (const object *ob, const char *key) |
2547 | { |
2420 | { |
2548 | key_value *link; |
|
|
2549 | |
|
|
2550 | for (link = ob->key_values; link != NULL; link = link->next) |
2421 | for (key_value *link = ob->key_values; link; link = link->next) |
2551 | if (link->key == key) |
2422 | if (link->key == key) |
2552 | return link; |
2423 | return link; |
2553 | |
2424 | |
2554 | return NULL; |
2425 | return 0; |
2555 | } |
2426 | } |
2556 | |
2427 | |
2557 | /* |
2428 | /* |
2558 | * Returns the value of op has an extra_field for key, or NULL. |
2429 | * Returns the value of op has an extra_field for key, or NULL. |
2559 | * |
2430 | * |
… | |
… | |
2599 | * Returns TRUE on success. |
2470 | * Returns TRUE on success. |
2600 | */ |
2471 | */ |
2601 | int |
2472 | int |
2602 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2473 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2603 | { |
2474 | { |
2604 | key_value * |
|
|
2605 | field = NULL, *last = NULL; |
2475 | key_value *field = NULL, *last = NULL; |
2606 | |
2476 | |
2607 | for (field = op->key_values; field != NULL; field = field->next) |
2477 | for (field = op->key_values; field != NULL; field = field->next) |
2608 | { |
2478 | { |
2609 | if (field->key != canonical_key) |
2479 | if (field->key != canonical_key) |
2610 | { |
2480 | { |
… | |
… | |
2638 | /* IF we get here, key doesn't exist */ |
2508 | /* IF we get here, key doesn't exist */ |
2639 | |
2509 | |
2640 | /* No field, we'll have to add it. */ |
2510 | /* No field, we'll have to add it. */ |
2641 | |
2511 | |
2642 | if (!add_key) |
2512 | if (!add_key) |
2643 | { |
|
|
2644 | return FALSE; |
2513 | return FALSE; |
2645 | } |
2514 | |
2646 | /* There isn't any good reason to store a null |
2515 | /* There isn't any good reason to store a null |
2647 | * value in the key/value list. If the archetype has |
2516 | * value in the key/value list. If the archetype has |
2648 | * this key, then we should also have it, so shouldn't |
2517 | * this key, then we should also have it, so shouldn't |
2649 | * be here. If user wants to store empty strings, |
2518 | * be here. If user wants to store empty strings, |
2650 | * should pass in "" |
2519 | * should pass in "" |
… | |
… | |
2699 | } |
2568 | } |
2700 | else |
2569 | else |
2701 | item = item->env; |
2570 | item = item->env; |
2702 | } |
2571 | } |
2703 | |
2572 | |
|
|
2573 | |
|
|
2574 | const char * |
|
|
2575 | object::flag_desc (char *desc, int len) const |
|
|
2576 | { |
|
|
2577 | char *p = desc; |
|
|
2578 | bool first = true; |
|
|
2579 | |
|
|
2580 | *p = 0; |
|
|
2581 | |
|
|
2582 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
2583 | { |
|
|
2584 | if (len <= 10) // magic constant! |
|
|
2585 | { |
|
|
2586 | snprintf (p, len, ",..."); |
|
|
2587 | break; |
|
|
2588 | } |
|
|
2589 | |
|
|
2590 | if (flag [i]) |
|
|
2591 | { |
|
|
2592 | int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); |
|
|
2593 | len -= cnt; |
|
|
2594 | p += cnt; |
|
|
2595 | first = false; |
|
|
2596 | } |
|
|
2597 | } |
|
|
2598 | |
|
|
2599 | return desc; |
|
|
2600 | } |
|
|
2601 | |
2704 | // return a suitable string describing an objetc in enough detail to find it |
2602 | // return a suitable string describing an object in enough detail to find it |
2705 | const char * |
2603 | const char * |
2706 | object::debug_desc (char *info) const |
2604 | object::debug_desc (char *info) const |
2707 | { |
2605 | { |
|
|
2606 | char flagdesc[512]; |
2708 | char info2[256 * 3]; |
2607 | char info2[256 * 4]; |
2709 | char *p = info; |
2608 | char *p = info; |
2710 | |
2609 | |
2711 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
2610 | p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", |
2712 | count, |
2611 | count, uuid.seq, |
2713 | &name, |
2612 | &name, |
2714 | title ? " " : "", |
2613 | title ? "\",title:" : "", |
2715 | title ? (const char *)title : ""); |
2614 | title ? (const char *)title : "", |
|
|
2615 | flag_desc (flagdesc, 512), type); |
2716 | |
2616 | |
2717 | if (env) |
2617 | if (env) |
2718 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2618 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2719 | |
2619 | |
2720 | if (map) |
2620 | if (map) |
2721 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
2621 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2722 | |
2622 | |
2723 | return info; |
2623 | return info; |
2724 | } |
2624 | } |
2725 | |
2625 | |
2726 | const char * |
2626 | const char * |
2727 | object::debug_desc () const |
2627 | object::debug_desc () const |
2728 | { |
2628 | { |
2729 | static char info[256 * 3]; |
2629 | static char info[256 * 4]; |
2730 | return debug_desc (info); |
2630 | return debug_desc (info); |
2731 | } |
2631 | } |
2732 | |
2632 | |