[wpdev-commits] wolfpack commands.cpp,1.260,1.261 customtags.cpp,1.53,1.54 dbdriver.cpp,1.44,1.45 definitions.cpp,1.16,1.17 dragdrop.cpp,1.241,1.242 guilds.cpp,1.22,1.23 items.cpp,1.438,1.439 npc.cpp,1.108,1.109 party.cpp,1.16,1.17 persistentobject.cpp,1.12,1.13 pythonscript.cpp,1.45,1.46 timers.cpp,1.10,1.11 uobject.cpp,1.176,1.177 walking.cpp,1.136,1.137

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

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

Modified Files:
	commands.cpp customtags.cpp dbdriver.cpp definitions.cpp 
	dragdrop.cpp guilds.cpp items.cpp npc.cpp party.cpp 
	persistentobject.cpp pythonscript.cpp timers.cpp uobject.cpp 
	walking.cpp 
Log Message:
fixes several compiler warnings

Index: persistentobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentobject.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** persistentobject.cpp	21 Aug 2004 21:52:17 -0000	1.12
--- persistentobject.cpp	22 Aug 2004 02:29:50 -0000	1.13
***************
*** 55,60 ****
  }
  
- static void buildSqlString( const char* /*objectid*/, QStringList& /*fields*/, QStringList& /*tables*/, QStringList& /*conditions*/ ) 
- {
- }
- 
--- 55,56 ----

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.241
retrieving revision 1.242
diff -C2 -d -r1.241 -r1.242
*** dragdrop.cpp	13 Aug 2004 08:55:25 -0000	1.241
--- dragdrop.cpp	22 Aug 2004 02:29:50 -0000	1.242
***************
*** 252,256 ****
  }
  
! void DragAndDrop::bounceItem( cUOSocket* socket, P_ITEM pItem, bool denyMove )
  {
  	// Reject the move of the item
--- 252,256 ----
  }
  
! void DragAndDrop::bounceItem( cUOSocket* socket, P_ITEM pItem, bool /*denyMove*/ )
  {
  	// Reject the move of the item

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -d -r1.176 -r1.177
*** uobject.cpp	19 Aug 2004 01:55:56 -0000	1.176
--- uobject.cpp	22 Aug 2004 02:29:51 -0000	1.177
***************
*** 74,78 ****
  }
  
! cUObject::cUObject( const cUObject& src )
  {
  	// Copy Events
--- 74,78 ----
  }
  
! cUObject::cUObject( const cUObject& src ) : cDefinable(src), cPythonScriptable(src), PersistentObject( src )
  {
  	// Copy Events
***************
*** 218,222 ****
  }
  
! void cUObject::save( cBufferedWriter& writer, unsigned int version )
  {
  	writer.writeUtf8( name_ );
--- 218,222 ----
  }
  
! void cUObject::save( cBufferedWriter& writer, unsigned int /*version*/ )
  {
  	writer.writeUtf8( name_ );
***************
*** 230,234 ****
  }
  
! void cUObject::load( cBufferedReader& reader, unsigned int version )
  {
  	name_ = reader.readUtf8();
--- 230,234 ----
  }
  
! void cUObject::load( cBufferedReader& reader, unsigned int /*version*/ )
  {
  	name_ = reader.readUtf8();
***************
*** 932,936 ****
  }
  
! void cUObject::createTooltip( cUOTxTooltipList& tooltip, cPlayer* player )
  {
  	if ( tooltip.size() != 19 )
--- 932,936 ----
  }
  
