[wpdev-commits] wolfpack/python pycontent.h,NONE,1.1 item.cpp,1.140,1.141 pyai.cpp,1.10,1.11 content.h,1.18,NONE

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

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

Modified Files:
	item.cpp pyai.cpp 
Added Files:
	pycontent.h 
Removed Files:
	content.h 
Log Message:
Container content changes

--- content.h DELETED ---

Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** item.cpp	29 Oct 2004 23:44:05 -0000	1.140
--- item.cpp	2 Nov 2004 20:45:46 -0000	1.141
***************
*** 36,40 ****
  
  #include "utilities.h"
! #include "content.h"
  #include "tempeffect.h"
  #include "objectcache.h"
--- 36,40 ----
  
  #include "utilities.h"
! #include "pycontent.h"
  #include "tempeffect.h"
  #include "objectcache.h"
***************
*** 746,750 ****
  	}
  
! 	return PyInt_FromLong( self->pItem->content().size() );
  }
  
--- 746,750 ----
  	}
  
! 	return PyInt_FromLong( self->pItem->content().count() );
  }
  
***************
*** 1238,1245 ****
  	if ( !strcmp( "content", name ) )
  	{
! 		cItem::ContainerContent content = self->pItem->content();
! 		PyObject* list = PyList_New( content.size() );
! 		for ( uint i = 0; i < content.size(); ++i )
! 			PyList_SetItem( list, i, PyGetItemObject( content[i] ) );
  		return list;
  	}
--- 1238,1246 ----
  	if ( !strcmp( "content", name ) )
  	{
! 		const ContainerContent &content = self->pItem->content();
! 		PyObject* list = PyList_New( content.count() );
! 		unsigned int i = 0;
! 		for (ContainerIterator it(content); !it.atEnd(); ++it)
! 			PyList_SetItem( list, i++, PyGetItemObject( *it ) );
  		return list;
  	}

Index: pyai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/pyai.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pyai.cpp	22 Aug 2004 02:29:52 -0000	1.10
--- pyai.cpp	2 Nov 2004 20:45:47 -0000	1.11
***************
*** 32,38 ****
  #include "../player.h"
  #include "../singleton.h"
  
  #include "utilities.h"
! #include "content.h"
  #include "tempeffect.h"
  #include "objectcache.h"
--- 32,39 ----
  #include "../player.h"
  #include "../singleton.h"
+ #include "../items.h"
  
  #include "utilities.h"
! #include "pycontent.h"
  #include "tempeffect.h"
  #include "objectcache.h"

--- NEW FILE: pycontent.h ---
/*
 *     Wolfpack Emu (WP)
 * UO Server Emulation Program
 *
 * Copyright 2001-2004 by holders identified in AUTHORS.txt
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Palace - Suite 330, Boston, MA 02111-1307, USA.
 *
 * In addition to that license, if you are running this program or modified
 * versions of it on a public system you HAVE TO make the complete source of
 * the version used by you available or provide people with a location to
 * download it.
 *
 * Wolfpack Homepage: http://wpdev.sf.net/
 */

#ifndef __CONTENT_H__
#define __CONTENT_H__

#include "../defines.h"

#include "../content.h"
#include "../items.h"
#include "../world.h"
#include "../basechar.h"
#include "utilities.h"

typedef struct
{
	PyObject_HEAD;
	SERIAL contserial;
} wpContent;

static int wpContent_length( wpContent* self )
{
	P_ITEM pi = FindItemBySerial( self->contserial );
	if ( pi )
		return pi->content().count();
	else
	{
		P_CHAR pc = FindCharBySerial( self->contserial );
		if ( pc )
			return pc->content().size();
	}
	return 0;
}

static PyObject* wpContent_get( wpContent* self, int id )
{
	if ( isCharSerial( self->contserial ) )
	{
		P_CHAR pc = FindCharBySerial( self->contserial );
		if ( !pc )
			goto error;
		cBaseChar::ItemContainer container = pc->content();
		if ( id < 0 || static_cast<uint>( id ) >= container.size() )
			goto error;
		cBaseChar::ItemContainer::const_iterator it( container.begin() );
		/*
			 * Ask Correa before trying to `optimize` this,
			 * there isn't much standard complient options here.
			 */
		for ( int i = 0; i < id && it != container.end(); ++i )
			++it;

		if ( it != container.end() )
			return PyGetItemObject( *it );
		else
			goto error;
	}
	else
	{
		P_ITEM pi = FindItemBySerial( self->contserial );
		if ( !pi )
			goto error;
		const ContainerContent &container = pi->content();
		if ( id < 0 || static_cast<uint>( id ) >= container.count() )
			goto error;

		ContainerIterator it(container);

		if (!it.atEnd())
			return (*it)->getPyObject();
		else
			goto error;
	}
	error:
	Py_RETURN_NONE;
}

static PySequenceMethods wpContentSequence =
{
( inquiry ) wpContent_length,
0,
0,
( intargfunc ) wpContent_get,
0,
0,
0,
0,
0,
0,
};

static PyTypeObject wpContentType =
{
PyObject_HEAD_INIT( NULL )
0,
"wpContent",
sizeof( wpContentType ),
0,
wpDealloc,
0,
0,
0,
0,
0,
0,& wpContentSequence,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
};

#endif