| version 1.40 | | version 1.41 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_weather_c = | | * static char *rcsid_weather_c = |
| * "$Id: weather.c,v 1.40 2005/07/17 11:00:05 ryo_saeba Exp $"; | | * "$Id: weather.c,v 1.41 2005/09/04 16:58:13 akirschbaum Exp $"; |
| */ | | */ |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | |
| fx < settings.worldmapstartx || | | fx < settings.worldmapstartx || |
| fy > settings.worldmapstarty + settings.worldmaptilesy || | | fy > settings.worldmapstarty + settings.worldmaptilesy || |
| fy < settings.worldmapstarty){ | | fy < settings.worldmapstarty){ |
| printf ("worldmap_to_weathermap(%s)\n",filename); | | LOG(llevDebug, "worldmap_to_weathermap(%s)\n", filename); |
| sscanf(filename, "world/world_%d_%d", &fx, &fy); | | sscanf(filename, "world/world_%d_%d", &fx, &fy); |
| MAP_WORLDPARTX(m)=fx; | | MAP_WORLDPARTX(m)=fx; |
| MAP_WORLDPARTY(m)=fy; | | MAP_WORLDPARTY(m)=fy; |
| | |
| { | | { |
| int wx, wy, temp, eleva, elevb; | | int wx, wy, temp, eleva, elevb; |
| object *op; | | object *op; |
| /*printf ("real_world_temperature: worldmaptoweathermap : %s\n",m->path);*/ | | /*LOG(llevDebug, "real_world_temperature: worldmaptoweathermap : %s\n",m->path);*/ |
| worldmap_to_weathermap(x, y, &wx, &wy, /*m->path*/m); | | worldmap_to_weathermap(x, y, &wx, &wy, /*m->path*/m); |
| temp = real_temperature(wx, wy); | | temp = real_temperature(wx, wy); |
| if (weathermap[wx][wy].avgelev < 0) | | if (weathermap[wx][wy].avgelev < 0) |