[wpdev-commits] wolfpack/python global.cpp,1.135,1.136 tempeffect.h,1.22,1.23

[Thiago A C. <thi...@us...>]

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

Modified Files:
	global.cpp tempeffect.h 
Log Message:
Should fix some bugs related to loading items from inside containers introduced by the change in INVALID_SERIAL

Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** global.cpp	29 Jun 2004 11:36:41 -0000	1.135
--- global.cpp	2 Jul 2004 06:01:32 -0000	1.136
***************
*** 1664,1669 ****
  	{ "callevent",			wpCallEvent,					METH_VARARGS, "Call an event in a script and return the result." },
  	{ "hasevent",			wpHasEvent,						METH_VARARGS, "If the given script has the given event. Return true." },
! 	{ "callnamedevent",		wpCallEvent,					METH_VARARGS, "Call an event in a script and return the result." },
! 	{ "hasnamedevent",		wpHasEvent,						METH_VARARGS, "If the given script has the given event. Return true." },
  	{ "getdefinition",		wpGetDefinition,				METH_VARARGS, "Gets a certain definition by it's id." },
  	{ "getdefinitions",		wpGetDefinitions,				METH_VARARGS, "Gets all definitions by type." },
--- 1664,1669 ----
  	{ "callevent",			wpCallEvent,					METH_VARARGS, "Call an event in a script and return the result." },
  	{ "hasevent",			wpHasEvent,						METH_VARARGS, "If the given script has the given event. Return true." },
! 	{ "callnamedevent",		wpCallNamedEvent,				METH_VARARGS, "Call an event in a script and return the result." },
! 	{ "hasnamedevent",		wpHasNamedEvent,				METH_VARARGS, "If the given script has the given event. Return true." },
  	{ "getdefinition",		wpGetDefinition,				METH_VARARGS, "Gets a certain definition by it's id." },
  	{ "getdefinitions",		wpGetDefinitions,				METH_VARARGS, "Gets all definitions by type." },
***************
*** 2170,2173 ****
--- 2170,2174 ----
  static PyObject* wpDriver( PyObject* self, PyObject* args )
  {
+ 	Q_UNUSED(self);
  	Q_UNUSED( args );
  	unsigned int database;

Index: tempeffect.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/tempeffect.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tempeffect.h	2 Jun 2004 19:13:14 -0000	1.22
--- tempeffect.h	2 Jul 2004 06:01:33 -0000	1.23
***************
*** 80,84 ****
  	}
  
! 	void Dispel( P_CHAR pSource, bool silent )
  	{
  		// We will ignore silent here.
--- 80,84 ----
  	}
  
! 	void Dispel( P_CHAR pSource, bool /*silent*/ )
  	{
  		// We will ignore silent here.