[wpdev-commits] wolfpack basechar.cpp,1.132,1.133 dbdriver.cpp,1.42,1.43 dbdriver.h,1.20,1.21 items.cpp,1.437,1.438 pythonscript.h,1.36,1.37 speech.cpp,1.184,1.185 walking.cpp,1.135,1.136

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

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

Modified Files:
	basechar.cpp dbdriver.cpp dbdriver.h items.cpp pythonscript.h 
	speech.cpp walking.cpp 
Log Message:
QT_CLEAN_NAMESPACE

Index: pythonscript.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pythonscript.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** pythonscript.h	10 Aug 2004 03:15:57 -0000	1.36
--- pythonscript.h	19 Aug 2004 01:59:15 -0000	1.37
***************
*** 155,159 ****
  #define SET_INT_PROPERTY( id, setter ) if( name == id ) {\
  	bool ok; \
! 	INT32 data = value.toInt( &ok ); \
  	if( !ok ) \
  		PROPERTY_ERROR( -2, "Integer expected" ) \
--- 155,159 ----
  #define SET_INT_PROPERTY( id, setter ) if( name == id ) {\
  	bool ok; \
! 	Q_INT32 data = value.toInt( &ok ); \
  	if( !ok ) \
  		PROPERTY_ERROR( -2, "Integer expected" ) \
***************
*** 173,177 ****
  #define SET_BOOL_PROPERTY( id, setter ) if( name == id ) {\
  	bool ok; \
! 	INT32 data = value.toInt( &ok ); \
  	if( !ok ) \
  		PROPERTY_ERROR( -2, "Boolean expected" ) \
--- 173,177 ----
  #define SET_BOOL_PROPERTY( id, setter ) if( name == id ) {\
  	bool ok; \
