[wpdev-commits] wolfpack uobject.cpp,1.166,1.167 uobject.h,1.98,1.99

[Correa <thi...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32143/wolfpack

Modified Files:
	uobject.cpp uobject.h 
Log Message:
no message

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -C2 -d -r1.166 -r1.167
*** uobject.cpp	15 Jun 2004 02:44:45 -0000	1.166
--- uobject.cpp	15 Jul 2004 02:23:18 -0000	1.167
***************
*** 55,59 ****
  // Library Includes
  
! cUObject::cUObject() : serial_( INVALID_SERIAL ), multi_( 0 ), free( false ), changed_( true ), tooltip_( 0xFFFFFFFF ), name_( QString::null ), scriptChain( 0 ), spawnregion_(0)
  {
  }
--- 55,61 ----
  // Library Includes
  
! cUObject::cUObject() : serial_( INVALID_SERIAL ), multi_( 0 ), free( false ), 
! changed_( true ), tooltip_( 0xFFFFFFFF ), name_( QString::null ), scriptChain( 0 ), 
! spawnregion_(0)
  {
  }
***************
*** 797,800 ****
--- 799,817 ----
  }
  
+ void cUObject::setSpawnregion( cSpawnRegion* spawnregion )
+ {
+ 	if (spawnregion_ && spawnregion_ != spawnregion)
+ 	{
+ 		spawnregion_->remove(this);
+ 	}
+ 
+ 	spawnregion_ = spawnregion;
+ 
+ 	if (spawnregion)
+ 	{
+ 		spawnregion->add(this);
+ 	}
+ }
+ 
  const cVariant& cUObject::getTag( const QString& key ) const
  {

Index: uobject.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** uobject.h	10 Jun 2004 00:27:12 -0000	1.98
--- uobject.h	15 Jul 2004 02:23:18 -0000	1.99
***************
*** 114,118 ****
  	void setEventList( const QString& events );
  	QString eventList() const;
! 	inline cPythonScript** getEvents() {
  		return scriptChain;
  	}
--- 114,119 ----
  	void setEventList( const QString& events );
  	QString eventList() const;
! 	inline cPythonScript** getEvents() 
! 	{
  		return scriptChain;
  	}
***************
*** 183,186 ****
--- 184,188 ----
  		return multi_;
  	}
+ 
  	inline cSpawnRegion* spawnregion() const
  	{
***************
*** 193,204 ****
--- 195,209 ----
  		name_ = d; changed_ = true; changed( TOOLTIP );
  	}
+ 	
  	void setPos( const Coord_cl& d )
  	{
  		pos_ = d;	changed_ = true;
  	}
+ 	
  	virtual void setSerial( SERIAL d )
  	{
  		serial_ = d; changed_ = true;
  	}
+ 	
  	void setTooltip( const UINT32 d )
  	{
***************
*** 209,226 ****
  		multi_ = multi; changed_ = true;
  	}
! 	inline void setSpawnregion( cSpawnRegion* spawnregion )
! 	{
! 		if (spawnregion_ && spawnregion_ != spawnregion)
! 		{
! 			spawnregion_->remove(this);
! 		}
! 
! 		spawnregion_ = spawnregion;
! 
! 		if (spawnregion)
! 		{
! 			spawnregion->add(this);
! 		}
! 	}
      
  	// Definable Methods
--- 214,219 ----
  		multi_ = multi; changed_ = true;
  	}
! 	
! 	void setSpawnregion( cSpawnRegion* spawnregion );
      
  	// Definable Methods