[Crossfire-cvs] CVS commit: crossfire/server

[<cro...@li...>]

Module Name:	crossfire
Committed By:	temitchell
Date:		Sun Mar 30 16:40:22 UTC 2003

Modified Files:
	crossfire/server: weather.c

Log Message:
added one more groundtype to the weather code:



Start of context diffs


Index: crossfire/server/weather.c
diff -c crossfire/server/weather.c:1.29 crossfire/server/weather.c:1.30
*** crossfire/server/weather.c:1.29	Tue Feb 25 07:08:03 2003
--- crossfire/server/weather.c	Sun Mar 30 08:40:20 2003
***************
*** 1,6 ****
  /*
   * static char *rcsid_weather_c =
!  *   "$Id: weather.c,v 1.29 2003/02/25 15:08:03 garbled Exp $";
   */
  /*
      CrossFire, A Multiplayer game for X-windows
--- 1,6 ----
  /*
   * static char *rcsid_weather_c =
!  *   "$Id: weather.c,v 1.30 2003/03/30 16:40:20 temitchell Exp $";
   */
  /*
      CrossFire, A Multiplayer game for X-windows
***************
*** 75,89 ****
      {"snow2", 1},
      {"snow4", 1},
      {"snow5", 1},
! 	{"mountain1_snow", 1},
! 	{"mountain2_snow", 1},	
      {"rain1", 1},
      {"rain2", 1},
      {"rain3", 1},
      {"rain4", 1},
      {"rain5", 1},
! 	{"mountain1_rivlets", 1},
! 	{"mountain2_rivlets", 1},
      {"drifts", 0},
      {"glacier", 0},
      {"cforest1", 0},
--- 75,89 ----
      {"snow2", 1},
      {"snow4", 1},
      {"snow5", 1},
!     {"mountain1_snow", 1},
!     {"mountain2_snow", 1},	
      {"rain1", 1},
      {"rain2", 1},
      {"rain3", 1},
      {"rain4", 1},
      {"rain5", 1},
!     {"mountain1_rivlets", 1},
!     {"mountain2_rivlets", 1},
      {"drifts", 0},
      {"glacier", 0},
      {"cforest1", 0},
***************
*** 135,140 ****
--- 135,141 ----
      {"impossible_match2", "snow4", NULL, 0}, /* placeholders */
      {"impossible_match3", "snow3", NULL, 0},
      {"hills", "drifts", NULL, 0},
+     {"treed_hills", "drifts", "woods5", 1},
      {"grass", "snow", NULL, 0},
      {"sand", "snow", NULL, 0},
      {"stones", "snow2", NULL, 0},
***************
*** 176,182 ****
      {"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},
      {"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}
  };
  
--- 177,183 ----
      {"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},
      {"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}
  };