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.100 by root, Mon Jan 1 12:28:45 2007 UTC vs.
Revision 1.103 by root, Tue Jan 2 20:40:34 2007 UTC

870 freed_map->name = "/internal/freed_objects_map"; 870 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3; 871 freed_map->width = 3;
872 freed_map->height = 3; 872 freed_map->height = 3;
873 873
874 freed_map->alloc (); 874 freed_map->alloc ();
875 freed_map->in_memory = MAP_IN_MEMORY;
875 } 876 }
876 877
877 map = freed_map; 878 map = freed_map;
878 x = 1; 879 x = 1;
879 y = 1; 880 y = 1;
2613object::flag_desc (char *desc, int len) const 2614object::flag_desc (char *desc, int len) const
2614{ 2615{
2615 char *p = desc; 2616 char *p = desc;
2616 bool first = true; 2617 bool first = true;
2617 2618
2619 *p = 0;
2620
2618 for (int i = 0; i < NUM_FLAGS; i++) 2621 for (int i = 0; i < NUM_FLAGS; i++)
2619 { 2622 {
2620 if (len <= 10) // magic constant! 2623 if (len <= 10) // magic constant!
2621 { 2624 {
2622 snprintf (p, len, ",..."); 2625 snprintf (p, len, ",...");
2623 break; 2626 break;
2624 } 2627 }
2625 2628
2626 if (flag[i]) 2629 if (flag [i])
2627 { 2630 {
2628 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); 2631 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2629 len -= cnt; 2632 len -= cnt;
2630 p += cnt; 2633 p += cnt;
2631 first = false; 2634 first = false;
2633 } 2636 }
2634 2637
2635 return desc; 2638 return desc;
2636} 2639}
2637 2640
2638// return a suitable string describing an objetc in enough detail to find it 2641// return a suitable string describing an object in enough detail to find it
2639const char * 2642const char *
2640object::debug_desc (char *info) const 2643object::debug_desc (char *info) const
2641{ 2644{
2642 char flagdesc[512]; 2645 char flagdesc[512];
2643 char info2[256 * 4]; 2646 char info2[256 * 4];
2660} 2663}
2661 2664
2662const char * 2665const char *
2663object::debug_desc () const 2666object::debug_desc () const
2664{ 2667{
2665 static char info[256 * 3]; 2668 static char info[256 * 4];
2666 return debug_desc (info); 2669 return debug_desc (info);
2667} 2670}
2668 2671

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines