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.12 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.15 by pippijn, Sat Jan 6 14:42:29 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-2003 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2001-2003 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
73const char * 74const char *
74get_name_of_region_for_map (const maptile *m) 75get_name_of_region_for_map (const maptile *m)
75{ 76{
76 region *reg; 77 region *reg;
77 78
78 if (m->region != NULL) 79 if (m->region)
79 return m->region->name; 80 return m->region->name;
80 81
81 for (reg = first_region; reg != NULL; reg = reg->next) 82 for (reg = first_region; reg != NULL; reg = reg->next)
82 { 83 {
83 if (reg->fallback) 84 if (reg->fallback)
449 reg->parent = get_region_by_name (reg->parent_name); 450 reg->parent = get_region_by_name (reg->parent_name);
450 parent_count++; 451 parent_count++;
451 } 452 }
452 region_count++; 453 region_count++;
453 } 454 }
454 LOG (llevDebug, "Assigned %u regions with %u parents.", region_count, parent_count); 455 LOG (llevDebug, "Assigned %u regions with %u parents.\n", region_count, parent_count);
455} 456}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines