[wpdev-commits] wolfpack items.cpp,1.424,1.425 items.h,1.204,1.205

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

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

Modified Files:
	items.cpp items.h 
Log Message:
item.magic is now item.movable

Index: items.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.h,v
retrieving revision 1.204
retrieving revision 1.205
diff -C2 -d -r1.204 -r1.205
*** items.h	5 Jul 2004 18:23:12 -0000	1.204
--- items.h	19 Jul 2004 23:19:11 -0000	1.205
***************
*** 359,366 ****
  	{
  		maxhp_ = nValue; flagChanged(); changed( TOOLTIP );
! 	};
  	void setNewbie( bool nValue )
  	{
! 		( nValue ) ? priv_ |= 0x02 : priv_ &= 0xFD; flagChanged(); changed( TOOLTIP );
  	}
  	void setUnprocessed( bool nValue )
--- 359,366 ----
  	{
  		maxhp_ = nValue; flagChanged(); changed( TOOLTIP );
! 	}
  	void setNewbie( bool nValue )
  	{
! 		( nValue ) ? priv_ |= 0x02 : priv_ &= ~0x02; flagChanged(); changed( TOOLTIP );
  	}
  	void setUnprocessed( bool nValue )

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.424
retrieving revision 1.425
diff -C2 -d -r1.424 -r1.425
*** items.cpp	19 Jul 2004 21:58:28 -0000	1.424
--- items.cpp	19 Jul 2004 23:19:11 -0000	1.425
***************
*** 1866,1870 ****
  
  		/*
! 		\property item.magic The movable permission for the object.
  		Values:
  		<code>0 - Tiledata default
--- 1866,1870 ----
  
  		/*
! 		\property item.movable The movable permission for the object.
  		Values:
  		<code>0 - Tiledata default
***************
*** 1875,1879 ****
  		*/
  	else
! 		SET_INT_PROPERTY( "magic", magic_ )
  
  		// Flags
--- 1875,1879 ----
  		*/
  	else
! 		SET_INT_PROPERTY( "movable", magic_ )
  
  		// Flags
***************
*** 2064,2068 ****
  		GET_PROPERTY( "ownervisible", visible_ == 1 ? 1 : 0 )
  	else
! 		GET_PROPERTY( "magic", magic_ )
  
  		// Flags
--- 2064,2068 ----
  		GET_PROPERTY( "ownervisible", visible_ == 1 ? 1 : 0 )
  	else
! 		GET_PROPERTY( "movable", magic_ )
  
  		// Flags