[wpdev-commits] wolfpack/python char.cpp,1.190,1.191 item.cpp,1.131,1.132 utilities.h,1.44,1.45

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

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

Modified Files:
	char.cpp item.cpp utilities.h 
Log Message:
fixe-di-fix

Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** item.cpp	10 Sep 2004 04:06:27 -0000	1.131
--- item.cpp	10 Sep 2004 04:10:37 -0000	1.132
***************
*** 119,130 ****
  };
  
- PyObject* PyCreateItemObject( P_ITEM item )
- {
- 	//	wpItem *returnVal = ItemCache::instance()->allocObj( &wpItemType );
- 	wpItem* returnVal = PyObject_New( wpItem, &wpItemType );
- 	returnVal->pItem = item;
- 	return ( PyObject * ) returnVal;
- }
- 
  PyObject* PyGetItemObject( P_ITEM item )
  {
--- 119,122 ----
***************
*** 133,137 ****
  		Py_RETURN_NONE;
  	} else {
! 		return item->getPyObject();
  	}
  }
--- 125,132 ----
  		Py_RETURN_NONE;
  	} else {
! 	//	wpItem *returnVal = ItemCache::instance()->allocObj( &wpItemType );
! 	wpItem* returnVal = PyObject_New( wpItem, &wpItemType );
! 	returnVal->pItem = item;
! 	return ( PyObject * ) returnVal;
  	}
  }

Index: utilities.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/utilities.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** utilities.h	10 Sep 2004 04:06:27 -0000	1.44
--- utilities.h	10 Sep 2004 04:10:37 -0000	1.45
***************
*** 84,88 ****
  bool checkWpItem( PyObject* object );
  PyObject* PyGetItemObject( P_ITEM );
- PyObject* PyCreateItemObject( P_ITEM );
  P_ITEM getWpItem( PyObject* );
  int PyConvertItem( PyObject*, P_ITEM* item );
--- 84,87 ----
***************
*** 92,96 ****
  bool checkWpChar( PyObject* object );
  PyObject* PyGetCharObject( P_CHAR );
- PyObject* PyCreateCharObject( P_CHAR );
  P_CHAR getWpChar( PyObject* );
  int PyConvertChar( PyObject* object, P_CHAR* character );
--- 91,94 ----

Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.190
retrieving revision 1.191
diff -C2 -d -r1.190 -r1.191
*** char.cpp	10 Sep 2004 04:06:27 -0000	1.190
--- char.cpp	10 Sep 2004 04:10:36 -0000	1.191
***************
*** 151,171 ****
  };
  
- // I N T E R N A L
- PyObject *PyCreateCharObject( P_CHAR pChar )
- {
- 	//	wpChar *returnVal = CharCache::instance()->allocObj( &wpCharType );
- 	wpChar* returnVal = PyObject_New( wpChar, &wpCharType );
- 	returnVal->pChar = pChar;
- 
- 	returnVal->py_account	= NULL;
- 	returnVal->py_region		= NULL;
- 	returnVal->py_socket		= NULL;
- 	returnVal->py_skill		= NULL;
- 	returnVal->py_skillcap	= NULL;
- 	returnVal->py_skilllock	= NULL;
- 
- 	return ( PyObject * ) returnVal;
- }
- 
  PyObject* PyGetCharObject( P_CHAR pChar )
  {
--- 151,154 ----
***************
*** 174,178 ****
  		Py_RETURN_NONE;
  	} else {
! 		return pChar->getPyObject();
  	}
  }
--- 157,172 ----
  		Py_RETURN_NONE;
  	} else {
! 		//	wpChar *returnVal = CharCache::instance()->allocObj( &wpCharType );
! 		wpChar* returnVal = PyObject_New( wpChar, &wpCharType );
! 		returnVal->pChar = pChar;
! 	
! 		returnVal->py_account	= NULL;
! 		returnVal->py_region		= NULL;
! 		returnVal->py_socket		= NULL;
! 		returnVal->py_skill		= NULL;
! 		returnVal->py_skillcap	= NULL;
! 		returnVal->py_skilllock	= NULL;
! 	
! 		return ( PyObject * ) returnVal;
  	}
  }