[Evolution-commits] CVS: evolutionlejeu/Evolution/Ploutos EcoProvince.cpp,1.19,1.20 EcoSquare.cpp,1.3,1.4 EcoSquare.h,1.3,1.4 SquareActivitySector.cpp,1.2,1.3 SquareActivitySector.h,1.2,1.3

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

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

Modified Files:
	EcoProvince.cpp EcoSquare.cpp EcoSquare.h 
	SquareActivitySector.cpp SquareActivitySector.h 
Log Message:
CHG : All list & vector are cleared before beiing loaded
FIX : Misses in save/load of some classes

Index: EcoProvince.cpp
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Ploutos/EcoProvince.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** EcoProvince.cpp	15 Dec 2005 15:03:37 -0000	1.19
--- EcoProvince.cpp	16 Dec 2005 16:43:22 -0000	1.20
***************
*** 164,171 ****
  void EcoProvince::FromXml( XmlNode xmlParent )
  {
- 	m_lstActivitySectors.clear();
- 	m_production.clear();
- 	m_stocks.clear();
- 
  	XmlNode xmlObj = xmlParent.GetChild( "EcoProvince" );
  
--- 164,167 ----

Index: EcoSquare.cpp
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Ploutos/EcoSquare.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EcoSquare.cpp	15 Dec 2005 17:11:51 -0000	1.3
--- EcoSquare.cpp	16 Dec 2005 16:43:23 -0000	1.4
***************
*** 65,66 ****
--- 65,78 ----
  	return result;
  }
+ 
+ void EcoSquare::ToXml( XmlNode xmlParent )	const
+ {
+ 	xmlParent.AddToXml( "sectors", m_lstSectors );
+ 	xmlParent.AddToXml( "buildsite", m_lstBuildingSite );
+ }
+ 
+ void EcoSquare::FromXml( XmlNode xmlParent )
+ {
+ 	xmlParent.GetListFromXml( "sectors", & m_lstSectors );
+ 	xmlParent.GetListFromXml( "buildsite", & m_lstBuildingSite );
+ }

Index: EcoSquare.h
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Ploutos/EcoSquare.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EcoSquare.h	15 Dec 2005 17:11:51 -0000	1.3
--- EcoSquare.h	16 Dec 2005 16:43:23 -0000	1.4
***************
*** 23,26 ****
--- 23,30 ----
  	Population GetActivePopulation();
  
+ 	void ToXml( XmlNode xmlParent )	const;
+ 	void FromXml( XmlNode xmlParent );
+ 
+ 
  private:
  

Index: SquareActivitySector.cpp
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Ploutos/SquareActivitySector.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SquareActivitySector.cpp	15 Dec 2005 15:03:37 -0000	1.2
--- SquareActivitySector.cpp	16 Dec 2005 16:43:23 -0000	1.3
***************
*** 36,37 ****
--- 36,49 ----
  	m_size = (ecoSectorSize) iNewSize;
  }
+ 
+ void SquareActivitySector::ToXml( XmlNode xmlParent )	const
+ {
+ 	xmlParent.AddAttribute( "id", m_sector );
+ 	xmlParent.AddAttribute( "size", m_size );
+ }
+ 
+ void SquareActivitySector::FromXml( XmlNode xmlParent )
+ {
+ 	m_sector = (ecoSectorId) xmlParent.GetAttribute( "id" ).ToInt();
+ 	m_size = (ecoSectorSize) xmlParent.GetAttribute( "size" ).ToInt();
+ }

Index: SquareActivitySector.h
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Ploutos/SquareActivitySector.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SquareActivitySector.h	15 Dec 2005 15:03:37 -0000	1.2
--- SquareActivitySector.h	16 Dec 2005 16:43:23 -0000	1.3
***************
*** 24,27 ****
--- 24,30 ----
  	void ModifySize( int iDelta );
  
+ 	void ToXml( XmlNode xmlParent )	const;
+ 	void FromXml( XmlNode xmlParent );
+ 
  private: