[Evolution-commits] CVS: evolutionlejeu/Evolution/Ploutos EcoSquare.cpp,1.2,1.3 EcoSquare.h,1.2,1.3

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

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

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

Index: EcoSquare.cpp
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Ploutos/EcoSquare.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EcoSquare.cpp	15 Dec 2005 15:03:37 -0000	1.2
--- EcoSquare.cpp	15 Dec 2005 17:11:51 -0000	1.3
***************
*** 49,50 ****
--- 49,66 ----
  	it->ModifySize( pBuildEvent->size );
  }
+ 
+ Population EcoSquare::GetActivePopulation()
+ {
+ 	Population result = 0;
+ 
+ 	std::list<SquareActivitySector>::iterator it;
+ 	FOREACH( it, m_lstSectors )
+ 	{
+ 		const EcoSector& sector = Zeus::Get().GetEcoSector( it->GetSector() );
+ 		result = (Population)( result + (int)sector.GetWorkersNeed() * (int)it->GetSize() );
+ 	}
+ 
+ 	// TODO : population working on building sites
+ 
+ 	return result;
+ }

Index: EcoSquare.h
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Ploutos/EcoSquare.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EcoSquare.h	15 Dec 2005 15:03:37 -0000	1.2
--- EcoSquare.h	15 Dec 2005 17:11:51 -0000	1.3
***************
*** 21,24 ****
--- 21,25 ----
  
  	void OnBuildingSiteComplete( Event *pEvent );
+ 	Population GetActivePopulation();
  
  private: