[wpdev-commits] wolfpack ChangeLog,1.71,1.72 uobject.cpp,1.185,1.186

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

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

Modified Files:
	ChangeLog uobject.cpp 
Log Message:
Fixed a bug with multis.

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -d -r1.185 -r1.186
*** uobject.cpp	16 Sep 2004 18:52:43 -0000	1.185
--- uobject.cpp	21 Sep 2004 07:44:25 -0000	1.186
***************
*** 109,113 ****
  	// Position Changed
  	cMulti* multi = cMulti::find( newpos );
! 	if ( multi_ != multi )
  	{
  		if ( multi_ )
--- 109,114 ----
  	// Position Changed
  	cMulti* multi = cMulti::find( newpos );
! 	// Don't put multis into themselves
! 	if ( multi != this && multi_ != multi )
  	{
  		if ( multi_ )

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** ChangeLog	21 Sep 2004 05:28:04 -0000	1.71
--- ChangeLog	21 Sep 2004 07:44:25 -0000	1.72
***************
*** 44,47 ****
--- 44,48 ----
  	- Added/Changed wolfpack.itembase(def), wolfpack.charbase(def)
  	- Fixed a base definition bug related to property not loading the base definition.
+ 	- Fixed a bug with multis that would be put into themselves if moved.
  
  Wolfpack 12.9.10 Beta (10. September 2004)