[Hgengine-cvs] Mercury/src BetaBetaMari.cpp,1.27,1.28

[Charles L. <cn...@us...>]

Update of /cvsroot/hgengine/Mercury/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4319

Modified Files:
	BetaBetaMari.cpp 
Log Message:
fix "pow" ambiguity on Windows

Index: BetaBetaMari.cpp
===================================================================
RCS file: /cvsroot/hgengine/Mercury/src/BetaBetaMari.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** BetaBetaMari.cpp	22 Apr 2009 06:01:33 -0000	1.27
--- BetaBetaMari.cpp	22 Apr 2009 06:42:24 -0000	1.28
***************
*** 40,44 ****
  
  		//Generate the new ball collision object
! 		m_pSph = dCreateSphere( m_oSpace, pow( fMariSize, 0.56)*1.1+1 );
  		dGeomSetData( m_pSph, this );
  		dGeomSetBody( m_pSph, m_oBody );
--- 40,44 ----
  
  		//Generate the new ball collision object
! 		m_pSph = dCreateSphere( m_oSpace, pow( fMariSize, 0.56f)*1.1f+1 );
  		dGeomSetData( m_pSph, this );
  		dGeomSetBody( m_pSph, m_oBody );
***************
*** 48,52 ****
  	{
  		//Generate the ball itself, and attach it to the local space
! 		m_pSph = dCreateSphere( m_oSpace, pow( fMariSize, 0.56 )+1 );
  		dGeomSetBody( m_pSph, m_oBody );
  		dGeomSetData( m_pSph, this );
--- 48,52 ----
  	{
  		//Generate the ball itself, and attach it to the local space
! 		m_pSph = dCreateSphere( m_oSpace, pow( fMariSize, 0.56f )+1 );
  		dGeomSetBody( m_pSph, m_oBody );
  		dGeomSetData( m_pSph, this );
***************
*** 184,188 ****
  //		LOG.Log( ssprintf( "minsize: %f", pow( fMariSize, 0.56 ) / 2.9 ) );
  	//Make sure we're allowed to suck it up
! 	if (  fSizeHit == 0 || fSizeHit > pow( fMariSize, 0.56 ) / 2.9 )
  		return true;
  
--- 184,188 ----
  //		LOG.Log( ssprintf( "minsize: %f", pow( fMariSize, 0.56 ) / 2.9 ) );
  	//Make sure we're allowed to suck it up
! 	if (  fSizeHit == 0 || fSizeHit > pow( fMariSize, 0.56f ) / 2.9f )
  		return true;