[Hgengine-cvs] Mercury/src MercuryODE.cpp,1.97,1.98

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

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

Modified Files:
	MercuryODE.cpp 
Log Message:
tweak ODE on x86_64 and in general to permit class-general settings 
for objects


Index: MercuryODE.cpp
===================================================================
RCS file: /cvsroot/hgengine/Mercury/src/MercuryODE.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** MercuryODE.cpp	6 Dec 2008 02:48:33 -0000	1.97
--- MercuryODE.cpp	8 Feb 2009 20:32:00 -0000	1.98
***************
*** 8,12 ****
  #include "MercuryPoly.h"
  
! #if defined( __APPLE__ ) || defined( MACOSX )
  void dInitODE() { }
  #endif
--- 8,12 ----
  #include "MercuryPoly.h"
  
! #if defined( __APPLE__ ) || defined( MACOSX ) || ( defined( HAVE_ODE_STATIC ) && defined( CPU_X86_64 ) )
  void dInitODE() { }
  #endif
***************
*** 530,534 ****
  
  		MString sName = pINI.GetValueS( sWorldName, ssprintf( "Piece%dName", i+1 ), sInName );
! 		MString sClass = pINI.GetValueS( sWorldName, ssprintf( "Piece%dClass", i+1 ), "MercuryODEObjectLoadable" );
  
  		if ( ToMakeODEs->find( sClass ) == ToMakeODEs->end() )
--- 530,542 ----
  
  		MString sName = pINI.GetValueS( sWorldName, ssprintf( "Piece%dName", i+1 ), sInName );
! 		MString sClass_Specific = pINI.GetValueS( sWorldName, ssprintf( "Piece%dClass", i+1 ), "" );
! 		MString sClass_General  = pINI.GetValueS( sInName, "Class", "" );
! 		MString sClass = "MercuryODEObjectLoadable";
! 
! 		if( sClass_General.size() )
! 			sClass = sClass_Specific;
! 
! 		if( sClass_General.size() )
! 			sClass = sClass_Specific;
  
  		if ( ToMakeODEs->find( sClass ) == ToMakeODEs->end() )