[wpdev-commits] wolfpack basechar.cpp,1.46,1.47 coord.cpp,1.28,1.29 coord.h,1.14,1.15 uobject.cpp,1.117,1.118 uobject.h,1.76,1.77 walking.cpp,1.92,1.93 world.cpp,1.47,1.48

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

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv14446

Modified Files:
	basechar.cpp coord.cpp coord.h uobject.cpp uobject.h 
	walking.cpp world.cpp 
Log Message:
Encryption Fixes for Linux and 
some Python Fixes / Additions.

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** basechar.cpp	23 Sep 2003 12:40:17 -0000	1.46
--- basechar.cpp	30 Sep 2003 15:06:29 -0000	1.47
***************
*** 1687,1690 ****
--- 1687,1713 ----
  void cBaseChar::bark( enBark type )
  {
+ 	if( bodyID() == 0x190 || bodyID() == 0x192 )
+ 	{
+ 		if( type == Bark_GetHit )
+ 		{
+ 			unsigned short sound = hex2dec( DefManager->getRandomListEntry( "SOUNDS_COMBAT_HIT_HUMAN_MALE" ) ).toUShort();
+ 
+ 			if( sound > 0 )
+ 				soundEffect( sound );
+ 			else
+ 				soundEffect( 0x156 );
+ 
+ 			return;
+ 		}
+ 	}
+ 	else if( bodyID() == 0x191 || bodyID() == 0x193 )
+ 	{
+ 		unsigned short sound = hex2dec( DefManager->getRandomListEntry( "SOUNDS_COMBAT_HIT_HUMAN_FEMALE" ) ).toUShort();
+ 		if( sound > 0 )
+ 			soundEffect( sound );
+ 		else
+ 			soundEffect( 0x14b );
+ 	}
+ 
  	cCharBaseDef *basedef = BaseDefManager::instance()->getCharBaseDef( bodyID_ );
  

Index: coord.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/coord.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** coord.cpp	17 Sep 2003 19:15:34 -0000	1.28
--- coord.cpp	30 Sep 2003 15:06:29 -0000	1.29
***************
*** 49,52 ****
--- 49,54 ----
  #include <set>
  
+ Coord_cl Coord_cl::null( 0xFFFF, 0xFFFF, 0xFF, 0xFF );
+ 
  Coord_cl::Coord_cl(void)
  {
***************
*** 122,143 ****
  {
  	return Coord_cl(this->x - src.x, this->y - src.y, this->z - src.z, this->map );
- }
- 
- void Coord_cl::lightning( UINT8 speed, UINT8 duration, UINT16 hue, UINT16 renderMode )
- {
- 	cUOTxEffect effect;
- 	effect.setType( ET_LIGHTNING );
- 	effect.setSourcePos( (*this) );
-     effect.setSpeed( speed );
- 	effect.setDuration( duration );
- 	effect.setHue( hue );
- 	effect.setRenderMode( renderMode );
- 
- 	cUOSocket *mSock = 0;
- 	for( mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() )
- 	{
- 		if( mSock->player() && ( mSock->player()->pos().distance( (*this) ) <= mSock->player()->visualRange() ) )
- 			mSock->send( &effect );
- 	}
  }
  
--- 124,127 ----

Index: coord.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/coord.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** coord.h	3 Sep 2003 14:44:21 -0000	1.14
--- coord.h	30 Sep 2003 15:06:29 -0000	1.15
***************
*** 67,74 ****
  	void effect( UI16 id, UI08 speed = 10, UI08 duration = 5, UI16 hue = 0, UI16 renderMode = 0 );
  	
! 	/*!
! 		Displays a lightning bolt at this position.
! 	*/
! 	void lightning( UI08 speed = 10, UI08 duration = 5, UI16 hue = 0, UI16 renderMode = 0 );
  
  public:
--- 67,71 ----
  	void effect( UI16 id, UI08 speed = 10, UI08 duration = 5, UI16 hue = 0, UI16 renderMode = 0 );
  	
! 	static Coord_cl null;
  
  public:

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** uobject.cpp	23 Sep 2003 23:55:24 -0000	1.117
--- uobject.cpp	30 Sep 2003 15:06:29 -0000	1.118
***************
*** 498,501 ****
--- 498,518 ----
  }
  
+ void cUObject::lightning( unsigned short hue )
+ {
+ 	cUOTxEffect effect;
+ 	effect.setType( ET_LIGHTNING );
+ 	effect.setSource( serial_ );
+ 	effect.setSourcePos( pos_ );
+ 	effect.setTargetPos( pos_ );
+ 	effect.setHue( hue );
+ 
+ 	cUOSocket *mSock = 0;
+ 	for( mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() )
+ 	{
+ 		if( mSock->player() && dist( mSock->player() ) < mSock->player()->visualRange() )
+ 			mSock->send( &effect );
+ 	}
+ }
+ 
  /*!
  	Displays an effect emitting from this object toward another item or character
***************
*** 714,715 ****
--- 731,733 ----
  	return tags_.getKeys();
  }
+ 

Index: uobject.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** uobject.h	23 Sep 2003 23:55:24 -0000	1.76
--- uobject.h	30 Sep 2003 15:06:29 -0000	1.77
***************
*** 131,134 ****
--- 131,135 ----
  	void effect( UINT16 id, cUObject *target, bool fixedDirection = true, bool explodes = false, UINT8 speed = 10, UINT16 hue = 0, UINT16 renderMode = 0 );
  	void effect( UINT16 id, const Coord_cl &target, bool fixedDirection = true, bool explodes = false, UINT8 speed = 10, UINT16 hue = 0, UINT16 renderMode = 0 );
+ 	void lightning( unsigned short hue = 0 );
  
  	// Events

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** walking.cpp	20 Sep 2003 01:30:45 -0000	1.92
--- walking.cpp	30 Sep 2003 15:06:29 -0000	1.93
***************
*** 376,380 ****
  		{
  			if( handleItemCollision( pChar, pItem ) )
! 			break;
  		}
  
--- 376,380 ----
  		{
  			if( handleItemCollision( pChar, pItem ) )
! 				break;
  		}
  

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** world.cpp	23 Sep 2003 11:53:31 -0000	1.47
--- world.cpp	30 Sep 2003 15:06:29 -0000	1.48
***************
*** 530,534 ****
  			if( pCont )
  			{
! 				pCont->addItem( pi, false, false, true );
  			}
  			else
--- 530,534 ----
  			if( pCont )
  			{
! 				pCont->addItem( pi, false, true, true );
  			}
  			else
***************
*** 547,551 ****
  				// NoRemove is important. 
  				// It is faster *and* it prevents onEquip from being fired
! 				pCont->addItem( (cBaseChar::enLayer)pi->layer(), pi, false, true );
  			}
  			else
--- 547,551 ----
  				// NoRemove is important. 
  				// It is faster *and* it prevents onEquip from being fired
! 				pCont->addItem( (cBaseChar::enLayer)pi->layer(), pi, true, true );
  			}
  			else