Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21928/python
Modified Files:
char.cpp global.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.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** item.cpp 12 Aug 2004 03:18:24 -0000 1.120
--- item.cpp 19 Aug 2004 01:22:57 -0000 1.121
***************
*** 307,318 ****
}
! UINT16 amount = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 1 ) );
! UINT16 color = 0;
if ( PyTuple_Size( args ) > 2 && PyInt_Check( PyTuple_GetItem( args, 2 ) ) )
color = PyInt_AsLong( PyTuple_GetItem( args, 2 ) );
! UINT16 deleted = 0;
deleted = self->pItem->deleteAmount( amount, id, color );
--- 307,318 ----
}
! Q_UINT16 amount = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 1 ) );
! Q_UINT16 color = 0;
if ( PyTuple_Size( args ) > 2 && PyInt_Check( PyTuple_GetItem( args, 2 ) ) )
color = PyInt_AsLong( PyTuple_GetItem( args, 2 ) );
! Q_UINT16 deleted = 0;
deleted = self->pItem->deleteAmount( amount, id, color );
***************
*** 339,343 ****
}
! UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
INT16 color = -1;
--- 339,343 ----
}
! Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
INT16 color = -1;
***************
*** 518,522 ****
}
! UINT16 id = getArgInt( 0 );
cUObject* object = getArgChar( 1 );
--- 518,522 ----
}
! Q_UINT16 id = getArgInt( 0 );
cUObject* object = getArgChar( 1 );
***************
*** 533,538 ****
bool explodes = false;
UINT8 speed = 10;
! UINT16 hue = 0;
! UINT16 renderMode = 0;
if ( checkArgInt( 2 ) )
--- 533,538 ----
bool explodes = false;
UINT8 speed = 10;
! Q_UINT16 hue = 0;
! Q_UINT16 renderMode = 0;
if ( checkArgInt( 2 ) )
***************
*** 579,583 ****
}
! UINT32 expiretime = getArgInt( 0 );
QString function = getArgStr( 1 );
PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
--- 579,583 ----
}
! Q_UINT32 expiretime = getArgInt( 0 );
QString function = getArgStr( 1 );
PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
***************
*** 1048,1057 ****
static PyObject* wpItem_effect( wpItem* self, PyObject* args )
{
! UINT16 id;
// Optional Arguments
UINT8 speed = 5;
UINT8 duration = 10;
! UINT16 hue = 0;
! UINT16 renderMode = 0;
if ( !PyArg_ParseTuple( args, "H|BBHH:char.effect(id, [speed], [duration], [hue], [rendermode])", &id, &speed, &duration, &hue, &renderMode ) )
--- 1048,1057 ----
static PyObject* wpItem_effect( wpItem* self, PyObject* args )
{
! Q_UINT16 id;
// Optional Arguments
UINT8 speed = 5;
UINT8 duration = 10;
! Q_UINT16 hue = 0;
! Q_UINT16 renderMode = 0;
if ( !PyArg_ParseTuple( args, "H|BBHH:char.effect(id, [speed], [duration], [hue], [rendermode])", &id, &speed, &duration, &hue, &renderMode ) )
Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** global.cpp 10 Aug 2004 03:27:52 -0000 1.145
--- global.cpp 19 Aug 2004 01:22:57 -0000 1.146
***************
*** 532,536 ****
}
! UINT32 expiretime = getArgInt( 0 );
QString function = getArgStr( 1 );
PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
--- 532,536 ----
}
! Q_UINT32 expiretime = getArgInt( 0 );
QString function = getArgStr( 1 );
PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
***************
*** 620,625 ****
PyObject* list = PyList_New( 0 );
! UINT32 xBlock = x / 8;
! UINT32 yBlock = y / 8;
for ( ; !iter.atEnd(); ++iter )
--- 620,625 ----
PyObject* list = PyList_New( 0 );
! Q_UINT32 xBlock = x / 8;
! Q_UINT32 yBlock = y / 8;
for ( ; !iter.atEnd(); ++iter )
Index: skills.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/skills.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** skills.h 10 Aug 2004 03:27:54 -0000 1.21
--- skills.h 19 Aug 2004 01:22:57 -0000 1.22
***************
*** 71,75 ****
}
! UINT16 value = PyInt_AsLong( pValue );
if ( self->type == 0 )
--- 71,75 ----
}
! Q_UINT16 value = PyInt_AsLong( pValue );
if ( self->type == 0 )
Index: target.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/target.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** target.h 10 Aug 2004 03:27:54 -0000 1.17
--- target.h 19 Aug 2004 01:22:57 -0000 1.18
***************
*** 41,45 ****
PyObject_HEAD;
Coord_cl pos;
! UINT16 model;
SERIAL object;
} wpTarget;
--- 41,45 ----
PyObject_HEAD;
Coord_cl pos;
! Q_UINT16 model;
SERIAL object;
} wpTarget;
Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** char.cpp 12 Aug 2004 03:18:24 -0000 1.178
--- char.cpp 19 Aug 2004 01:22:57 -0000 1.179
***************
*** 538,544 ****
}
! UINT16 amount = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 1 ) );
! UINT16 color = 0;
if ( PyTuple_Size( args ) > 2 && PyInt_Check( PyTuple_GetItem( args, 2 ) ) )
--- 538,544 ----
}
! Q_UINT16 amount = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 1 ) );
! Q_UINT16 color = 0;
if ( PyTuple_Size( args ) > 2 && PyInt_Check( PyTuple_GetItem( args, 2 ) ) )
***************
*** 546,550 ****
P_ITEM pPack = self->pChar->getBackpack();
! UINT16 deleted = 0;
if ( pPack )
--- 546,550 ----
P_ITEM pPack = self->pChar->getBackpack();
! Q_UINT16 deleted = 0;
if ( pPack )
***************
*** 734,738 ****
}
! UINT16 id = getArgInt( 0 );
INT16 color = -1;
--- 734,738 ----
}
! Q_UINT16 id = getArgInt( 0 );
INT16 color = -1;
***************
*** 1325,1335 ****
}
! UINT16 id = getArgInt( 0 );
// Optional Arguments
UINT8 speed = 5;
UINT8 duration = 10;
! UINT16 hue = 0;
! UINT16 renderMode = 0;
if ( !PyArg_ParseTuple( args, "H|BBHH:char.effect(id, [speed], [duration], [hue], [rendermode])", &id, &speed, &duration, &hue, &renderMode ) )
--- 1325,1335 ----
}
! Q_UINT16 id = getArgInt( 0 );
// Optional Arguments
UINT8 speed = 5;
UINT8 duration = 10;
! Q_UINT16 hue = 0;
! Q_UINT16 renderMode = 0;
if ( !PyArg_ParseTuple( args, "H|BBHH:char.effect(id, [speed], [duration], [hue], [rendermode])", &id, &speed, &duration, &hue, &renderMode ) )
***************
*** 1499,1503 ****
}
! UINT32 expiretime = getArgInt( 0 );
QString function = getArgStr( 1 );
PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
--- 1499,1503 ----
}
! Q_UINT32 expiretime = getArgInt( 0 );
QString function = getArgStr( 1 );
PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
***************
*** 1861,1865 ****
}
! UINT32 range = getArgInt( 1 );
if ( self->pChar->pos().map != pos.map )
--- 1861,1865 ----
}
! Q_UINT32 range = getArgInt( 1 );
if ( self->pChar->pos().map != pos.map )
|