[wpdev-commits] wolfpack/python char.cpp,1.193,1.194

[Richard M. <dr...@us...>]

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

Modified Files:
	char.cpp 
Log Message:
Conversion warning fix.


Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -C2 -d -r1.193 -r1.194
*** char.cpp	16 Sep 2004 01:40:19 -0000	1.193
--- char.cpp	18 Sep 2004 18:41:55 -0000	1.194
***************
*** 161,165 ****
  		wpChar* returnVal = PyObject_New( wpChar, &wpCharType );
  		returnVal->pChar = pChar;
! 	
  		returnVal->py_account	= NULL;
  		returnVal->py_region		= NULL;
--- 161,165 ----
  		wpChar* returnVal = PyObject_New( wpChar, &wpCharType );
  		returnVal->pChar = pChar;
! 
  		returnVal->py_account	= NULL;
  		returnVal->py_region		= NULL;
***************
*** 168,172 ****
  		returnVal->py_skillcap	= NULL;
  		returnVal->py_skilllock	= NULL;
! 	
  		return ( PyObject * ) returnVal;
  	}
--- 168,172 ----
  		returnVal->py_skillcap	= NULL;
  		returnVal->py_skilllock	= NULL;
! 
  		return ( PyObject * ) returnVal;
  	}
***************
*** 2035,2039 ****
  
  		if (pItem) {
! 			pItem = pItem->getOutmostItem();	
  
  			if (pItem->container() && pItem->container()->isChar()) {
--- 2035,2039 ----
  
  		if (pItem) {
! 			pItem = pItem->getOutmostItem();
  
  			if (pItem->container() && pItem->container()->isChar()) {
***************
*** 2047,2051 ****
  					Py_RETURN_FALSE;
  				}
! 				
  				targetPos = pItem->pos().losItemPoint(pItem->id());
  			}
--- 2047,2051 ----
  					Py_RETURN_FALSE;
  				}
! 
  				targetPos = pItem->pos().losItemPoint(pItem->id());
  			}
***************
*** 2078,2082 ****
  	}
  
! 	if (pos.distance(targetPos) > range) {
  		Py_RETURN_FALSE;
  	}
--- 2078,2082 ----
  	}
  
! 	if ( (int)pos.distance(targetPos) > range ) {
  		Py_RETURN_FALSE;
  	}
***************
*** 2840,2844 ****
  	else if ( PyFloat_Check( value ) )
  		val = cVariant( PyFloat_AsDouble( value ) );
! 	else if ( value == Py_True ) 
  		val = cVariant( 1 ); // True
  	else if ( value == Py_False )
--- 2840,2844 ----
  	else if ( PyFloat_Check( value ) )
  		val = cVariant( PyFloat_AsDouble( value ) );
! 	else if ( value == Py_True )
  		val = cVariant( 1 ); // True
  	else if ( value == Py_False )
***************
*** 2853,2857 ****
  	}
  
!     return 0;	
  }
  
--- 2853,2857 ----
  	}
  
!     return 0;
  }