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

Comparing deliantra/server/server/weather.C (file contents):
Revision 1.10 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.11 by root, Mon Dec 25 14:54:44 2006 UTC

… …
2526 spwty = (settings.worldmaptilesy * settings.worldmaptilesizey) / WEATHERMAPTILESY; 2526 spwty = (settings.worldmaptilesy * settings.worldmaptilesizey) / WEATHERMAPTILESY;
2527 2527
2528 while (*filename == '/') 2528 while (*filename == '/')
2529 *filename++; 2529 *filename++;
2530 2530
2531 fx = MAP_WORLDPARTX (m); 2531 fx = m->worldpartx;
2532 fy = MAP_WORLDPARTY (m); 2532 fy = m->worldparty;
2533 if (fx > settings.worldmapstartx + settings.worldmaptilesx || 2533 if (fx > settings.worldmapstartx + settings.worldmaptilesx ||
2534 fx < settings.worldmapstartx || fy > settings.worldmapstarty + settings.worldmaptilesy || fy < settings.worldmapstarty) 2534 fx < settings.worldmapstartx || fy > settings.worldmapstarty + settings.worldmaptilesy || fy < settings.worldmapstarty)
2535 { 2535 {
2536 LOG (llevDebug, "worldmap_to_weathermap(%s)\n", filename); 2536 LOG (llevDebug, "worldmap_to_weathermap(%s)\n", filename);
2537 sscanf (filename, "world/world_%d_%d", &fx, &fy); 2537 sscanf (filename, "world/world_%d_%d", &fx, &fy);
2538 MAP_WORLDPARTX (m) = fx; 2538 m->worldpartx = fx;
2539 MAP_WORLDPARTY (m) = fy; 2539 m->worldparty = fy;
2540 } 2540 }
2541 if (fx > settings.worldmapstartx + settings.worldmaptilesx || fx < settings.worldmapstartx) 2541 if (fx > settings.worldmapstartx + settings.worldmaptilesx || fx < settings.worldmapstartx)
2542 return -1; 2542 return -1;
2543 if (fy > settings.worldmapstarty + settings.worldmaptilesy || fy < settings.worldmapstarty) 2543 if (fy > settings.worldmapstarty + settings.worldmaptilesy || fy < settings.worldmapstarty)
2544 return -1; 2544 return -1;

Diff Legend

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