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

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

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

Modified Files:
	ASpot.cpp SpotOrders.cpp SpotOrders.h 
Log Message:
ADD : Spot returns buildings localisations
ADD : WorldView options

Index: ASpot.cpp
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Agamemnon/ASpot.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ASpot.cpp	15 Dec 2005 17:11:51 -0000	1.16
--- ASpot.cpp	22 Dec 2005 16:35:22 -0000	1.17
***************
*** 195,198 ****
--- 195,204 ----
  					infos.population = ecosquare->GetActivePopulation();
  
+ 					if( m_watchConfig.m_bEcoSquareSwitch )
+ 					{
+ 						infos.lstActivitySector = ecosquare->GetActivitySectorInfos();
+ 					}
+ 
+ 					// Add current province to "list of displayed provinces"
  					if( idProv != INVALID_ID )
  					{

Index: SpotOrders.cpp
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Agamemnon/SpotOrders.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SpotOrders.cpp	23 Jul 2005 23:23:31 -0000	1.7
--- SpotOrders.cpp	22 Dec 2005 16:35:22 -0000	1.8
***************
*** 3,6 ****
--- 3,21 ----
  #include "SpotOrders.h"
  
+ OSpotConfig::OSpotConfig()
+ {
+ 	m_iNbrAltIteration = 1;
+ 
+ 	m_bAltitudeSwitch =true ;
+ 	m_bSquareSwitch =true ;
+ 	m_bEcoSquareSwitch =false ;
+ 	m_bProvinceInfosSwitch =true ;
+ 	m_bArmySwitch =true ;
+ 	m_max_width =1 ;
+ 	m_max_height =1 ;
+ 
+ }
+ 
+ 
  OSpotResult::OSpotResult()
  {

Index: SpotOrders.h
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Agamemnon/SpotOrders.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SpotOrders.h	18 Dec 2005 21:37:03 -0000	1.9
--- SpotOrders.h	22 Dec 2005 16:35:22 -0000	1.10
***************
*** 10,16 ****
--- 10,20 ----
  {
  public:
+ 
+ 	OSpotConfig();
+ 
  	int  m_iNbrAltIteration;		// hi-resol altitude precision (number of iterations)
  	bool m_bAltitudeSwitch;			// the altitude map
  	bool m_bSquareSwitch;			// infos for each square
+ 	bool m_bEcoSquareSwitch;		// economic infos for each square
  	bool m_bProvinceInfosSwitch;	// retrieve basic province informations (name, pop)
  	bool m_bArmySwitch;				// the army in the spot scope
***************
*** 40,43 ****
--- 44,50 ----
  
  		Population population;
+ 
+ 		// Economic detailled infos
+ 		std::list<ActivitySectorInfos> lstActivitySector;
  	};