[wpdev-commits] wolfpack uobject.cpp,1.177,1.178

[Jorge P. <ke...@us...>]

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

Modified Files:
	uobject.cpp 
Log Message:
Changed removeEvent() so that it will only set the changed_ flag if something i s actually changed. Fixed the attach hook not being triggered if there was only one event.



Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -d -r1.177 -r1.178
*** uobject.cpp	22 Aug 2004 02:29:51 -0000	1.177
--- uobject.cpp	24 Aug 2004 19:11:44 -0000	1.178
***************
*** 383,389 ****
  	}
  
  	cPythonScript* event = 0;
  
! 	if ( scriptChain && hasEvent( name ) )
  	{
  		unsigned int count = reinterpret_cast<unsigned int>( scriptChain[0] );
--- 383,394 ----
  	}
  
+ 	if ( !hasEvent( event->name() ) )
+ 	{
+ 		return;
+ 	}
+ 
  	cPythonScript* event = 0;
  
! 	if ( scriptChain )
  	{
  		unsigned int count = reinterpret_cast<unsigned int>( scriptChain[0] );
***************
*** 391,394 ****
--- 396,400 ----
  		if ( count == 1 )
  		{
+ 			event = scriptChain[1];
  			clearEvents();
  		}