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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.96 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.115 by root, Mon Jan 15 01:39:42 2007 UTC

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
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
43short 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, 45short 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};
46short 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, 48short 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,
… …
276 278
277 /* 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
278 * 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
279 * check? 281 * check?
280 */ 282 */
281 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 283 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
282 return 0; 284 return 0;
283 285
284 switch (ob1->type) 286 switch (ob1->type)
285 { 287 {
286 case SCROLL: 288 case SCROLL:
… …
390} 392}
391 393
392/* 394/*
393 * 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.
394 */ 396 */
395
396object * 397object *
397find_object (tag_t i) 398find_object (tag_t i)
398{ 399{
399 for (object *op = object::first; op; op = op->next) 400 for_all_objects (op)
400 if (op->count == i) 401 if (op->count == i)
401 return op; 402 return op;
402 403
403 return 0; 404 return 0;
404} 405}
405 406
406/* 407/*
407 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
408 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
409 * Enables features like "patch <name-of-other-player> food 999" 410 * Enables features like "patch <name-of-other-player> food 999"
410 */ 411 */
411
412object * 412object *
413find_object_name (const char *str) 413find_object_name (const char *str)
414{ 414{
415 shstr_cmp str_ (str); 415 shstr_cmp str_ (str);
416 object *op; 416 object *op;
417 417
418 for (op = object::first; op != NULL; op = op->next) 418 for_all_objects (op)
419 if (op->name == str_) 419 if (op->name == str_)
420 break; 420 break;
421 421
422 return op; 422 return op;
423} 423}
… …
563 speed = 0; 563 speed = 0;
564 } 564 }
565 565
566 this->speed = speed; 566 this->speed = speed;
567 567
568 if (FABS (speed) > MIN_ACTIVE_SPEED) 568 if (has_active_speed ())
569 { 569 activate ();
570 /* If already on active list, don't do anything */
571 if (active_next || active_prev || this == active_objects)
572 return;
573
574 /* process_events() expects us to insert the object at the beginning
575 * of the list. */
576 active_next = active_objects;
577
578 if (active_next)
579 active_next->active_prev = this;
580
581 active_objects = this;
582 }
583 else 570 else
584 { 571 deactivate ();
585 /* If not on the active list, nothing needs to be done */
586 if (!active_next && !active_prev && this != active_objects)
587 return;
588
589 if (!active_prev)
590 {
591 active_objects = active_next;
592
593 if (active_next)
594 active_next->active_prev = 0;
595 }
596 else
597 {
598 active_prev->active_next = active_next;
599
600 if (active_next)
601 active_next->active_prev = active_prev;
602 }
603
604 active_next = 0;
605 active_prev = 0;
606 }
607} 572}
608 573
609/* 574/*
610 * update_object() updates the the map. 575 * update_object() updates the the map.
611 * It takes into account invisible objects (and represent squares covered 576 * It takes into account invisible objects (and represent squares covered
… …
659 return; 624 return;
660 } 625 }
661 626
662 mapspace &m = op->ms (); 627 mapspace &m = op->ms ();
663 628
664 if (m.flags_ & P_NEED_UPDATE) 629 if (!(m.flags_ & P_UPTODATE))
665 /* nop */; 630 /* nop */;
666 else if (action == UP_OBJ_INSERT) 631 else if (action == UP_OBJ_INSERT)
667 { 632 {
668 // this is likely overkill, TODO: revisit (schmorp) 633 // this is likely overkill, TODO: revisit (schmorp)
669 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
… …
678 /* This isn't perfect, but I don't expect a lot of objects to 643 /* This isn't perfect, but I don't expect a lot of objects to
679 * to have move_allow right now. 644 * to have move_allow right now.
680 */ 645 */
681 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
682 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
683 m.flags_ = P_NEED_UPDATE; 648 m.flags_ = 0;
684 } 649 }
685 /* if the object is being removed, we can't make intelligent 650 /* if the object is being removed, we can't make intelligent
686 * decisions, because remove_ob can't really pass the object 651 * decisions, because remove_ob can't really pass the object
687 * that is being removed. 652 * that is being removed.
688 */ 653 */
689 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
690 m.flags_ = P_NEED_UPDATE; 655 m.flags_ = 0;
691 else if (action == UP_OBJ_FACE) 656 else if (action == UP_OBJ_FACE)
692 /* Nothing to do for that case */ ; 657 /* Nothing to do for that case */ ;
693 else 658 else
694 LOG (llevError, "update_object called with invalid action: %d\n", action); 659 LOG (llevError, "update_object called with invalid action: %d\n", action);
695 660
696 if (op->more) 661 if (op->more)
697 update_object (op->more, action); 662 update_object (op->more, action);
698} 663}
699 664
700object::vector object::objects; // not yet used
701object *object::first;
702
703object::object () 665object::object ()
704{ 666{
705 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
706 668
707 expmul = 1.0; 669 expmul = 1.0;
… …
711object::~object () 673object::~object ()
712{ 674{
713 free_key_values (this); 675 free_key_values (this);
714} 676}
715 677
678static int object_count;
679
716void object::link () 680void object::link ()
717{ 681{
718 count = ++ob_count; 682 assert (!index);//D
719 uuid = gen_uuid (); 683 uuid = gen_uuid ();
684 count = ++object_count;
720 685
721 prev = 0; 686 refcnt_inc ();
722 next = object::first; 687 objects.insert (this);
723
724 if (object::first)
725 object::first->prev = this;
726
727 object::first = this;
728} 688}
729 689
730void object::unlink () 690void object::unlink ()
731{ 691{
732 if (this == object::first) 692 assert (index);//D
733 object::first = next; 693 objects.erase (this);
734 694 refcnt_dec ();
735 /* Remove this object from the list of used objects */
736 if (prev) prev->next = next;
737 if (next) next->prev = prev;
738
739 prev = 0;
740 next = 0;
741} 695}
742 696
743void 697void
698object::activate ()
699{
700 /* If already on active list, don't do anything */
701 if (active)
702 return;
703
704 if (has_active_speed ())
705 actives.insert (this);
706}
707
708void
744object::activate (bool recursive) 709object::activate_recursive ()
745{ 710{
746 // uh, hack 711 activate ();
747 set_speed (speed);
748 712
749 if (recursive)
750 for (object *op = inv; op; op = op->above) 713 for (object *op = inv; op; op = op->below)
751 op->activate (1); 714 op->activate_recursive ();
752} 715}
753 716
754/* This function removes object 'op' from the list of active 717/* This function removes object 'op' from the list of active
755 * objects. 718 * objects.
756 * This should only be used for style maps or other such 719 * This should only be used for style maps or other such
… …
758 * in play chewing up cpu time getting processed. 721 * in play chewing up cpu time getting processed.
759 * The reverse of this is to call update_ob_speed, which 722 * The reverse of this is to call update_ob_speed, which
760 * will do the right thing based on the speed of the object. 723 * will do the right thing based on the speed of the object.
761 */ 724 */
762void 725void
763object::deactivate (bool recursive) 726object::deactivate ()
764{ 727{
765 /* If not on the active list, nothing needs to be done */ 728 /* If not on the active list, nothing needs to be done */
766 if (!active_next && !active_prev && this != active_objects) 729 if (!active)
767 return; 730 return;
768 731
769 if (active_prev == 0) 732 actives.erase (this);
770 { 733}
771 active_objects = active_next;
772 if (active_next)
773 active_next->active_prev = 0;
774 }
775 else
776 {
777 active_prev->active_next = active_next;
778 if (active_next)
779 active_next->active_prev = active_prev;
780 }
781 734
782 active_next = 0; 735void
783 active_prev = 0; 736object::deactivate_recursive ()
784 737{
785 if (recursive)
786 for (object *op = inv; op; op = op->above) 738 for (object *op = inv; op; op = op->below)
739 op->deactivate_recursive ();
740
787 op->deactivate (1); 741 deactivate ();
742}
743
744void
745object::set_flag_inv (int flag, int value)
746{
747 for (object *op = inv; op; op = op->below)
748 {
749 op->flag [flag] = value;
750 op->set_flag_inv (flag, value);
751 }
788} 752}
789 753
790/* 754/*
791 * Remove and free all objects in the inventory of the given object. 755 * Remove and free all objects in the inventory of the given object.
792 * object.c ? 756 * object.c ?
… …
825 789
826 if (op->flag [FLAG_STARTEQUIP] 790 if (op->flag [FLAG_STARTEQUIP]
827 || op->flag [FLAG_NO_DROP] 791 || op->flag [FLAG_NO_DROP]
828 || op->type == RUNE 792 || op->type == RUNE
829 || op->type == TRAP 793 || op->type == TRAP
830 || op->flag [FLAG_IS_A_TEMPLATE]) 794 || op->flag [FLAG_IS_A_TEMPLATE]
795 || op->flag [FLAG_DESTROY_ON_DEATH])
831 op->destroy (); 796 op->destroy ();
832 else 797 else
833 map->insert (op, x, y); 798 map->insert (op, x, y);
834 } 799 }
835 } 800 }
… …
843} 808}
844 809
845void 810void
846object::do_destroy () 811object::do_destroy ()
847{ 812{
813 attachable::do_destroy ();
814
848 if (flag [FLAG_IS_LINKED]) 815 if (flag [FLAG_IS_LINKED])
849 remove_button_link (this); 816 remove_button_link (this);
850 817
851 if (flag [FLAG_FRIENDLY]) 818 if (flag [FLAG_FRIENDLY])
852 remove_friendly_object (this); 819 remove_friendly_object (this);
853 820
854 if (!flag [FLAG_REMOVED]) 821 if (!flag [FLAG_REMOVED])
855 remove (); 822 remove ();
856 823
857 if (flag [FLAG_FREED]) 824 destroy_inv (true);
858 return;
859 825
860 set_speed (0); 826 deactivate ();
827 unlink ();
861 828
862 flag [FLAG_FREED] = 1; 829 flag [FLAG_FREED] = 1;
863
864 attachable::do_destroy ();
865
866 destroy_inv (true);
867 unlink ();
868 830
869 // hack to ensure that freed objects still have a valid map 831 // hack to ensure that freed objects still have a valid map
870 { 832 {
871 static maptile *freed_map; // freed objects are moved here to avoid crashes 833 static maptile *freed_map; // freed objects are moved here to avoid crashes
872 834
… …
877 freed_map->name = "/internal/freed_objects_map"; 839 freed_map->name = "/internal/freed_objects_map";
878 freed_map->width = 3; 840 freed_map->width = 3;
879 freed_map->height = 3; 841 freed_map->height = 3;
880 842
881 freed_map->alloc (); 843 freed_map->alloc ();
844 freed_map->in_memory = MAP_IN_MEMORY;
882 } 845 }
883 846
884 map = freed_map; 847 map = freed_map;
885 x = 1; 848 x = 1;
886 y = 1; 849 y = 1;
… …
896 859
897 // clear those pointers that likely might have circular references to us 860 // clear those pointers that likely might have circular references to us
898 owner = 0; 861 owner = 0;
899 enemy = 0; 862 enemy = 0;
900 attacked_by = 0; 863 attacked_by = 0;
901
902 // only relevant for players(?), but make sure of it anyways
903 contr = 0;
904} 864}
905 865
906void 866void
907object::destroy (bool destroy_inventory) 867object::destroy (bool destroy_inventory)
908{ 868{
… …
993 else if (map) 953 else if (map)
994 { 954 {
995 if (type == PLAYER) 955 if (type == PLAYER)
996 { 956 {
997 --map->players; 957 --map->players;
998 map->last_access = runtime; 958 map->touch ();
999 } 959 }
1000 960
961 map->dirty = true;
1001 962
1002 /* link the object above us */ 963 /* link the object above us */
1003 if (above) 964 if (above)
1004 above->below = below; 965 above->below = below;
1005 else 966 else
… …
1078 } 1039 }
1079 1040
1080 /* last == NULL if there are no objects on this space */ 1041 /* last == NULL if there are no objects on this space */
1081 //TODO: this makes little sense, why only update the topmost object? 1042 //TODO: this makes little sense, why only update the topmost object?
1082 if (!last) 1043 if (!last)
1083 map->at (x, y).flags_ = P_NEED_UPDATE; 1044 map->at (x, y).flags_ = 0;
1084 else 1045 else
1085 update_object (last, UP_OBJ_REMOVE); 1046 update_object (last, UP_OBJ_REMOVE);
1086 1047
1087 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1048 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1088 update_all_los (map, x, y); 1049 update_all_los (map, x, y);
… …
1209 { 1170 {
1210 /* The part may be on a different map. */ 1171 /* The part may be on a different map. */
1211 1172
1212 object *more = op->more; 1173 object *more = op->more;
1213 1174
1214 /* We really need the caller to normalize coordinates - if 1175 /* We really need the caller to normalise coordinates - if
1215 * we set the map, that doesn't work if the location is within 1176 * we set the map, that doesn't work if the location is within
1216 * a map and this is straddling an edge. So only if coordinate 1177 * a map and this is straddling an edge. So only if coordinate
1217 * is clear wrong do we normalize it. 1178 * is clear wrong do we normalise it.
1218 */ 1179 */
1219 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1180 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220 more->map = get_map_from_coord (m, &more->x, &more->y); 1181 more->map = get_map_from_coord (m, &more->x, &more->y);
1221 else if (!more->map) 1182 else if (!more->map)
1222 { 1183 {
… …
1382 1343
1383 if (op->type == PLAYER) 1344 if (op->type == PLAYER)
1384 { 1345 {
1385 op->contr->do_los = 1; 1346 op->contr->do_los = 1;
1386 ++op->map->players; 1347 ++op->map->players;
1387 op->map->last_access = runtime; 1348 op->map->touch ();
1388 } 1349 }
1350
1351 op->map->dirty = true;
1389 1352
1390 /* If we have a floor, we know the player, if any, will be above 1353 /* If we have a floor, we know the player, if any, will be above
1391 * it, so save a few ticks and start from there. 1354 * it, so save a few ticks and start from there.
1392 */ 1355 */
1393 if (!(flag & INS_MAP_LOAD)) 1356 if (!(flag & INS_MAP_LOAD))
… …
1399 * visible to others on this map. But update_all_los is really 1362 * visible to others on this map. But update_all_los is really
1400 * an inefficient way to do this, as it means los for all players 1363 * an inefficient way to do this, as it means los for all players
1401 * on the map will get recalculated. The players could very well 1364 * on the map will get recalculated. The players could very well
1402 * be far away from this change and not affected in any way - 1365 * be far away from this change and not affected in any way -
1403 * this should get redone to only look for players within range, 1366 * this should get redone to only look for players within range,
1404 * or just updating the P_NEED_UPDATE for spaces within this area 1367 * or just updating the P_UPTODATE for spaces within this area
1405 * of effect may be sufficient. 1368 * of effect may be sufficient.
1406 */ 1369 */
1407 if (op->map->darkness && (op->glow_radius != 0)) 1370 if (op->map->darkness && (op->glow_radius != 0))
1408 update_all_los (op->map, op->x, op->y); 1371 update_all_los (op->map, op->x, op->y);
1409 1372
… …
1447{ 1410{
1448 object *tmp, *tmp1; 1411 object *tmp, *tmp1;
1449 1412
1450 /* first search for itself and remove any old instances */ 1413 /* first search for itself and remove any old instances */
1451 1414
1452 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1415 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1453 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1416 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1454 tmp->destroy (); 1417 tmp->destroy ();
1455 1418
1456 tmp1 = arch_to_object (archetype::find (arch_string)); 1419 tmp1 = arch_to_object (archetype::find (arch_string));
1457 1420
… …
1780 1743
1781 /* The objects have to be checked from top to bottom. 1744 /* The objects have to be checked from top to bottom.
1782 * Hence, we first go to the top: 1745 * Hence, we first go to the top:
1783 */ 1746 */
1784 1747
1785 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1748 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1786 { 1749 {
1787 /* Trim the search when we find the first other spell effect 1750 /* Trim the search when we find the first other spell effect
1788 * this helps performance so that if a space has 50 spell objects, 1751 * this helps performance so that if a space has 50 spell objects,
1789 * we don't need to check all of them. 1752 * we don't need to check all of them.
1790 */ 1753 */
… …
1848 * The first matching object is returned, or NULL if none. 1811 * The first matching object is returned, or NULL if none.
1849 */ 1812 */
1850object * 1813object *
1851present_arch (const archetype *at, maptile *m, int x, int y) 1814present_arch (const archetype *at, maptile *m, int x, int y)
1852{ 1815{
1853 if (m == NULL || out_of_map (m, x, y)) 1816 if (!m || out_of_map (m, x, y))
1854 { 1817 {
1855 LOG (llevError, "Present_arch called outside map.\n"); 1818 LOG (llevError, "Present_arch called outside map.\n");
1856 return NULL; 1819 return NULL;
1857 } 1820 }
1858 1821
1859 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1822 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1860 if (tmp->arch == at) 1823 if (tmp->arch == at)
1861 return tmp; 1824 return tmp;
1862 1825
1863 return NULL; 1826 return NULL;
1864} 1827}
… …
1875 { 1838 {
1876 LOG (llevError, "Present called outside map.\n"); 1839 LOG (llevError, "Present called outside map.\n");
1877 return NULL; 1840 return NULL;
1878 } 1841 }
1879 1842
1880 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1843 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1881 if (tmp->type == type) 1844 if (tmp->type == type)
1882 return tmp; 1845 return tmp;
1883 1846
1884 return NULL; 1847 return NULL;
1885} 1848}
… …
2200 2163
2201 return 3; 2164 return 3;
2202} 2165}
2203 2166
2204/* 2167/*
2205 * absdir(int): Returns a number between 1 and 8, which represent
2206 * the "absolute" direction of a number (it actually takes care of
2207 * "overflow" in previous calculations of a direction).
2208 */
2209
2210int
2211absdir (int d)
2212{
2213 while (d < 1)
2214 d += 8;
2215
2216 while (d > 8)
2217 d -= 8;
2218
2219 return d;
2220}
2221
2222/*
2223 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2168 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2224 * between two directions (which are expected to be absolute (see absdir()) 2169 * between two directions (which are expected to be absolute (see absdir())
2225 */ 2170 */
2226
2227int 2171int
2228dirdiff (int dir1, int dir2) 2172dirdiff (int dir1, int dir2)
2229{ 2173{
2230 int d; 2174 int d;
2231 2175
… …
2610 } 2554 }
2611 else 2555 else
2612 item = item->env; 2556 item = item->env;
2613} 2557}
2614 2558
2559
2560const char *
2561object::flag_desc (char *desc, int len) const
2562{
2563 char *p = desc;
2564 bool first = true;
2565
2566 *p = 0;
2567
2568 for (int i = 0; i < NUM_FLAGS; i++)
2569 {
2570 if (len <= 10) // magic constant!
2571 {
2572 snprintf (p, len, ",...");
2573 break;
2574 }
2575
2576 if (flag [i])
2577 {
2578 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2579 len -= cnt;
2580 p += cnt;
2581 first = false;
2582 }
2583 }
2584
2585 return desc;
2586}
2587
2615// return a suitable string describing an objetc in enough detail to find it 2588// return a suitable string describing an object in enough detail to find it
2616const char * 2589const char *
2617object::debug_desc (char *info) const 2590object::debug_desc (char *info) const
2618{ 2591{
2592 char flagdesc[512];
2619 char info2[256 * 3]; 2593 char info2[256 * 4];
2620 char *p = info; 2594 char *p = info;
2621 2595
2622 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2596 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2623 count, 2597 count, uuid.seq,
2624 &name, 2598 &name,
2625 title ? " " : "", 2599 title ? "\",title:" : "",
2626 title ? (const char *)title : ""); 2600 title ? (const char *)title : "",
2601 flag_desc (flagdesc, 512), type);
2627 2602
2628 if (env) 2603 if (env)
2629 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2604 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2630 2605
2631 if (map) 2606 if (map)
… …
2635} 2610}
2636 2611
2637const char * 2612const char *
2638object::debug_desc () const 2613object::debug_desc () const
2639{ 2614{
2640 static char info[256 * 3]; 2615 static char info[256 * 4];
2641 return debug_desc (info); 2616 return debug_desc (info);
2642} 2617}
2643 2618
2619const char *
2620object::debug_desc2 () const
2621{
2622 static char info[256 * 4];
2623 return debug_desc (info);
2624}
2625

Diff Legend

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