[wpdev-commits] wolfpack/python char.cpp,1.179,1.180 item.cpp,1.121,1.122 skills.h,1.22,1.23 target.h,1.18,1.19

[Correa <thi...@us...>]

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

Modified Files:
	char.cpp item.cpp skills.h target.h 
Log Message:
QT_CLEAN_NAMESPACE

Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** item.cpp	19 Aug 2004 01:22:57 -0000	1.121
--- item.cpp	19 Aug 2004 01:55:58 -0000	1.122
***************
*** 340,344 ****
  
  	Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! 	INT16 color = -1;
  
  	if ( PyTuple_Size( args ) > 1 && PyInt_Check( PyTuple_GetItem( args, 1 ) ) )
--- 340,344 ----
  
  	Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! 	Q_INT16 color = -1;
  
  	if ( PyTuple_Size( args ) > 1 && PyInt_Check( PyTuple_GetItem( args, 1 ) ) )
***************
*** 532,536 ****
  	bool fixedDirection = true;
  	bool explodes = false;
! 	UINT8 speed = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;
--- 532,536 ----
  	bool fixedDirection = true;
  	bool explodes = false;
! 	Q_UINT8 speed = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;
***************
*** 1050,1055 ****
  	Q_UINT16 id;
  	// Optional Arguments
! 	UINT8 speed = 5;
! 	UINT8 duration = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;
--- 1050,1055 ----
  	Q_UINT16 id;
  	// Optional Arguments
! 	Q_UINT8 speed = 5;
! 	Q_UINT8 duration = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;

Index: skills.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/skills.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** skills.h	19 Aug 2004 01:22:57 -0000	1.22
--- skills.h	19 Aug 2004 01:55:58 -0000	1.23
***************
*** 41,45 ****
  	PyObject_HEAD;
  	P_CHAR pChar;
! 	UINT8 type; // 0: Value; 1: Cap; 2: Lock
  } wpSkills;
  
--- 41,45 ----
  	PyObject_HEAD;
  	P_CHAR pChar;
! 	Q_UINT8 type; // 0: Value; 1: Cap; 2: Lock
  } wpSkills;
  

Index: target.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/target.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** target.h	19 Aug 2004 01:22:57 -0000	1.18
--- target.h	19 Aug 2004 01:55:58 -0000	1.19
***************
*** 95,99 ****
  };
  
! static PyObject* PyGetTarget( cUORxTarget* target, UINT8 map )
  {
  	if ( !target )
--- 95,99 ----
  };
  
! static PyObject* PyGetTarget( cUORxTarget* target, Q_UINT8 map )
  {
  	if ( !target )

Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** char.cpp	19 Aug 2004 01:22:57 -0000	1.179
--- char.cpp	19 Aug 2004 01:55:57 -0000	1.180
***************
*** 735,739 ****
  
  	Q_UINT16 id = getArgInt( 0 );
! 	INT16 color = -1;
  
  	if ( PyTuple_Size( args ) > 1 && checkArgInt( 1 ) )
--- 735,739 ----
  
  	Q_UINT16 id = getArgInt( 0 );
! 	Q_INT16 color = -1;
  
  	if ( PyTuple_Size( args ) > 1 && checkArgInt( 1 ) )
***************
*** 1328,1333 ****
  
  	// Optional Arguments
! 	UINT8 speed = 5;
! 	UINT8 duration = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;
--- 1328,1333 ----
  
  	// Optional Arguments
! 	Q_UINT8 speed = 5;
! 	Q_UINT8 duration = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;