Difference for server/weather.c from version 1.32 to 1.33

version 1.32 version 1.33
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_weather_c =   * static char *rcsid_weather_c =
  *   "$Id: weather.c,v 1.32 2003/07/13 07:33:13 garbled Exp $";   *   "$Id: weather.c,v 1.33 2003/07/14 22:10:14 garbled Exp $";
  */   */
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
Line 76
 
Line 76
 weather_avoids_t weather_avoids[] = {  weather_avoids_t weather_avoids[] = {
     {"snow", 1, NULL},      {"snow", 1, NULL},
     {"snow2", 1, NULL},      {"snow2", 1, NULL},
       {"snow3", 1, NULL},
     {"snow4", 1, NULL},      {"snow4", 1, NULL},
     {"snow5", 1, NULL},      {"snow5", 1, NULL},
     {"mountain1_snow", 1, NULL},      {"mountain1_snow", 1, NULL},
Line 248
 
Line 249
 #define GREEN 1  #define GREEN 1
 #define BLUE  2  #define BLUE  2
   
 sint8 real_temp[WEATHERMAPTILESX][WEATHERMAPTILESY];  
   
 /* Colours used for wind directions.  /* Colours used for wind directions.
  * winddir is the directoin wind is coming from.   * winddir is the directoin wind is coming from.
  *   812  456   *   812  456
Line 1374
 
Line 1373
  let_it_snow(m, wx, wy, filename);   let_it_snow(m, wx, wy, filename);
  singing_in_the_rain(m, wx, wy, filename);   singing_in_the_rain(m, wx, wy, filename);
  }   }
     if (settings.dynamiclevel >= 4) {      /*    if (settings.dynamiclevel >= 4) {
      feather_map(m, wx, wy, filename);       feather_map(m, wx, wy, filename);
     }       }*/
     if (settings.dynamiclevel >= 3) {      if (settings.dynamiclevel >= 3) {
  plant_a_garden(m, wx, wy, filename);   plant_a_garden(m, wx, wy, filename);
     }      }
Line 1465
 
Line 1464
 void let_it_snow(mapstruct *m, int wx, int wy, char *filename)  void let_it_snow(mapstruct *m, int wx, int wy, char *filename)
 {  {
     int x, y, i;      int x, y, i;
       int nx, ny, j, d;
     int avoid, two, temp, sky, gotsnow, found, nodstk;      int avoid, two, temp, sky, gotsnow, found, nodstk;
     char *doublestack, *doublestack2;      char *doublestack, *doublestack2;
     object *ob, *tmp, *oldsnow, *topfloor;      object *ob, *tmp, *oldsnow, *topfloor;
     archetype *at;      archetype *at;
   
     for (x=0; x < settings.worldmaptilesizex; x++) {      for (nx=0; nx < settings.worldmaptilesizex; nx++) {
  for (y=0; y < settings.worldmaptilesizey; y++) {   for (ny=0; ny < settings.worldmaptilesizey; ny++) {
      (void)worldmap_to_weathermap(x, y, &wx, &wy, /*filename*/ m);       /* jitter factor */
        if (rndm(0, 2) > 0) {
    x=y=d=-1;
    while (OUT_OF_REAL_MAP(m, x, y)) {
        d++;
        j=rndm(1, 8);
        x = nx + freearr_x[j] * (rndm(0, 1) + rndm(0, 1) + rndm (0, 1) +1);
        y = ny + freearr_y[j] * (rndm(0, 1) + rndm(0, 1) + rndm (0, 1) +1);
        if (d > 15) {
    x = nx;
    y = ny;
        }
    }
        } else {
    x = nx;
    y = ny;
        }
        /* we use the unjittered coordinates */
        (void)worldmap_to_weathermap(nx, ny, &wx, &wy, /*filename*/ m);
      ob = NULL;       ob = NULL;
      at = NULL;       at = NULL;
      /* this will definately need tuning */       /* this will definately need tuning */
Line 1664
 
Line 1682
 void singing_in_the_rain(mapstruct *m, int wx, int wy, char *filename)  void singing_in_the_rain(mapstruct *m, int wx, int wy, char *filename)
 {  {
     int x, y, i;      int x, y, i;
       int nx, ny, d, j;
     int avoid, two, temp, sky, gotsnow, found, nodstk;      int avoid, two, temp, sky, gotsnow, found, nodstk;
     object *ob, *tmp, *oldsnow, *topfloor;      object *ob, *tmp, *oldsnow, *topfloor;
     char *doublestack, *doublestack2;      char *doublestack, *doublestack2;
     archetype *at;      archetype *at;
   
     for (x=0; x < settings.worldmaptilesizex; x++) {      for (nx=0; nx < settings.worldmaptilesizex; nx++) {
  for (y=0; y < settings.worldmaptilesizey; y++) {   for (ny=0; ny < settings.worldmaptilesizey; ny++) {
      (void)worldmap_to_weathermap(x, y, &wx, &wy, /*filename*/m);       /* jitter factor */
        if (rndm(0, 2) > 0) {
    x=y=d=-1;
    while (OUT_OF_REAL_MAP(m, x, y)) {
        d++;
        j=rndm(1, 8);
        x = nx + freearr_x[j] * (rndm(0, 1) + rndm(0, 1) + rndm (0, 1) +1);
        y = ny + freearr_y[j] * (rndm(0, 1) + rndm(0, 1) + rndm (0, 1) +1);
        if (d > 15) {
    x = nx;
    y = ny;
        }
    }
        } else {
    x = nx;
    y = ny;
        }
        /* we use the unjittered coordinates */
        (void)worldmap_to_weathermap(nx, ny, &wx, &wy, /*filename*/m);
      ob = NULL;       ob = NULL;
      at = NULL;       at = NULL;
      avoid = 0;       avoid = 0;
Line 1964
 
Line 2001
 void change_the_world(mapstruct *m, int wx, int wy, char *filename)  void change_the_world(mapstruct *m, int wx, int wy, char *filename)
 {  {
     int x, y, i;      int x, y, i;
       int nx, ny, j, d;
     int avoid, two, temp, sky, gotsnow, found, days;      int avoid, two, temp, sky, gotsnow, found, days;
     object *ob, *tmp, *doublestack;      object *ob, *tmp, *doublestack;
     archetype *at, *dat;      archetype *at, *dat;
   
     days = todtick / HOURS_PER_DAY;      days = todtick / HOURS_PER_DAY;
     for (x=0; x < settings.worldmaptilesizex; x++) {      for (nx=0; nx < settings.worldmaptilesizex; nx++) {
  for (y=0; y < settings.worldmaptilesizey; y++) {   for (ny=0; ny < settings.worldmaptilesizey; ny++) {
      (void)worldmap_to_weathermap(x, y, &wx, &wy, /*filename*/m);       /* jitter factor */
        if (rndm(0, 2) > 0) {
    x=y=d=-1;
    while (OUT_OF_REAL_MAP(m, x, y)) {
        d++;
        j=rndm(1, 8);
        x = nx + freearr_x[j] * (rndm(0, 1) + rndm(0, 1) + rndm (0, 1) +1);
        y = ny + freearr_y[j] * (rndm(0, 1) + rndm(0, 1) + rndm (0, 1) +1);
        if (d > 15) {
    x = nx;
    y = ny;
        }
    }
        } else {
    x = nx;
    y = ny;
        }
        /* we use the unjittered coordinates */
        (void)worldmap_to_weathermap(nx, ny, &wx, &wy, /*filename*/m);
      ob = NULL;       ob = NULL;
      at = NULL;       at = NULL;
      dat = NULL;       dat = NULL;
Line 2935
 
Line 2991
  for (x=0; x < WEATHERMAPTILESX; x++) {   for (x=0; x < WEATHERMAPTILESX; x++) {
      uint32 dir = skies[weathermap[x][y].sky];       uint32 dir = skies[weathermap[x][y].sky];
      pixels[3 * x + (0 * WEATHERMAPTILESX * 3 + BLUE)]  = (uint8) ((weathermap[x][y].humid - min[6]) * scale[6]);       pixels[3 * x + (0 * WEATHERMAPTILESX * 3 + BLUE)]  = (uint8) ((weathermap[x][y].humid - min[6]) * scale[6]);
      pixels[3 * x + (1 * WEATHERMAPTILESX * 3 + RED)]   = (uint8) ((real_temp[x][y]  - min[7]) * scale[7]);       /*pixels[3 * x + (1 * WEATHERMAPTILESX * 3 + RED)]   = (uint8) ((real_temp[x][y]  - min[7]) * scale[7]);*/
        pixels[3 * x + (1 * WEATHERMAPTILESX * 3 + RED)]   = 1;
      pixels[3 * x + (2 * WEATHERMAPTILESX * 3 + RED)]   = (uint8) ((dir & 0x00FF0000) >> 16);       pixels[3 * x + (2 * WEATHERMAPTILESX * 3 + RED)]   = (uint8) ((dir & 0x00FF0000) >> 16);
      pixels[3 * x + (2 * WEATHERMAPTILESX * 3 + GREEN)] = (uint8) ((dir & 0x0000FF00) >> 8);       pixels[3 * x + (2 * WEATHERMAPTILESX * 3 + GREEN)] = (uint8) ((dir & 0x0000FF00) >> 8);
      pixels[3 * x + (2 * WEATHERMAPTILESX * 3 + BLUE)]  = (uint8) ((dir & 0x000000FF));       pixels[3 * x + (2 * WEATHERMAPTILESX * 3 + BLUE)]  = (uint8) ((dir & 0x000000FF));

Legend:
line(s) removed in v.1.32 
line(s) changed
 line(s) added in v.1.33
File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:53