Difference for server/weather.c from version 1.24 to 1.25

version 1.24 version 1.25
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_weather_c =   * static char *rcsid_weather_c =
  *   "$Id: weather.c,v 1.24 2003/01/26 06:00:31 garbled Exp $";   *   "$Id: weather.c,v 1.25 2003/01/28 05:12:35 temitchell Exp $";
  */   */
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
Line 75
 
Line 75
     {"snow2", 1},      {"snow2", 1},
     {"snow4", 1},      {"snow4", 1},
     {"snow5", 1},      {"snow5", 1},
    {"mountain1_snow", 1},
    {"mountain2_snow", 1},
     {"rain1", 1},      {"rain1", 1},
     {"rain2", 1},      {"rain2", 1},
     {"rain3", 1},      {"rain3", 1},
     {"rain4", 1},      {"rain4", 1},
     {"rain5", 1},      {"rain5", 1},
    {"mountain1_rivlets", 1},
    {"mountain2_rivlets", 1},
     {"drifts", 0},      {"drifts", 0},
     {"glacier", 0},      {"glacier", 0},
     {"cforest1", 0},      {"cforest1", 0},
Line 158
 
Line 162
     /* herb, tile, random, rfmin, rfmax, humin, humax, tempmin, tempmax, elevmin, elevmax, season */      /* herb, tile, random, rfmin, rfmax, humin, humax, tempmin, tempmax, elevmin, elevmax, season */
     {"mint", "grass", 10, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 2},      {"mint", "grass", 10, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 2},
     {"rose_red", "grass", 15, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 2},      {"rose_red", "grass", 15, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 2},
    {"rose_red", "hills", 15, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 2},
     {"mint", "brush", 8, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 2},      {"mint", "brush", 8, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 2},
     {"blackroot", "swamp", 15, 1.6, 2.0, 60, 100, 20, 30, -100, 1500, 0},      {"blackroot", "swamp", 15, 1.6, 2.0, 60, 100, 20, 30, -100, 1500, 0},
    {"mushroom_1", "grass", 15, 1.6, 2.0, 60, 100, 3, 30, -100, 1500, 0},
    {"mushroom_2", "grass", 15, 1.6, 2.0, 60, 100, 3, 30, -100, 1500, 0},
    {"mushroom_1", "swamp", 15, 1.6, 2.0, 60, 100, 3, 30, -100, 1500, 0},
    {"mushroom_2", "swamp", 15, 1.6, 2.0, 60, 100, 3, 30, -100, 1500, 0},
    {"mushroom_1", "hills", 15, 1.6, 2.0, 60, 100, 3, 30, -100, 1500, 0},
    {"mushroom_2", "hills", 15, 1.6, 2.0, 60, 100, 3, 30, -100, 1500, 0},
     {"pipeweed", "farmland", 20, 1.0, 2.0, 30, 100, 10, 25, 100, 5000, 0},      {"pipeweed", "farmland", 20, 1.0, 2.0, 30, 100, 10, 25, 100, 5000, 0},
     {"cabbage", "farmland", 10, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 0},      {"cabbage", "farmland", 10, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 0},
     {"onion", "farmland", 10, 1.0, 2.0, 30, 100, 10, 25, 100, 9999, 0},      {"onion", "farmland", 10, 1.0, 2.0, 30, 100, 10, 25, 100, 9999, 0},
     {"carrot", "farmland", 10, 1.0, 2.0, 30, 100, 10, 25, 100, 9999, 0},      {"carrot", "farmland", 10, 1.0, 2.0, 30, 100, 10, 25, 100, 9999, 0},
     {"thorns", "brush", 15, 0.5, 1.3, 30, 100, 10, 25, -100, 9999, 0},      {"thorns", "brush", 15, 0.5, 1.3, 30, 100, 10, 25, -100, 9999, 0},
    {"mountain_foilage", "mountain", 6, 1.0, 2.0, 25, 100, 5, 30, 0, 15999, 2},
     {NULL, NULL, 1, 0.0, 0.0, 0, 0, 0, 0, 0, 0, 0}      {NULL, NULL, 1, 0.0, 0.0, 0, 0, 0, 0, 0, 0, 0}
 };  };
   
Line 1576
 
Line 1588
  continue;   continue;
      oldsnow = avoid_weather(&avoid, m, x, y, &gotsnow, 0);       oldsnow = avoid_weather(&avoid, m, x, y, &gotsnow, 0);
      if (!avoid) {       if (!avoid) {
  if (sky == SKY_LIGHT_RAIN || sky == SKY_RAIN)   if (sky == SKY_LIGHT_RAIN || sky == SKY_RAIN) {
      switch (rndm(0, SKY_HAIL-sky)) {       switch (rndm(0, SKY_HAIL-sky)) {
      case 0: at = find_archetype("rain1"); break;       case 0: at = find_archetype("rain1"); break;
      case 1: at = find_archetype("rain2"); break;       case 1: at = find_archetype("rain2"); break;
      default: at = NULL;       default: at = NULL;
      }       }}
  if (sky >= SKY_HEAVY_RAIN && sky <= SKY_HURRICANE)   if (sky >= SKY_HEAVY_RAIN && sky <= SKY_HURRICANE){
      switch (rndm(0, SKY_HAIL-sky)) {       switch (rndm(0, SKY_HAIL-sky)) {
      case 0: at = find_archetype("rain3"); break;       case 0: at = find_archetype("rain3"); break;
      case 1: at = find_archetype("rain4"); break;       case 1: at = find_archetype("rain4"); break;
      case 2: at = find_archetype("rain5"); break;       case 2: at = find_archetype("rain5"); break;
      default: at = NULL;       default: at = NULL;
      }       }}
      /* the bottom floor of scorn is not IS_FLOOR */       /* the bottom floor of scorn is not IS_FLOOR */
      topfloor=NULL;       topfloor=NULL;
      for (tmp=GET_MAP_OB(m, x, y); tmp;       for (tmp=GET_MAP_OB(m, x, y); tmp;
Line 1693
 
Line 1705
  avoid++;   avoid++;
      else if (!strcmp(tmp->arch->name, "rain5"))       else if (!strcmp(tmp->arch->name, "rain5"))
  avoid++;   avoid++;
    else if (!strcmp(tmp->arch->name, "mountain1_rivlets"))
    avoid++;
    else if (!strcmp(tmp->arch->name, "mountain2_rivlets"))
    avoid++;
      if (avoid) {       if (avoid) {
  remove_ob(tmp);   remove_ob(tmp);
  free_object(tmp);   free_object(tmp);

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