! void cUObject::createTooltip( cUOTxTooltipList& tooltip, cPlayer* /*player*/ )
  {
  	if ( tooltip.size() != 19 )

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.260
retrieving revision 1.261
diff -C2 -d -r1.260 -r1.261
*** commands.cpp	21 Aug 2004 21:52:17 -0000	1.260
--- commands.cpp	22 Aug 2004 02:29:50 -0000	1.261
***************
*** 1222,1226 ****
  	on custom maps.
  */
! void commandDoorGenerator( cUOSocket* socket, const QString& command, const QStringList& args ) throw()
  {
  	Q_UNUSED( args );
--- 1222,1226 ----
  	on custom maps.
  */
! void commandDoorGenerator( cUOSocket* socket, const QString& /*command*/, const QStringList& args ) throw()
  {
  	Q_UNUSED( args );
***************
*** 1321,1325 ****
  		cItem* addDoor( int x, int y, int z, int map, DoorFacing facing )
  		{
! 			int doorTop = z + 20;
  
  			if ( y == 1743 && x >= 1343 && x <= 1344 )
--- 1321,1325 ----
  		cItem* addDoor( int x, int y, int z, int map, DoorFacing facing )
  		{
! 			//int doorTop = z + 20;
  
  			if ( y == 1743 && x >= 1343 && x <= 1344 )
***************
*** 1339,1343 ****
  	public:
  
! 		int generate( int region[], int map, cUOSocket* socket )
  		{
  			int count = 0;
--- 1339,1343 ----
  	public:
  
! 		int generate( int region[], int map, cUOSocket* )
  		{
  			int count = 0;

Index: definitions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** definitions.cpp	21 Aug 2004 21:52:17 -0000	1.16
--- definitions.cpp	22 Aug 2004 02:29:50 -0000	1.17
***************
*** 425,429 ****
  }
  
! QString cDefinitions::getText( const QString& TextSection ) const
  {
  	/*const QDomElement* DefSection = this->getSection( WPDT_TEXT, TextSection );
--- 425,429 ----
  }
  
! QString cDefinitions::getText( const QString& /*TextSection*/ ) const
  {
  	/*const QDomElement* DefSection = this->getSection( WPDT_TEXT, TextSection );
***************
*** 741,745 ****
  0,
  ( getattrfunc ) wpElement_getAttr,
! 0,
  };
  
--- 741,745 ----
  0,
  ( getattrfunc ) wpElement_getAttr,
! 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,0,0,0,0,0,
  };
  

Index: guilds.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/guilds.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** guilds.cpp	19 Aug 2004 05:28:21 -0000	1.22
--- guilds.cpp	22 Aug 2004 02:29:50 -0000	1.23
***************
*** 373,377 ****
  ( setattrfunc ) wpGuild_setAttr, 
  wpGuild_compare,
! 0,
  };
  
--- 373,377 ----
  ( setattrfunc ) wpGuild_setAttr, 
  wpGuild_compare,
! 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,0,0,0,
  };
  
***************
*** 832,836 ****
  }
  
! void cGuild::load( cBufferedReader& reader, unsigned int version ) {
  	serial_ = reader.readInt();
  	name_ = reader.readUtf8();
--- 832,837 ----
  }
  
! void cGuild::load( cBufferedReader& reader, unsigned int /*version*/ )
! {
  	serial_ = reader.readInt();
  	name_ = reader.readUtf8();
***************
*** 874,878 ****
  }
  
! void cGuild::save( cBufferedWriter& writer, unsigned int version ) {
  	writer.writeByte(0xFD);
  
--- 875,880 ----
  }
  
! void cGuild::save( cBufferedWriter& writer, unsigned int /*version*/ )
! {
  	writer.writeByte(0xFD);
  
***************
*** 904,905 ****
--- 906,908 ----
  	}
  }
+ 

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.438
retrieving revision 1.439
diff -C2 -d -r1.438 -r1.439
*** items.cpp	19 Aug 2004 01:59:15 -0000	1.438
--- items.cpp	22 Aug 2004 02:29:50 -0000	1.439
***************
*** 182,186 ****
  
  // constructor
! cItem::cItem() : container_( 0 ), totalweight_( 0 )
  {
  	basedef_ = 0;
--- 182,186 ----
  
  // constructor
! cItem::cItem() : totalweight_( 0 ), container_( 0 )
  {
  	basedef_ = 0;
***************
*** 188,192 ****
  };
  
! cItem::cItem( const cItem& src ) : container_( 0 ), totalweight_( 0 )
  {
  	Init( false );
--- 188,192 ----
  };
  
! cItem::cItem( const cItem& src ) : cUObject(src), totalweight_( 0 ), container_( 0 )
  {
  	Init( false );
***************
*** 477,481 ****
  }
  
! void cItem::postload( unsigned int version )
  {
  }
--- 477,481 ----
  }
  
! void cItem::postload( unsigned int /*version*/ )
  {
  }
***************
*** 548,553 ****
  }
  
- static void itemRegisterAfterLoading( P_ITEM pi );
- 
  bool cItem::del()
  {
--- 548,551 ----

Index: pythonscript.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** pythonscript.cpp	10 Aug 2004 03:15:57 -0000	1.45
--- pythonscript.cpp	22 Aug 2004 02:29:51 -0000	1.46
***************
*** 604,608 ****
  }
  
! stError* cPythonScriptable::setProperty( const QString& name, const cVariant& value )
  {
  	// No settable properties are available for this class
--- 604,608 ----
  }
  
! stError* cPythonScriptable::setProperty( const QString& name, const cVariant& /*value*/ )
  {
  	// No settable properties are available for this class
***************
*** 833,868 ****
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* object, P_ITEM& pItem )
  {
  	return false;
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* object, Coord_cl& pos )
  {
  	return false;
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* object, QString& string )
  {
  	return false;
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* object, QCString& string )
  {
  	return false;
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* object, unsigned int& data )
  {
  	return false;
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* object, int& data )
  {
  	return false;
  }
  
! bool cPythonScriptable::setPropety( const QString& name, PyObject* value )
  {
  	return true;
  }
--- 833,869 ----
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, P_ITEM& /*pItem*/ )
  {
  	return false;
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, Coord_cl& /*pos*/ )
  {
  	return false;
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, QString& /*string*/ )
  {
  	return false;
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, QCString& /*string*/ )
  {
  	return false;
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, unsigned int& /*data*/ )
  {
  	return false;
  }
  
! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, int& /*data*/ )
  {
  	return false;
  }
  
! bool cPythonScriptable::setPropety( const QString& /*name*/, PyObject* /*value*/ )
  {
  	return true;
  }
+ 

Index: customtags.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** customtags.cpp	13 Aug 2004 08:55:25 -0000	1.53
--- customtags.cpp	22 Aug 2004 02:29:50 -0000	1.54
***************
*** 630,634 ****
  }
  
! void cVariant::serialize( cBufferedWriter& writer, unsigned int version )
  {
  	writer.writeByte( typ );
--- 630,634 ----
  }
  
! void cVariant::serialize( cBufferedWriter& writer, unsigned int /*version*/ )
  {
  	writer.writeByte( typ );
***************
*** 701,705 ****
  }
  
! void cVariant::serialize( cBufferedReader& reader, unsigned int version )
  {
  	// Only invalid can be loaded
--- 701,705 ----
  }
  
! void cVariant::serialize( cBufferedReader& reader, unsigned int /*version*/ )
  {
  	// Only invalid can be loaded

Index: timers.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timers.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** timers.cpp	16 Aug 2004 18:18:03 -0000	1.10
--- timers.cpp	22 Aug 2004 02:29:51 -0000	1.11
***************
*** 219,223 ****
  }
  
! void cTimer::load( unsigned int id, const char** result )
  {
  	unsigned int offset = 2;
--- 219,223 ----
  }
  
! void cTimer::load( unsigned int /*id*/, const char** result )
  {
  	unsigned int offset = 2;
***************
*** 477,481 ****
  }
  
! void cTimer::load(cBufferedReader &reader, unsigned int version) {
  	serializable = true;
  	expiretime = Server::instance()->time() + reader.readInt();
--- 477,482 ----
  }
  
! void cTimer::load(cBufferedReader &reader, unsigned int /*version*/)
! {
  	serializable = true;
  	expiretime = Server::instance()->time() + reader.readInt();
***************
*** 485,489 ****
  }
  
! void cTimer::save(cBufferedWriter &writer, unsigned int version) {	
  	writer.writeInt(expiretime - Server::instance()->time());
  	writer.writeBool(dispellable);
--- 486,491 ----
  }
  
! void cTimer::save(cBufferedWriter &writer, unsigned int /*version*/)
! {	
  	writer.writeInt(expiretime - Server::instance()->time());
  	writer.writeBool(dispellable);
***************
*** 492,499 ****
  }
  
! void cTimers::save(cBufferedWriter &writer) {
  	std::vector<cTimer*>::iterator it;
! 	for (it = teffects.begin(); it != teffects.end(); ++it) {
! 		if ((*it)->isSerializable()) {
  			writer.writeByte(0xFC);
  			writer.writeAscii((*it)->objectID().latin1());
--- 494,504 ----
  }
  
! void cTimers::save(cBufferedWriter &writer) 
! {
  	std::vector<cTimer*>::iterator it;
! 	for (it = teffects.begin(); it != teffects.end(); ++it) 
! 	{
! 		if ((*it)->isSerializable()) 
! 		{
  			writer.writeByte(0xFC);
  			writer.writeAscii((*it)->objectID().latin1());
***************
*** 503,507 ****
  }
  
! void cTimers::load(cBufferedReader &reader) {
  	QCString objectId = reader.readAscii();
  
--- 508,513 ----
  }
  
! void cTimers::load(cBufferedReader &reader) 
! {
  	QCString objectId = reader.readAscii();
  
***************
*** 517,518 ****
--- 523,525 ----
  	insert(timer);
  }
+ 

Index: dbdriver.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** dbdriver.cpp	21 Aug 2004 14:18:34 -0000	1.44
--- dbdriver.cpp	22 Aug 2004 02:29:50 -0000	1.45
***************
*** 64,76 ****
  
  /* dummy functions */
! bool cDBDriver::exec( const QString& query )
  {
  	return true;
  }
! void cDBDriver::lockTable( const QString& table )
  {
  }
  
! void cDBDriver::unlockTable( const QString& table )
  {
  }
--- 64,76 ----
  
  /* dummy functions */
! bool cDBDriver::exec( const QString& /*query*/ )
  {
  	return true;
  }
! void cDBDriver::lockTable( const QString& /*table*/ )
  {
  }
  
! void cDBDriver::unlockTable( const QString& /*table*/ )
  {
  }
***************
*** 197,201 ****
  0,
  ( getattrfunc ) wpDbResult_getAttr,
! 0,
  };
  
--- 197,201 ----
  0,
  ( getattrfunc ) wpDbResult_getAttr,
! 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,0,0,0,0,0,
  };
  

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** walking.cpp	19 Aug 2004 01:59:15 -0000	1.136
--- walking.cpp	22 Aug 2004 02:29:51 -0000	1.137
***************
*** 613,617 ****
  
  // This only gets called when running
! void cMovement::checkRunning( cUOSocket* socket, P_CHAR pChar, Q_UINT8 dir )
  {
  	// Don't regenerate stamina while running
--- 613,617 ----
  
  // This only gets called when running
! void cMovement::checkRunning( cUOSocket* socket, P_CHAR pChar, Q_UINT8 /*dir*/ )
  {
  	// Don't regenerate stamina while running
***************
*** 753,757 ****
  	for Character we could eventually bump into.
  */
! bool cMovement::checkObstacles( P_CHAR pChar, const Coord_cl& newPos, bool running )
  {
  	// TODO: insert code here
--- 753,757 ----
  	for Character we could eventually bump into.
  */
! bool cMovement::checkObstacles( P_CHAR /*pChar*/, const Coord_cl& /*newPos*/, bool /*running*/ )
  {
  	// TODO: insert code here

Index: party.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/party.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** party.cpp	10 Aug 2004 03:15:57 -0000	1.16
--- party.cpp	22 Aug 2004 02:29:50 -0000	1.17
***************
*** 218,222 ****
  		the canidate is removed from the party without notification.
  	*/
! 	void Dispel( P_CHAR source, bool silent )
  	{
  		P_PLAYER player = dynamic_cast<P_PLAYER>( World::instance()->findChar( destSer ) );
--- 218,222 ----
  		the canidate is removed from the party without notification.
  	*/
! 	void Dispel( P_CHAR /*source*/, bool silent )
  	{
  		P_PLAYER player = dynamic_cast<P_PLAYER>( World::instance()->findChar( destSer ) );
***************
*** 466,470 ****
  ( setattrfunc ) wpParty_setAttr, 
  wpParty_compare,
! 0,
  };
  
--- 466,470 ----
  ( setattrfunc ) wpParty_setAttr, 
  wpParty_compare,
! 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,0,0,0,
  };
  

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** npc.cpp	19 Aug 2004 01:55:56 -0000	1.108
--- npc.cpp	22 Aug 2004 02:29:50 -0000	1.109
***************
*** 71,75 ****
  }
  
! cNPC::cNPC( const cNPC& right )
  {
  }
--- 71,75 ----
  }
  
! cNPC::cNPC( const cNPC& right ) : cBaseChar(right)
  {
  }
***************
*** 80,84 ****
  }
  
! cNPC& cNPC::operator=( const cNPC& right )
  {
  	return *this;
--- 80,84 ----
  }
  
! cNPC& cNPC::operator=( const cNPC& /*right*/ )
  {
  	return *this;
***************
*** 1057,1061 ****
  	pathnode_cl* currentNode = NULL;
  	pathnode_cl* newNode = NULL;
! 	pathnode_cl* prevNode = NULL;
  	int iterations = 0;
  	while ( !unvisited_nodes.empty() )
--- 1057,1061 ----
  	pathnode_cl* currentNode = NULL;
  	pathnode_cl* newNode = NULL;
! 	//pathnode_cl* prevNode = NULL;
  	int iterations = 0;
  	while ( !unvisited_nodes.empty() )