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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.67 by root, Sat Dec 30 21:15:59 2006 UTC vs.
Revision 1.68 by root, Sun Dec 31 10:28:36 2006 UTC

… …
136 * the function that calls this should figure them out. 136 * the function that calls this should figure them out.
137 */ 137 */
138void 138void
139object::enter_map (maptile *newmap, int x, int y) 139object::enter_map (maptile *newmap, int x, int y)
140{ 140{
141 if (!newmap->load ())
142 return;
143
144 if (out_of_map (newmap, x, y)) 141 if (out_of_map (newmap, x, y))
145 { 142 {
146 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 143 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
147 x = newmap->enter_x; 144 x = newmap->enter_x;
148 y = newmap->enter_y; 145 y = newmap->enter_y;

Diff Legend

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