[wpdev-commits] wolfpack ChangeLog,1.33,1.34 uobject.cpp,1.182,1.183

[Sebastian H. <dar...@us...>]

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

Modified Files:
	ChangeLog uobject.cpp 
Log Message:
Fixes for setserial

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.182
retrieving revision 1.183
diff -C2 -d -r1.182 -r1.183
*** uobject.cpp	27 Aug 2004 14:41:16 -0000	1.182
--- uobject.cpp	6 Sep 2004 17:36:13 -0000	1.183
***************
*** 711,715 ****
  	changed_ = true;	
  	// \rproperty object.serial This integer property contains the serial for this object.
! 	SET_INT_PROPERTY( "serial", serial_ )
  
  	// \property object.free This boolean property indicates that the object has been freed and is awaiting deletion.
--- 711,721 ----
  	changed_ = true;	
  	// \rproperty object.serial This integer property contains the serial for this object.
! 	if (name == "serial") {
! 		if (!value.canCast(cVariant::Int)) {
! 			PROPERTY_ERROR( -3, QString( "Invalid integer value: '%1'" ).arg( value.toString() ) );
! 		}
! 		setSerial(value.toInt());
! 		return 0;
! 	}
  
  	// \property object.free This boolean property indicates that the object has been freed and is awaiting deletion.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ChangeLog	5 Sep 2004 21:54:07 -0000	1.33
--- ChangeLog	6 Sep 2004 17:36:13 -0000	1.34
***************
*** 16,19 ****
--- 16,21 ----
  	  accessed via the methods getstrproperty, getintproperty, hasstrproperty,
  	  hasintproperty from items and chars.
+ 	- Serials of objects can now be correctly changed via the script interface.
+ 	  But be careful not to create two objects with the same serial.
  	- Fixed contextmenus to use <scripts></scripts>, this was missed.