! 	Q_INT32 data = value.toInt( &ok ); \
  	if( !ok ) \
  		PROPERTY_ERROR( -2, "Boolean expected" ) \

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** basechar.cpp	19 Aug 2004 01:55:55 -0000	1.132
--- basechar.cpp	19 Aug 2004 01:59:15 -0000	1.133
***************
*** 1529,1533 ****
  	{
  		bool ok;
! 		INT32 data = value.toInt( &ok );
  		if ( !ok )
  			PROPERTY_ERROR( -2, "Integer expected" )
--- 1529,1533 ----
  	{
  		bool ok;
! 		Q_INT32 data = value.toInt( &ok );
  		if ( !ok )
  			PROPERTY_ERROR( -2, "Integer expected" )
***************
*** 1542,1546 ****
  	{
  		bool ok;
! 		INT32 data = value.toInt( &ok );
  		if ( !ok )
  			PROPERTY_ERROR( -2, "Integer expected" )
--- 1542,1546 ----
  	{
  		bool ok;
! 		Q_INT32 data = value.toInt( &ok );
  		if ( !ok )
  			PROPERTY_ERROR( -2, "Integer expected" )
***************
*** 1555,1559 ****
  	{
  		bool ok;
! 		INT32 data = value.toInt( &ok );
  		if ( !ok )
  			PROPERTY_ERROR( -2, "Integer expected" )
--- 1555,1559 ----
  	{
  		bool ok;
! 		Q_INT32 data = value.toInt( &ok );
  		if ( !ok )
  			PROPERTY_ERROR( -2, "Integer expected" )
***************
*** 1568,1572 ****
  	{
  		bool ok;
! 		INT32 data = value.toInt( &ok );
  		if ( !ok )
  			PROPERTY_ERROR( -2, "Integer expected" )
--- 1568,1572 ----
  	{
  		bool ok;
! 		Q_INT32 data = value.toInt( &ok );
  		if ( !ok )
  			PROPERTY_ERROR( -2, "Integer expected" )

Index: speech.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -d -r1.184 -r1.185
*** speech.cpp	19 Aug 2004 01:22:52 -0000	1.184
--- speech.cpp	19 Aug 2004 01:59:15 -0000	1.185
***************
*** 71,75 ****
  
  	bool ok = false;
! 	//INT32 num = speech.toInt( &ok ); // Generally try to convert it
  	QString notification;
  
--- 71,75 ----
  
  	bool ok = false;
! 	//Q_INT32 num = speech.toInt( &ok ); // Generally try to convert it
  	QString notification;
  

Index: dbdriver.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** dbdriver.cpp	19 Aug 2004 01:22:51 -0000	1.42
--- dbdriver.cpp	19 Aug 2004 01:59:15 -0000	1.43
***************
*** 151,155 ****
  
  // Get an integer with a specific offset
! INT32 cDBResult::getInt( Q_UINT32 offset ) const
  {
  	if ( !_row )
--- 151,155 ----
  
  // Get an integer with a specific offset
! Q_INT32 cDBResult::getInt( Q_UINT32 offset ) const
  {
  	if ( !_row )

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** walking.cpp	19 Aug 2004 01:55:56 -0000	1.135
--- walking.cpp	19 Aug 2004 01:59:15 -0000	1.136
***************
*** 802,806 ****
  	Coord_cl mPos = pos;
  	mPos.z = elev;
! 	const INT32 dt = DynTile( mPos );
  
  	// if there is a dynamic tile at this spot, check to see if its a blocker
--- 802,806 ----
  	Coord_cl mPos = pos;
  	mPos.z = elev;
! 	const Q_INT32 dt = DynTile( mPos );
  
  	// if there is a dynamic tile at this spot, check to see if its a blocker
***************
*** 818,822 ****
  	{
  		tile_st tile = TileCache::instance()->getTile( msi->itemid );
! 		const INT32 elev = msi->zoff + cTileCache::tileHeight( tile );
  		if ( ( elev >= pos.z ) && ( msi->zoff <= pos.z ) )
  		{
--- 818,822 ----
  	{
  		tile_st tile = TileCache::instance()->getTile( msi->itemid );
! 		const Q_INT32 elev = msi->zoff + cTileCache::tileHeight( tile );
  		if ( ( elev >= pos.z ) && ( msi->zoff <= pos.z ) )
  		{
***************
*** 832,836 ****
  		P_ITEM item = items.GetData();
  		tile_st tile = TileCache::instance()->getTile( item->id() );
! 		const INT32 elev = item->pos().z + cTileCache::tileHeight( tile );
  		if ( ( elev >= pos.z ) && ( item->pos().z <= pos.z ) )
  		{
--- 832,836 ----
  		P_ITEM item = items.GetData();
  		tile_st tile = TileCache::instance()->getTile( item->id() );
! 		const Q_INT32 elev = item->pos().z + cTileCache::tileHeight( tile );
  		if ( ( elev >= pos.z ) && ( item->pos().z <= pos.z ) )
  		{

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.437
retrieving revision 1.438
diff -C2 -d -r1.437 -r1.438
*** items.cpp	19 Aug 2004 01:55:55 -0000	1.437
--- items.cpp	19 Aug 2004 01:59:15 -0000	1.438
***************
*** 977,981 ****
  	{
  		if ( Value.contains( "." ) || Value.contains( "," ) )
! 			setMaxhp( ( INT32 ) ceil( ( float ) maxhp() * Value.toFloat() ) );
  		else
  			setMaxhp( maxhp() + Value.toLong() );
--- 977,981 ----
  	{
  		if ( Value.contains( "." ) || Value.contains( "," ) )
! 			setMaxhp( ( Q_INT32 ) ceil( ( float ) maxhp() * Value.toFloat() ) );
  		else
  			setMaxhp( maxhp() + Value.toLong() );

Index: dbdriver.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** dbdriver.h	19 Aug 2004 01:22:51 -0000	1.20
--- dbdriver.h	19 Aug 2004 01:59:15 -0000	1.21
***************
*** 179,183 ****
  	char** data() const; // Get the data for the current row
  	bool fetchrow(); // Fetchs a new row, returns false if there is no new row
! 	INT32 getInt( Q_UINT32 offset ) const; // Get an integer with a specific offset
  	QString getString( Q_UINT32 offset ) const; // Get a string with a specific offset
  
--- 179,183 ----
  	char** data() const; // Get the data for the current row
  	bool fetchrow(); // Fetchs a new row, returns false if there is no new row
! 	Q_INT32 getInt( Q_UINT32 offset ) const; // Get an integer with a specific offset
  	QString getString( Q_UINT32 offset ) const; // Get a string with a specific offset