[Evolution-commits] CVS: evolutionlejeu/Evolution/Agamemnon ASpot.cpp,1.15,1.16 SpotOrders.h,1.7,1.8

[Greg <evo...@us...>]

Update of /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Agamemnon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25532/Evolution/Agamemnon

Modified Files:
	ASpot.cpp SpotOrders.h 
Log Message:
ADD : Active population computed in square and returned by ASpot

Index: ASpot.cpp
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Agamemnon/ASpot.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ASpot.cpp	23 Jul 2005 23:23:30 -0000	1.15
--- ASpot.cpp	15 Dec 2005 17:11:51 -0000	1.16
***************
*** 179,182 ****
--- 179,183 ----
  				EvoRef<ISquare> square = pKernel->world.GetISquare( GeoCode( GEOCODE_LOW, lon, lat ) );
  				EvoRef<IGeoSquare> geosquare = square->GetIGeoSquare();
+ 				EvoRef<IEcoSquare> ecosquare = square->GetIEcoSquare();
  				OSpotResult::SquareInfos infos;
  
***************
*** 192,195 ****
--- 193,197 ----
  					infos.temperature = geosquare->GetTemperature();
  					infos.climate = geosquare->GetClimate();
+ 					infos.population = ecosquare->GetActivePopulation();
  
  					if( idProv != INVALID_ID )

Index: SpotOrders.h
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Agamemnon/SpotOrders.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SpotOrders.h	20 Jun 2005 16:47:46 -0000	1.7
--- SpotOrders.h	15 Dec 2005 17:11:51 -0000	1.8
***************
*** 38,41 ****
--- 38,43 ----
  		Temperature temperature;
  		Climate climate;
+ 
+ 		Population population;
  	};