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

Comparing deliantra/server/common/region.C (file contents):
Revision 1.11 by root, Thu Dec 14 22:45:40 2006 UTC vs.
Revision 1.14 by pippijn, Tue Jan 2 23:39:21 2007 UTC

73const char * 73const char *
74get_name_of_region_for_map (const maptile *m) 74get_name_of_region_for_map (const maptile *m)
75{ 75{
76 region *reg; 76 region *reg;
77 77
78 if (m->region != NULL) 78 if (m->region)
79 return m->region->name; 79 return m->region->name;
80
80 for (reg = first_region; reg != NULL; reg = reg->next) 81 for (reg = first_region; reg != NULL; reg = reg->next)
81 { 82 {
82 if (reg->fallback) 83 if (reg->fallback)
83 return reg->name; 84 return reg->name;
84 } 85 }
86
85 LOG (llevInfo, "map %s had no region and I couldn't find a fallback to use.\n", m->name); 87 LOG (llevInfo, "map %s had no region and I couldn't find a fallback to use.\n", &m->name);
86 return "unknown"; 88 return "unknown";
87} 89}
88 90
89/* 91/*
90 * Tries to find a region that 'name' corresponds to. 92 * Tries to find a region that 'name' corresponds to.
447 reg->parent = get_region_by_name (reg->parent_name); 449 reg->parent = get_region_by_name (reg->parent_name);
448 parent_count++; 450 parent_count++;
449 } 451 }
450 region_count++; 452 region_count++;
451 } 453 }
452 LOG (llevDebug, "Assigned %u regions with %u parents.", region_count, parent_count); 454 LOG (llevDebug, "Assigned %u regions with %u parents.\n", region_count, parent_count);
453} 455}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines