wpdev-commits — Wolfpack CVS commit info

[wpdev-commits] wolfpack accounts.cpp,1.95,1.96 commands.cpp,1.237,1.238 contextmenu.h,1.20,1.21 coord.cpp,1.46,1.47 dbdriver.cpp,1.34,1.35 dbdriver.h,1.18,1.19 dragdrop.cpp,1.233,1.234 gumps.cpp,1.164,1.165 items.cpp,1.419,1.420 npc.cpp,1.95,1.96 party.cpp,1.12,1.13 player.cpp,1.109,1.110 sectors.cpp,1.26,1.27 sectors.h,1.10,1.11 skills.cpp,1.225,1.226 speech.cpp,1.176,1.177 uobject.cpp,1.165,1.166 walking.cpp,1.126,1.127

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

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

Modified Files:
	accounts.cpp commands.cpp contextmenu.h coord.cpp dbdriver.cpp 
	dbdriver.h dragdrop.cpp gumps.cpp items.cpp npc.cpp party.cpp 
	player.cpp sectors.cpp sectors.h skills.cpp speech.cpp 
	uobject.cpp walking.cpp 
Log Message:
fixed some compiler warnings and some code clean-ups.

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.233
retrieving revision 1.234
diff -C2 -d -r1.233 -r1.234
*** dragdrop.cpp	3 Jun 2004 14:42:53 -0000	1.233
--- dragdrop.cpp	15 Jun 2004 02:44:43 -0000	1.234
***************
*** 872,878 ****
--- 872,884 ----
  void DragAndDrop::dropOnBanker( cUOSocket* socket, P_ITEM pItem, P_CHAR pBanker )
  {
+ 	Q_UNUSED(socket);
+ 	Q_UNUSED(pItem);
+ 	Q_UNUSED(pBanker);
  }
  
  void DragAndDrop::dropOnTrainer( cUOSocket* socket, P_ITEM pItem, P_CHAR pTrainer )
  {
+ 	Q_UNUSED(socket);
+ 	Q_UNUSED(pItem);
+ 	Q_UNUSED(pTrainer);
  }

Index: sectors.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/sectors.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sectors.h	2 Jun 2004 15:04:06 -0000	1.10
--- sectors.h	15 Jun 2004 02:44:44 -0000	1.11
***************
*** 134,139 ****
  	};
  
! 	cSectorIterator* findObjects( MapType type, cSectorMap* map, int x, int y );
! 	cSectorIterator* findObjects( MapType type, cSectorMap* map, int x1, int y1, int x2, int y2 );
  public:
  	void load();
--- 134,139 ----
  	};
  
! 	cSectorIterator* findObjects( MapType type, cSectorMap* map, uint x, uint y );
! 	cSectorIterator* findObjects( MapType type, cSectorMap* map, uint x1, uint y1, uint x2, uint y2 );
  public:
  	void load();
***************
*** 153,162 ****
  	// or by a center coordinate and a distance parameter
  	// or inside of a rectangle defined by x1,y1 and x2,y2
! 	cItemSectorIterator* findItems( unsigned char map, int x, int y ); // Find items in a specific block
! 	cItemSectorIterator* findItems( unsigned char map, int x1, int y1, int x2, int y2 );
  	cItemSectorIterator* findItems( const Coord_cl& center, unsigned char distance );
  
! 	cCharSectorIterator* findChars( unsigned char map, int x, int y ); // Find items in a specific block
! 	cCharSectorIterator* findChars( unsigned char map, int x1, int y1, int x2, int y2 );
  	cCharSectorIterator* findChars( const Coord_cl& center, unsigned char distance );
  };
--- 153,162 ----
  	// or by a center coordinate and a distance parameter
  	// or inside of a rectangle defined by x1,y1 and x2,y2
! 	cItemSectorIterator* findItems( unsigned char map, uint x, uint y ); // Find items in a specific block
! 	cItemSectorIterator* findItems( unsigned char map, uint x1, uint y1, uint x2, uint y2 );
  	cItemSectorIterator* findItems( const Coord_cl& center, unsigned char distance );
  
! 	cCharSectorIterator* findChars( unsigned char map, uint x, uint y ); // Find items in a specific block
! 	cCharSectorIterator* findChars( unsigned char map, uint x1, uint y1, uint x2, uint y2 );
  	cCharSectorIterator* findChars( const Coord_cl& center, unsigned char distance );
  };

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -d -r1.165 -r1.166
*** uobject.cpp	13 Jun 2004 07:12:26 -0000	1.165
--- uobject.cpp	15 Jun 2004 02:44:45 -0000	1.166
***************
*** 143,147 ****
  {
  	if ( !d )
! 		return ~0;
  	return pos_.distance( d->pos_ );
  }
--- 143,147 ----
  {
  	if ( !d )
! 		return static_cast<uint>(~0);
  	return pos_.distance( d->pos_ );
  }

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.237
retrieving revision 1.238
diff -C2 -d -r1.237 -r1.238
*** commands.cpp	2 Jun 2004 15:04:04 -0000	1.237
--- commands.cpp	15 Jun 2004 02:44:43 -0000	1.238
***************
*** 1251,1254 ****
--- 1251,1255 ----
  void commandDoorGenerator( cUOSocket* socket, const QString& command, const QStringList& args ) throw()
  {
+ 	Q_UNUSED(args);
  	class DoorGenerator
  	{

Index: speech.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -d -r1.176 -r1.177
*** speech.cpp	2 Jun 2004 15:04:07 -0000	1.176
--- speech.cpp	15 Jun 2004 02:44:45 -0000	1.177
***************
*** 162,370 ****
  }
  
- bool StableSpeech( cUOSocket* socket, P_CHAR pPlayer, P_CHAR pMaster, const QString& speech )
- {
- 	/* redo with python..
- 		// is it a stablemaster ?
- 		if( pMaster->npc_type() != 1 )
- 			return false;
- 
- 		if( !speech.contains( "STABLE" ) )
- 			return false;
- 
- 		/////////////////////////////////////////////////////////////////////
- 		//// so far we have a stablemaster! lets see if the caller has a pet
- 		//// if so check if the pets name is in the commandstring
- 		//// if not return
- 		///////////////////////////////////////////////////////////////////
- 
- 		bool found = false;
- 		P_CHAR p_pet = NULL;
- 		RegionIterator4Chars ri( pPlayer->pos() );
- 		for (ri.Begin(); !ri.atEnd(); ri++)
- 		{
- 			p_pet = ri.GetData();
- 			if (pPlayer->dist(p_pet) <= 8)
- 			{
- 				if (p_pet->owner() == pPlayer && p_pet->stablemaster_serial()==INVALID_SERIAL) //owner of the pet ? and not already stabled ?
- 				{
- 					QString pntmp = p_pet->name();
- 					if (speech.contains(pntmp, false))
- 					{
- 						found=true;
- 						break;
- 					}
- 				}
- 			}
- 		}
- 
- 		if (!found)
- 		{
- 			pMaster->talk( tr( "Which pet?" ) );
- 			return 1;
- 		}
- 
- 		/////////////////////////////////////////////////////////////
- 		/// now we have a pet and stablemaster -> time to STABLE :-)
- 		////////////////////////////////////////////////////////////
- 
- 		// set stablesp && pets stablemaster serial
- 		// remove it from screen!
- 		p_pet->removeFromView(); // Remove it from view of all sockets
- 		p_pet->setWar(false);
- 		p_pet->setAttacker(INVALID_SERIAL);
- 
- 		pPlayer->setWar(false);
- 		pPlayer->setTarg( INVALID_SERIAL );
- 
- 		MapObjects::instance()->remove( p_pet );
- 		p_pet->setStablemaster_serial( pMaster->serial() );
- 
- 		// set timer for fee calculation
- 		p_pet->setTime_unused(0);
- 		p_pet->setTimeused_last( getNormalizedTime() );
- 
- 		stablesp.insert( pMaster->serial(), p_pet->serial() );
- 
- 		pMaster->talk( tr( "Your pet is now stabled, say retrieve or claim %1 to claim your pet" ).arg( p_pet->name() ) );
- 		*/
- 	return false;
- }
- 
- bool UnStableSpeech( cUOSocket* socket, P_CHAR pPlayer, P_CHAR pMaster, const QString& comm )
- {
- 	/* redo with python
- 		// is it a stablemaster ?
- 		if( pMaster->npc_type() != 1 )
- 			return false;
- 
- 		if( !comm.contains( "CLAIM" ) && !comm.contains( "RETRIEVE" ) )
- 
- 			return false;
- 
- 		/////////////////////////////////////////////////////////////////////
- 		//// so far we have a stablemaster! lets see if the stablemaster has a pet
- 		//// stabled the petowner owns
- 		//// if not return
- 		///////////////////////////////////////////////////////////////////
- 		P_CHAR pPet = NULL;
- 		vector<SERIAL> pets = stablesp.getData(pMaster->serial());
- 
- 		for( UINT32 i = 0; i < pets.size(); ++i )
- 		{
- 			pPet = FindCharBySerial( pets[i] );
- 
- 			if( pPet )
- 			{
- 				if( pPet->owner() != pPlayer || !comm.contains( pPet->name(), false ) )
- 					pPet = NULL;
- 				else
- 					break;
- 			}
- 		}
- 
- 		if( !pPet )
- 		{
- 			pMaster->talk( tr( "Sorry, I can't return that pet." ) );
- 			return true;
- 		}
- 
- 		/////////////////////////////////////////////////////////////
- 		/// now we have the claimed pet and stablemaster -> time to UNSTABLE :-)
- 		////////////////////////////////////////////////////////////
- 
- 		/// calc fee
- 		// (fee per 10 minutes) * number of 10 minute blocks
- 		float f_fee = ( ( pPet->time_unused() ) / 600.0f ) * Config::instance()->stablingFee();
- 		int fee = ( (int) f_fee ) + 5; // 5 basefee
- 
- 		pMaster->talk( tr( "That's %1 gold pieces" ).arg( fee ) );
- 
- 		/////////// check if customer can pay ! ///////////////
- 		if( pPlayer->CountGold() < fee )
- 		{
- 			pMaster->talk( tr( "You can't afford the fee to claim your pet. Come back when you have enough gold." ) );
- 			return true;
- 		}
- 
- 		delequan( pPlayer, 0x0EED, fee, NULL );
- 
- 		// remove from hash table
- 		stablesp.remove( pMaster->serial(), pPet->serial() );
- 		pPet->setStablemaster_serial( INVALID_SERIAL ); // actual unstabling
- 		pPet->setTimeused_last(getNormalizedTime());
- 		pPet->setTime_unused(0);
- 
- 		MapObjects::instance()->remove( pPet );
- 		MapObjects::instance()->add( pPet );
- 		pPet->resend( false ); // Resend
- 
- 		pMaster->talk( tr( "Here's your pet. Treat it well." ) );
- 	*/
- 	return false;
- }
- 
- bool ShieldSpeech( cUOSocket* socket, P_CHAR pPlayer, P_CHAR pGuard, const QString& comm )
- {
- 	/*	// lets be close to talk :)
- 		if( pPlayer->dist( pGuard ) > 3 )
- 			return false;
- 
- 		cGuildStone *pStone = pPlayer->getGuildstone();
- 
- 		// if they say chaos shield
- 		if( ( pGuard->npcaitype() == 6 ) && ( comm.contains( "CHAOS SHIELD" ) ) )
- 		{
- 			// The user needs to be in a chaos guild in order to get a shield
- 			if( !pStone || ( pStone->guildType != cGuildStone::chaos ) )
- 			{
- 				pGuard->talk( tr( "You must be in a chaos guild to get a shield!" ) );
- 				return true;
- 			}
- 
- 			// We will only give out once shield per player
- 			if( pPlayer->CountItems( 0x1BC3 ) > 0 )
- 			{
- 				pGuard->talk( "You already possess a shield!" );
- 				return true;
- 			}
- 
- 			// lets give them a new chaos shield.
- 			P_ITEM pShield = cItem::createFromScript( "28" );
- 			pPlayer->getBackpack()->addItem( pShield );
- 
- 			socket->sysMessage( tr( "You put the chaos shield into your backpack" ) );
- 			pGuard->talk( tr( "Hi fellow guild member, here is your new chaos shield." ) );
- 			return true;
- 		}
- 		// He wants an order shield
- 		else if( ( pGuard->npcaitype() == 7 ) && ( comm.contains( "ORDER SHIELD" ) ) )
- 		{
- 			// The user needs to be in a order guild in order to get a shield
- 			if( !pStone || ( pStone->guildType != cGuildStone::order ) )
- 			{
- 				pGuard->talk( tr( "You must be in an order guild to get a shield!" ) );
- 				return true;
- 			}
- 
- 			// We will only give out once shield per player
- 			// BAD: Player may have stored his shield in his bankbox
- 			if( pPlayer->CountItems( 0x1BC4 ) > 0 )
- 			{
- 				pGuard->talk( "You already possess a shield!" );
- 				return true;
- 			}
- 
- 			// lets give them a new order shield.
- 			P_ITEM pShield = cItem::createFromScript( "29" );
- 			pPlayer->getBackpack()->addItem( pShield );
- 
- 			socket->sysMessage( tr( "You put the order shield into your backpack" ) );
- 			pGuard->talk( tr( "Hi fellow guild member, here is your new order shield." ) );
- 			return true;
- 		}
- 	*/
- 	return false;
- }
- 
  // All this Stuff should be scripted
  bool QuestionSpeech( cUOSocket* socket, P_PLAYER pPlayer, P_NPC pChar, const QString& comm )
--- 162,165 ----
***************
*** 431,553 ****
  }
  
- bool TrainerSpeech( cUOSocket* socket, P_CHAR pPlayer, P_NPC pTrainer, const QString& comm )
- {
- 	/*	if( pPlayer->dist( pTrainer ) > 3 || !pTrainer->isHuman() )
- 			return false;
- 
- 		if( !comm.contains( "TRAIN" ) && !comm.contains( "TEACH" ) && !comm.contains( "LEARN" ) )
- 			return false;
- 
- 		if( !pTrainer->cantrain() )
- 		{
- 			pTrainer->talk( tr( "I am sorry, but I have nothing to teach thee" ) );
- 			return true;
- 		}
- 
- 		INT32 i, skill = -1;
- 
- 		// this is to prevent errors when a player says "train <skill>" then don't pay the npc
- 		pPlayer->setTrainer( INVALID_SERIAL );
- 
- 		for( i = 0; i < ALLSKILLS; ++i )
- 			if( comm.contains( Skills::instance()->getSkillName( i ), false ) )
- 			{
- 				skill = i;
- 				break;
- 			}
- 
- 		if( skill != -1 )
- 		{
- 			if( pTrainer->skillValue( skill ) <= 10 || !pTrainer->cantrain() )
- 			{
- 				pTrainer->talk( "I am sorry but I cannot train thee in that skill." );
- 				return true;
- 			}
- 
- 			QString skillName = Skills::instance()->getSkillName( skill );
- 			skillName = skillName.lower();
- 
- 			QString message = tr( "Thou wishest to learn of %1" ).arg( skillName );
- 
- 			// This should be configureable
- 			if( pPlayer->skillValue(skill) >= 250 )
- 				message.append( tr( " I can teach thee no more than thou already knowest!" ) );
- 			else
- 			{
- 				UINT32 sum = pPlayer->getSkillSum();
- 
- 				// The user knows too much
- 				if( sum >= Config::instance()->skillcap() * 10 )
- 					message.append( tr( " I can teach thee no more. Thou already knowest too much!" ) );
- 
- 				else
- 				{
- 					int delta = pTrainer->getTeachingDelta( pPlayer, skill, sum );
- 					int perc = ( pPlayer->skillValue( skill ) + delta ) / 10;
- 
- 					message.append( tr( " Very well I, can train thee up to the level of %i percent for %i gold. Pay for less and I shall teach thee less." ).arg( perc ).arg( delta ) );
- 
- 					pPlayer->setTrainer( pTrainer->serial() );
- 					pTrainer->setTrainingplayerin( skill );
- 				}
- 			}
- 
- 			pTrainer->talk( message );
- 			return true;
- 		}
- 
- 		// Didn't ask to be trained in a specific skill
- 		pTrainer->setTrainingplayerin( 0xFF );
- 		QStringList skillList;
- 
- 		for( i = 0; i < ALLSKILLS; ++i )
- 		{
- 			if( pTrainer->skillValue( i ) >= 10 && pPlayer->skillValue( i ) < 250 )
- 			{
- 				QString skillName = Skills::instance()->getSkillName( i );
- 				skillList.push_back( skillName );
- 			}
- 		}
- 
- 		// skills and a trainer ?
- 		if( skillList.count() > 0 )
- 			pTrainer->talk( tr( "I can teach thee the following skills: %1." ).arg( skillList.join( ", " ) ) );
- 		else
- 			pTrainer->talk( tr( "I am sorry, but I have nothing to teach thee" ) );
- 	*/
- 	return false;
- }
- 
- //PlayerVendors
- void PlVGetgold( cUOSocket* socket, P_CHAR pPlayer, P_CHAR pVendor )
- {
- 	/*
- 		if( pVendor->owner() != pPlayer )
- 		{
- 			pVendor->talk( tr( "I don't work for you!" ) );
- 			return;
- 		}
- 
- 		if( pVendor->holdg() <= 0 )
- 		{
- 			pVendor->talk( tr( "I have no gold waiting for you." ) );
- 			pVendor->setHoldg( 0 );
- 			return;
- 		}
- 
- 		// He keeps 10% of all earnings
- 		UINT32 goldKeeping = pVendor->holdg();
- 		UINT32 goldSalary = (UINT32)( 0.1 * goldKeeping );
- 		goldKeeping -= goldSalary;
- 
- 		// Hand him the gold
- 		if( goldKeeping > 0 )
- 			pPlayer->giveGold( goldKeeping );
- 
- 		pVendor->talk( tr( "Today's purchases total %1 gold. I am keeping %2 gold for my self. Here is the remaining %3 gold. Have a nice day." ).arg( goldKeeping + goldSalary ).arg( goldSalary ).arg( goldKeeping ) );
- 		pVendor->setHoldg( 0 );
- 	*/
- }
- 
  bool VendorChkName( P_CHAR pVendor, const QString& comm )
  {
--- 226,229 ----
***************
*** 620,637 ****
  			return true;
  
- 		if ( StableSpeech( socket, pPlayer, pNpc, speechUpr ) )
- 			return true;
- 
- 		if ( UnStableSpeech( socket, pPlayer, pNpc, speechUpr ) )
- 			return true;
- 
- 		if ( ShieldSpeech( socket, pPlayer, pNpc, speechUpr ) )
- 			return true;
- 
  		if ( QuestionSpeech( socket, pPlayer, pNpc, speechUpr ) )
  			return true;
- 
- 		if ( TrainerSpeech( socket, pPlayer, pNpc, speechUpr ) )
- 			return true;
  	}
  
--- 296,301 ----

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** walking.cpp	3 Jun 2004 14:42:59 -0000	1.126
--- walking.cpp	15 Jun 2004 02:44:45 -0000	1.127
***************
*** 121,124 ****
--- 121,126 ----
  bool checkWalkable( P_CHAR pChar, UINT16 tileId )
  {
+ 	Q_UNUSED(pChar);
+ 	Q_UNUSED(tileId);
  	return false;
  }

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.419
retrieving revision 1.420
diff -C2 -d -r1.419 -r1.420
*** items.cpp	6 Jun 2004 19:51:36 -0000	1.419
--- items.cpp	15 Jun 2004 02:44:44 -0000	1.420
***************
*** 1284,1287 ****
--- 1284,1288 ----
  void cItem::talk( const QString& message, UI16 color, UINT8 type, bool autospam, cUOSocket* socket )
  {
+ 	Q_UNUSED(autospam);
  	if ( color == 0xFFFF )
  	{

Index: skills.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/skills.cpp,v
retrieving revision 1.225
retrieving revision 1.226
diff -C2 -d -r1.225 -r1.226
*** skills.cpp	2 Jun 2004 15:04:06 -0000	1.225
--- skills.cpp	15 Jun 2004 02:44:45 -0000	1.226
***************
*** 92,96 ****
  	cTargetRequest* targetRequest = NULL;
  	QString message;
- 	int s = -1;
  
  	switch ( id )
--- 92,95 ----

Index: sectors.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/sectors.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** sectors.cpp	2 Jun 2004 15:04:06 -0000	1.26
--- sectors.cpp	15 Jun 2004 02:44:44 -0000	1.27
***************
*** 455,468 ****
  }
  
! cSectorIterator* cSectorMaps::findObjects( MapType type, cSectorMap* sector, int x1, int y1, int x2, int y2 )
  {
- 	x1 = QMAX( 0, x1 );
- 	x2 = QMAX( 0, x2 );
- 	y1 = QMAX( 0, y1 );
- 	y2 = QMAX( 0, y2 );
- 
  	// First step: count how many items we are going to hold
  	unsigned int count = 0;
- 	unsigned int gridSize = sector->gridWidth() * sector->gridHeight();
  	unsigned int xBlock, yBlock;
  
--- 455,462 ----
  }
  
! cSectorIterator* cSectorMaps::findObjects( MapType type, cSectorMap* sector, uint x1, uint y1, uint x2, uint y2 )
  {
  	// First step: count how many items we are going to hold
  	unsigned int count = 0;
  	unsigned int xBlock, yBlock;
  
***************
*** 524,532 ****
  
  // Find items in a specific block
! cSectorIterator* cSectorMaps::findObjects( MapType type, cSectorMap* sector, int x, int y )
  {
- 	x = QMAX( 0, x );
- 	y = QMAX( 0, y );
- 
  	unsigned int block = sector->calcBlockId( x, y );
  	unsigned int count = sector->countItems( block );
--- 518,523 ----
  
  // Find items in a specific block
! cSectorIterator* cSectorMaps::findObjects( MapType type, cSectorMap* sector, uint x, uint y )
  {
  	unsigned int block = sector->calcBlockId( x, y );
  	unsigned int count = sector->countItems( block );
***************
*** 562,570 ****
  }
  
! cItemSectorIterator* cSectorMaps::findItems( unsigned char map, int x, int y )
  {
- 	x = QMAX( 0, x );
- 	y = QMAX( 0, y );
- 
  	std::map<unsigned char, cSectorMap*>::const_iterator it = itemmaps.find( map );
  
--- 553,558 ----
  }
  
! cItemSectorIterator* cSectorMaps::findItems( unsigned char map, uint x, uint y )
  {
  	std::map<unsigned char, cSectorMap*>::const_iterator it = itemmaps.find( map );
  
***************
*** 578,586 ****
  }
  
! cCharSectorIterator* cSectorMaps::findChars( unsigned char map, int x, int y )
  {
- 	x = QMAX( 0, x );
- 	y = QMAX( 0, y );
- 
  	std::map<unsigned char, cSectorMap*>::const_iterator it = charmaps.find( map );
  
--- 566,571 ----
  }
  
! cCharSectorIterator* cSectorMaps::findChars( unsigned char map, uint x, uint y )
  {
  	std::map<unsigned char, cSectorMap*>::const_iterator it = charmaps.find( map );
  
***************
*** 594,604 ****
  }
  
! cItemSectorIterator* cSectorMaps::findItems( unsigned char map, int x1, int y1, int x2, int y2 )
  {
- 	x1 = QMAX( 0, x1 );
- 	y1 = QMAX( 0, y1 );
- 	x2 = QMAX( 0, x2 );
- 	y2 = QMAX( 0, y2 );
- 
  	std::map<unsigned char, cSectorMap*>::const_iterator it = itemmaps.find( map );
  
--- 579,584 ----
  }
  
! cItemSectorIterator* cSectorMaps::findItems( unsigned char map, uint x1, uint y1, uint x2, uint y2 )
  {
  	std::map<unsigned char, cSectorMap*>::const_iterator it = itemmaps.find( map );
  
***************
*** 612,622 ****
  }
  
! cCharSectorIterator* cSectorMaps::findChars( unsigned char map, int x1, int y1, int x2, int y2 )
  {
- 	x1 = QMAX( 0, x1 );
- 	y1 = QMAX( 0, y1 );
- 	x2 = QMAX( 0, x2 );
- 	y2 = QMAX( 0, y2 );
- 
  	std::map<unsigned char, cSectorMap*>::const_iterator it = charmaps.find( map );
  
--- 592,597 ----
  }
  
! cCharSectorIterator* cSectorMaps::findChars( unsigned char map, uint x1, uint y1, uint x2, uint y2 )
  {
  	std::map<unsigned char, cSectorMap*>::const_iterator it = charmaps.find( map );
  

Index: coord.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/coord.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** coord.cpp	2 Jun 2004 15:04:04 -0000	1.46
--- coord.cpp	15 Jun 2004 02:44:43 -0000	1.47
***************
*** 415,419 ****
  
  			map_st map1, map2;
- 			SI32 j;
  
  			bool posHigherThanMap;
--- 415,418 ----
***************
*** 754,758 ****
  						continue;
  					QValueVector<multiItem_st> multi = def->getEntries();
! 					for ( j = 0; j < multi.size(); ++j )
  					{
  						if ( ( multi[j].visible ) && ( pi->pos().x + multi[j].x == ( *pit ).x ) && ( pi->pos().y + multi[j].y == ( *pit ).y ) )
--- 753,757 ----
  						continue;
  					QValueVector<multiItem_st> multi = def->getEntries();
! 					for ( unsigned int j = 0; j < multi.size(); ++j )
  					{
  						if ( ( multi[j].visible ) && ( pi->pos().x + multi[j].x == ( *pit ).x ) && ( pi->pos().y + multi[j].y == ( *pit ).y ) )
***************
*** 1327,1331 ****
  				}
  				QValueVector<multiItem_st> multi = def->getEntries();
! 				for ( j = 0; j < multi.size(); ++j )
  				{
  					if ( ( multi[j].visible ) && ( pi->pos().x + multi[j].x == ( *pit ).x ) && ( pi->pos().y + multi[j].y == ( *pit ).y ) )
--- 1326,1330 ----
  				}
  				QValueVector<multiItem_st> multi = def->getEntries();
! 				for ( unsigned int j = 0; j < multi.size(); ++j )
  				{
  					if ( ( multi[j].visible ) && ( pi->pos().x + multi[j].x == ( *pit ).x ) && ( pi->pos().y + multi[j].y == ( *pit ).y ) )

Index: accounts.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** accounts.cpp	2 Jun 2004 15:04:02 -0000	1.95
--- accounts.cpp	15 Jun 2004 02:44:43 -0000	1.96
***************
*** 81,85 ****
  {
  	if ( isBlocked() )
! 		return ~0;
  	else if ( blockUntil.isValid() && blockUntil < QDateTime::currentDateTime() )
  		return QDateTime::currentDateTime().secsTo( blockUntil );
--- 81,85 ----
  {
  	if ( isBlocked() )
! 		return static_cast<uint>(~0);
  	else if ( blockUntil.isValid() && blockUntil < QDateTime::currentDateTime() )
  		return QDateTime::currentDateTime().secsTo( blockUntil );

Index: gumps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** gumps.cpp	6 Jun 2004 16:42:12 -0000	1.164
--- gumps.cpp	15 Jun 2004 02:44:43 -0000	1.165
***************
*** 442,446 ****
  			else if ( mChar )
  			{
- 				UI08 map = mChar->pos().map;
  				mChar->removeFromView( false );
  				mChar->moveTo( pChar->pos() );
--- 442,445 ----
***************
*** 456,460 ****
  			else if ( mChar )
  			{
- 				UI08 map = pChar->pos().map;
  				pChar->removeFromView( false );
  				pChar->moveTo( mChar->pos() );
--- 455,458 ----

Index: dbdriver.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** dbdriver.cpp	2 Jun 2004 15:04:04 -0000	1.34
--- dbdriver.cpp	15 Jun 2004 02:44:43 -0000	1.35
***************
*** 71,74 ****
--- 71,75 ----
  {
  }
+ 
  void cDBDriver::unlockTable( const QString& table )
  {
***************
*** 78,82 ****
  	return QString::null;
  }
! void cDBDriver::setActiveConnection( int id )
  {
  }
--- 79,84 ----
  	return QString::null;
  }
! 
! void cDBDriver::setActiveConnection( int )
  {
  }
***************
*** 266,270 ****
   *****************************************************************************/
  
! bool cSQLiteDriver::open( int id )
  {
  	char* error = NULL;
--- 268,272 ----
   *****************************************************************************/
  
! bool cSQLiteDriver::open( int )
  {
  	char* error = NULL;

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** player.cpp	2 Jun 2004 15:04:06 -0000	1.109
--- player.cpp	15 Jun 2004 02:44:44 -0000	1.110
***************
*** 258,261 ****
--- 258,262 ----
  void cPlayer::talk( const QString& message, UI16 color, UINT8 type, bool autospam, cUOSocket* socket )
  {
+ 	Q_UNUSED(autospam);
  	if ( color == 0xFFFF )
  		color = saycolor_;

Index: dbdriver.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dbdriver.h	2 Jun 2004 15:04:04 -0000	1.18
--- dbdriver.h	15 Jun 2004 02:44:43 -0000	1.19
***************
*** 123,142 ****
  	}
  
- 	cSQLiteDriver()
- 	{
- 	}
- 	virtual ~cSQLiteDriver()
- 	{
- 	}
- 
  	bool open( int id = CONN_MAIN );
  	void close();
  
- 	void lockTable( const QString& table )
- 	{
- 	}
- 	void unlockTable( const QString& table )
- 	{
- 	}
  	bool tableExists( const QString& table );
  	QString error()
--- 123,129 ----
***************
*** 158,168 ****
  	}
  
- 	cMySQLDriver()
- 	{
- 	}
- 	virtual ~cMySQLDriver()
- 	{
- 	}
- 
  	bool open( int id = CONN_MAIN );
  	void close();
--- 145,148 ----

Index: contextmenu.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/contextmenu.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** contextmenu.h	2 Jun 2004 15:04:04 -0000	1.20
--- contextmenu.h	15 Jun 2004 02:44:43 -0000	1.21
***************
*** 57,61 ****
  
  
! 	cContextMenuEntry( ushort cliloc, ushort scriptTag, ushort color = 0, bool checkvisible = false, bool checkenabled = false ) : cliloc_( cliloc ), flags_( 0 ), color_( 0 ), scriptTag_( scriptTag ), checkvisible_( checkvisible_ ), checkenabled_( checkenabled )
  	{
  		flags_ |= ( color_ & 0xFFFF ) ? 32 : 0;
--- 57,61 ----
  
  
! 	cContextMenuEntry( ushort cliloc, ushort scriptTag, ushort color = 0, bool checkvisible = false, bool checkenabled = false ) : cliloc_( cliloc ), flags_( 0 ), color_( color ), scriptTag_( scriptTag ), checkvisible_( checkvisible ), checkenabled_( checkenabled )
  	{
  		flags_ |= ( color_ & 0xFFFF ) ? 32 : 0;

Index: party.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/party.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** party.cpp	2 Jun 2004 15:04:06 -0000	1.12
--- party.cpp	15 Jun 2004 02:44:44 -0000	1.13
***************
*** 551,554 ****
--- 551,557 ----
  static int wpParty_setAttr( wpParty* self, char* name, PyObject* value )
  {
+ 	Q_UNUSED(self);
+ 	Q_UNUSED(name);
+ 	Q_UNUSED(value);
  	return 0;
  }

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** npc.cpp	3 Jun 2004 14:42:59 -0000	1.95
--- npc.cpp	15 Jun 2004 02:44:44 -0000	1.96
***************
*** 225,229 ****
  
  // Update flags etc.
! void cNPC::update( bool excludeself )
  {
  	cUOTxUpdatePlayer update;
--- 225,229 ----
  
  // Update flags etc.
! void cNPC::update( bool )
  {
  	cUOTxUpdatePlayer update;
***************
*** 534,537 ****
--- 534,538 ----
  void cNPC::giveGold( Q_UINT32 amount, bool inBank )
  {
+ 	Q_UNUSED(inBank);
  	P_ITEM pCont = getBackpack();
  

[wpdev-commits] wolfpack/network uorxpackets.cpp,1.62,1.63 uosocket.cpp,1.378,1.379 uotxpackets.cpp,1.96,1.97

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

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

Modified Files:
	uorxpackets.cpp uosocket.cpp uotxpackets.cpp 
Log Message:
fixed some compiler warnings and some code clean-ups.

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.378
retrieving revision 1.379
diff -C2 -d -r1.378 -r1.379
*** uosocket.cpp	9 Jun 2004 22:53:19 -0000	1.378
--- uosocket.cpp	15 Jun 2004 02:44:45 -0000	1.379
***************
*** 419,422 ****
--- 419,423 ----
  void cUOSocket::handleHardwareInfo( cUORxHardwareInfo* packet )
  {
+ 	Q_UNUSED(packet);
  	// Do something with the retrieved hardware information here
  	// > Hardware Log ??
***************
*** 1212,1249 ****
  void cUOSocket::handleCHBackup( cUORxAosMultiPurpose* packet )
  {
  }
  void cUOSocket::handleCHRestore( cUORxAosMultiPurpose* packet )
  {
  }
  void cUOSocket::handleCHCommit( cUORxAosMultiPurpose* packet )
  {
  }
  void cUOSocket::handleCHDelete( cUORxCHDelete* packet )
  {
  }
  void cUOSocket::handleCHAddElement( cUORxCHAddElement* packet )
  {
  }
  void cUOSocket::handleCHClose( cUORxAosMultiPurpose* packet )
  {
  }
  void cUOSocket::handleCHStairs( cUORxCHStairs* packet )
  {
  }
  void cUOSocket::handleCHSync( cUORxAosMultiPurpose* packet )
  {
  }
  void cUOSocket::handleCHClear( cUORxAosMultiPurpose* packet )
  {
  }
  void cUOSocket::handleCHLevel( cUORxCHLevel* packet )
  {
  	player()->onCHLevelChange( packet->level() );
  }
  void cUOSocket::handleCHRevert( cUORxAosMultiPurpose* packet )
  {
  }
  
- 
  void cUOSocket::handleCastSpell( cUORxCastSpell* packet )
  {
--- 1213,1269 ----
  void cUOSocket::handleCHBackup( cUORxAosMultiPurpose* packet )
  {
+ 	Q_UNUSED(packet);
  }
+ 
  void cUOSocket::handleCHRestore( cUORxAosMultiPurpose* packet )
  {
+ 	Q_UNUSED(packet);
  }
+ 
  void cUOSocket::handleCHCommit( cUORxAosMultiPurpose* packet )
  {
+ 	Q_UNUSED(packet);
  }
+ 
  void cUOSocket::handleCHDelete( cUORxCHDelete* packet )
  {
+ 	Q_UNUSED(packet);
  }
+ 
  void cUOSocket::handleCHAddElement( cUORxCHAddElement* packet )
  {
+ 	Q_UNUSED(packet);
  }
+ 
  void cUOSocket::handleCHClose( cUORxAosMultiPurpose* packet )
  {
+ 	Q_UNUSED(packet);
  }
+ 
  void cUOSocket::handleCHStairs( cUORxCHStairs* packet )
  {
+ 	Q_UNUSED(packet);
  }
+ 
  void cUOSocket::handleCHSync( cUORxAosMultiPurpose* packet )
  {
+ 	Q_UNUSED(packet);
  }
+ 
  void cUOSocket::handleCHClear( cUORxAosMultiPurpose* packet )
  {
+ 	Q_UNUSED(packet);
  }
+ 
  void cUOSocket::handleCHLevel( cUORxCHLevel* packet )
  {
  	player()->onCHLevelChange( packet->level() );
  }
+ 
  void cUOSocket::handleCHRevert( cUORxAosMultiPurpose* packet )
  {
+ 	Q_UNUSED(packet);
  }
  
  void cUOSocket::handleCastSpell( cUORxCastSpell* packet )
  {
***************
*** 1929,1933 ****
  	}
  
! 	if ( pCont->objectID() == "cCorpse" )
  	{
  		cCorpse* pCorpse = dynamic_cast<cCorpse*>( pCont );
--- 1949,1953 ----
  	}
  
! 	if ( pCont->objectID() == QString("cCorpse") )
  	{
  		cCorpse* pCorpse = dynamic_cast<cCorpse*>( pCont );

Index: uorxpackets.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** uorxpackets.cpp	2 Jun 2004 15:04:09 -0000	1.62
--- uorxpackets.cpp	15 Jun 2004 02:44:45 -0000	1.63
***************
*** 182,186 ****
  		// So we need to iterate trough the speech
  
! 		return QString().fromUtf8( speech.data() );
  	}
  	else
--- 182,186 ----
  		// So we need to iterate trough the speech
  
! 		return QString::fromUtf8( speech.data() );
  	}
  	else

Index: uotxpackets.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** uotxpackets.cpp	2 Jun 2004 15:04:10 -0000	1.96
--- uotxpackets.cpp	15 Jun 2004 02:44:46 -0000	1.97
***************
*** 615,619 ****
  	if ( !pItem )
  		return;
! 	SERIAL contserial = -1;
  	if ( pItem->container() )
  		contserial = pItem->container()->serial();
--- 615,619 ----
  	if ( !pItem )
  		return;
! 	SERIAL contserial = INVALID_SERIAL;
  	if ( pItem->container() )
  		contserial = pItem->container()->serial();

[wpdev-commits] wolfpack/python content.h,1.14,1.15 global.cpp,1.132,1.133 item.cpp,1.112,1.113 pyai.cpp,1.5,1.6 pytooltip.cpp,1.18,1.19 socket.cpp,1.77,1.78

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

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

Modified Files:
	content.h global.cpp item.cpp pyai.cpp pytooltip.cpp 
	socket.cpp 
Log Message:
fixed some compiler warnings and some code clean-ups.

Index: content.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/content.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** content.h	2 Jun 2004 19:13:13 -0000	1.14
--- content.h	15 Jun 2004 02:44:46 -0000	1.15
***************
*** 64,74 ****
  			goto error;
  		cBaseChar::ItemContainer container = pc->content();
! 		if ( id >= container.size() || id < 0 )
  			goto error;
  		cBaseChar::ItemContainer::const_iterator it( container.begin() );
  		/*
! 				 * Ask Correa before trying to `optimize` this,
! 				 * there isn't much standard complient options here.
! 				 */
  		for ( int i = 0; i < id && it != container.end(); ++i )
  			++it;
--- 64,74 ----
  			goto error;
  		cBaseChar::ItemContainer container = pc->content();
! 		if ( id < 0 || static_cast<uint>(id) >= container.size() )
  			goto error;
  		cBaseChar::ItemContainer::const_iterator it( container.begin() );
  		/*
! 		 * Ask Correa before trying to `optimize` this,
! 		 * there isn't much standard complient options here.
! 		 */
  		for ( int i = 0; i < id && it != container.end(); ++i )
  			++it;
***************
*** 85,95 ****
  			goto error;
  		cItem::ContainerContent container = pi->content();
! 		if ( id >= container.size() || id < 0 )
  			goto error;
  		cItem::ContainerContent::const_iterator it( container.begin() );
  		/*
! 				 * Ask Correa before trying to `optimize` this,
! 				 * there isn't much standard complient options here.
! 				 */
  		for ( int i = 0; i < id && it != container.end(); ++i )
  			++it;
--- 85,95 ----
  			goto error;
  		cItem::ContainerContent container = pi->content();
! 		if ( id < 0 || static_cast<uint>(id) >= container.size() )
  			goto error;
  		cItem::ContainerContent::const_iterator it( container.begin() );
  		/*
! 		 * Ask Correa before trying to `optimize` this,
! 		 * there isn't much standard complient options here.
! 		 */
  		for ( int i = 0; i < id && it != container.end(); ++i )
  			++it;

Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** global.cpp	2 Jun 2004 19:13:13 -0000	1.132
--- global.cpp	15 Jun 2004 02:44:46 -0000	1.133
***************
*** 1906,1909 ****
--- 1906,1910 ----
  static PyObject* wpClose( PyObject* self, PyObject* args )
  {
+ 	Q_UNUSED(args);
  	try
  	{

Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** item.cpp	2 Jun 2004 19:13:14 -0000	1.112
--- item.cpp	15 Jun 2004 02:44:46 -0000	1.113
***************
*** 732,742 ****
  static PyObject* wpItem_multi( wpItem* self, PyObject* args )
  {
! 	/*	Q_UNUSED(args);
! 		if( self->pItem->free )
! 		{
! 			Py_INCREF( Py_None );
! 			return Py_None;
! 		}
! 		return PyGetMultiObject( dynamic_cast< cMulti* >( FindItemBySerial( self->pItem->multis() ) ) */
  	Py_INCREF( Py_None );
  	return Py_None;
--- 732,744 ----
  static PyObject* wpItem_multi( wpItem* self, PyObject* args )
  {
! 	Q_UNUSED(args);
! 	/*	
! 	if( self->pItem->free )
! 	{
! 		Py_INCREF( Py_None );
! 		return Py_None;
! 	}
! 	return PyGetMultiObject( dynamic_cast< cMulti* >( FindItemBySerial( self->pItem->multis() ) ) 
! 	*/
  	Py_INCREF( Py_None );
  	return Py_None;
***************
*** 800,803 ****
--- 802,806 ----
  static PyObject* wpItem_isblessed( wpItem* self, PyObject* args )
  {
+ 	Q_UNUSED(args);
  	if ( self->pItem->free )
  	{

Index: pytooltip.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/pytooltip.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** pytooltip.cpp	2 Jun 2004 19:13:14 -0000	1.18
--- pytooltip.cpp	15 Jun 2004 02:44:46 -0000	1.19
***************
*** 91,94 ****
--- 91,95 ----
  static PyObject* wpTooltip_reset( wpTooltip* self, PyObject* args )
  {
+ 	Q_UNUSED(args);
  	self->list->resize( 19 );
  	self->list->setShort( 1, 19 );

Index: socket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** socket.cpp	2 Jun 2004 19:13:14 -0000	1.77
--- socket.cpp	15 Jun 2004 02:44:46 -0000	1.78
***************
*** 779,782 ****
--- 779,783 ----
  static PyObject* wpSocket_updateplayer( wpSocket* self, PyObject* args )
  {
+ 	Q_UNUSED(args);
  	self->pSock->updatePlayer();
  	return PyTrue();

Index: pyai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/pyai.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pyai.cpp	2 Jun 2004 19:13:14 -0000	1.5
--- pyai.cpp	15 Jun 2004 02:44:46 -0000	1.6
***************
*** 119,123 ****
  {
  	// Special Python things
- 
  	return Py_FindMethod( wpAIMethods, ( PyObject * ) self, name );
  }
--- 119,122 ----
***************
*** 126,130 ****
  {
  	// Special Python things.
! 
  	return 0;
  }
--- 125,131 ----
  {
  	// Special Python things.
! 	Q_UNUSED(self);
! 	Q_UNUSED(name);
! 	Q_UNUSED(value);
  	return 0;
  }

[wpdev-commits] wolfpack/win console_win.cpp,1.21,1.22 getopts_win.cpp,1.5,1.6

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

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

Modified Files:
	console_win.cpp getopts_win.cpp 
Log Message:
fixed some compiler warnings and some code clean-ups.

Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/win/console_win.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** console_win.cpp	2 Jun 2004 15:04:11 -0000	1.21
--- console_win.cpp	15 Jun 2004 02:44:47 -0000	1.22
***************
*** 639,642 ****
--- 639,644 ----
  int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd )
  {
+ 	Q_UNUSED( hPrevInstance );
+ 	Q_UNUSED( nShowCmd );
  #if defined(_DEBUG)
  	/*	AllocConsole();

Index: getopts_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/win/getopts_win.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** getopts_win.cpp	2 Jun 2004 15:04:12 -0000	1.5
--- getopts_win.cpp	15 Jun 2004 02:44:47 -0000	1.6
***************
*** 43,49 ****
  void cGetopts::parse_options( int argc, char** argv )
  {
! 	unsigned int i;
! 
! 	for ( i = 1; i < argc; i++ )
  	{
  		if ( argv[i][0] == '-' )
--- 43,47 ----
  void cGetopts::parse_options( int argc, char** argv )
  {
! 	for ( int i = 1; i < argc; i++ )
  	{
  		if ( argv[i][0] == '-' )

[wpdev-commits] wolfpack/python engine.h,1.16,1.17

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

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

Modified Files:
	engine.h 
Log Message:
 warning fixes

Index: engine.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/engine.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** engine.h	2 Jun 2004 15:04:10 -0000	1.16
--- engine.h	14 Jun 2004 22:32:25 -0000	1.17
***************
*** 37,40 ****
--- 37,45 ----
  #include <qstring.h>
  
+ // Stupid Python developers
+ #if defined(_POSIX_C_SOURCE)
+ #	undef _POSIX_C_SOURCE
+ #endif
+ 
  //#define DEBUG_PYTHON
  #undef slots

[wpdev-commits] wolfpack defines.h,1.53,1.54

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

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

Modified Files:
	defines.h 
Log Message:
 warning fixes

Index: defines.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/defines.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** defines.h	10 Jun 2004 00:27:12 -0000	1.53
--- defines.h	14 Jun 2004 22:32:25 -0000	1.54
***************
*** 133,137 ****
  
  #define MY_CLOCKS_PER_SEC 1000
! #define INVALID_SERIAL (~0)
  
  #define CONN_MAIN 1
--- 133,137 ----
  
  #define MY_CLOCKS_PER_SEC 1000
! #define INVALID_SERIAL static_cast<unsigned int>(~0)
  
  #define CONN_MAIN 1

[wpdev-commits] wolfpack pythonscript.cpp,1.39,1.40

[Richard M. <dr...@us...>]

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

Modified Files:
	pythonscript.cpp 
Log Message:
Figured it would be good to see onLoad and onUnload show up in docs. :)


Index: pythonscript.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** pythonscript.cpp	2 Jun 2004 15:04:06 -0000	1.39
--- pythonscript.cpp	14 Jun 2004 22:15:30 -0000	1.40
***************
*** 477,482 ****
  	\return Return behaviour is the same as for onUse.
  	*/
! 	"onTelekinesis", 
! 	
  	/*
  	\event onContextCheckVisible
--- 477,482 ----
  	\return Return behaviour is the same as for onUse.
  	*/
! 	"onTelekinesis",
! 
  	/*
  	\event onContextCheckVisible
***************
*** 500,504 ****
  	*/
  	"onContextCheckEnabled",
! 	
  	0
  };
--- 500,504 ----
  	*/
  	"onContextCheckEnabled",
! 
  	0
  };
***************
*** 519,522 ****
--- 519,527 ----
  }
  
+ /*
+ 	\event onUnload
+ 	\return None
+ 	\condition Triggered when the script is unloaded.
+ */
  void cPythonScript::unload( void )
  {
***************
*** 539,542 ****
--- 544,552 ----
  }
  
+ /*
+ 	\event onLoad
+ 	\return None
+ 	\condition Triggered when the script is loaded.
+ */
  // Find our module name
  bool cPythonScript::load( const QString& name )

[wpdev-commits] xmlscripts/scripts/system mysql_backup_db.py,1.3,1.4

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20434/system

Modified Files:
	mysql_backup_db.py 
Log Message:
Tweaks


Index: mysql_backup_db.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/mysql_backup_db.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mysql_backup_db.py	14 Jun 2004 17:46:54 -0000	1.3
--- mysql_backup_db.py	14 Jun 2004 18:01:15 -0000	1.4
***************
*** 39,44 ****
  time = 24 * 3600000 * 7 # Every Week
  
- worldtables = "`characters`, `corpses`, `corpses_equipment`, `effects`, `effects_properties`, `guilds`, `guilds_canidates`, `guilds_members`, `items`, `npcs`, `players`, `settings`, `skills`, `spawnregions,` `tags`, `uobject`, `uobjectmap`"
- 
  """
  	\command backupdb
--- 39,42 ----
***************
*** 99,108 ****
  				if accountsdriver == 'mysql':
  					database.open( database.ACCOUNTS )
! 					database.execute( "BACKUP TABLE `accounts` TO '%s'" % ( accountsdir ) )
  					database.close()
  					log( LOG_MESSAGE, "Accounts database saved to: %s" % ( accountsdir ) )
  				if worlddriver == 'mysql':
  					database.open( database.WORLD )
! 					database.execute( "BACKUP TABLE %s TO '%s'" % ( worldtables, worlddir ) )
  					database.close()
  					#else:
--- 97,106 ----
  				if accountsdriver == 'mysql':
  					database.open( database.ACCOUNTS )
! 					database.execute( "BACKUP TABLE %s TO '%s'" % ( database.MYSQL_ACCOUNTS, accountsdir ) )
  					database.close()
  					log( LOG_MESSAGE, "Accounts database saved to: %s" % ( accountsdir ) )
  				if worlddriver == 'mysql':
  					database.open( database.WORLD )
! 					database.execute( "BACKUP TABLE %s TO '%s'" % ( database.MYSQL_WORLD, worlddir ) )
  					database.close()
  					#else:

[wpdev-commits] xmlscripts/scripts/wolfpack database.py,1.2,1.3

[Richard M. <dr...@us...>]

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

Modified Files:
	database.py 
Log Message:
Tweaks :)


Index: database.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/database.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** database.py	11 Apr 2004 23:36:18 -0000	1.2
--- database.py	14 Jun 2004 17:59:17 -0000	1.3
***************
*** 10,13 ****
--- 10,19 ----
  WORLD = 2
  
+ # Let's make sure these tables are in sync with the current database
+ SQLITE_ACCOUNTS = "accounts"
+ MYSQL_ACCOUNTS = "`accounts`"
+ SQLITE_WORLD = "characters, corpses, corpses_equipment, effects, effects_properties, guilds, guilds_canidates, guilds_members, items, npcs, players, settings, skills, spawnregions, tags, uobject, uobjectmap"
+ MYSQL_WORLD = "`characters`, `corpses`, `corpses_equipment`, `effects`, `effects_properties`, `guilds`, `guilds_canidates`, `guilds_members`, `items`, `npcs`, `players`, `settings`, `skills`, `spawnregions`, `tags`, `uobject`, `uobjectmap`"
+ 
  query = _wolfpack.database.query
  execute = _wolfpack.database.execute

[wpdev-commits] xmlscripts/scripts/system mysql_optimize_db.py,1.4,1.5

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19041/system

Modified Files:
	mysql_optimize_db.py 
Log Message:
Tweaks :)


Index: mysql_optimize_db.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/mysql_optimize_db.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mysql_optimize_db.py	14 Jun 2004 17:44:57 -0000	1.4
--- mysql_optimize_db.py	14 Jun 2004 17:59:17 -0000	1.5
***************
*** 30,34 ****
  time = 24 * 3600000 # Value * Hours
  
! #optimizequery = "OPTIMIZE TABLE `accounts` , `boats` , `boats_itemids` , `boats_itemoffsets` , `bookpages` , `books` , `characters` , `corpses` , `corpses_equipment` , `effects` , `effects_properties` , `guilds` , `guilds_canidates` , `guilds_members` , `houses` , `items` , `multis` , `multis_bans` , `multis_friends` , `npcs` , `players` , `settings` , `skills` , `tags` , `uobject` , `uobjectmap` "
  
  """
--- 30,36 ----
  time = 24 * 3600000 # Value * Hours
  
! mysql = 'mysql'
! sqlite = 'sqlite'
! supporteddrivers = ['mysql','sqlite']
  
  """
***************
*** 40,49 ****
  
  def onLoad():
! 	if accountsdriver == 'mysql' or worlddriver == 'mysql':
  		wolfpack.addtimer( time, "system.mysql_optimize_db.timer", [] )
  		wolfpack.registercommand( "optimizedb", cmdoptimizedb )
  
  def cmdoptimizedb( socket, command, arguments ):
! 	if accountsdriver == 'mysql' or worlddriver == 'mysql':
  		socket.sysmessage( "Optimizing the database.", GRAY )
  		optimize_db()
--- 42,51 ----
  
  def onLoad():
! 	if accountsdriver in supporteddrivers or worlddriver in supporteddrivers:
  		wolfpack.addtimer( time, "system.mysql_optimize_db.timer", [] )
  		wolfpack.registercommand( "optimizedb", cmdoptimizedb )
  
  def cmdoptimizedb( socket, command, arguments ):
! 	if accountsdriver in supporteddrivers or worlddriver in supporteddrivers:
  		socket.sysmessage( "Optimizing the database.", GRAY )
  		optimize_db()
***************
*** 52,56 ****
  
  def timer( timer, args ):
! 	if accountsdriver == 'mysql' or worlddriver == 'mysql':
  		# Optimize and restart timer
  		optimize_db()
--- 54,58 ----
  
  def timer( timer, args ):
! 	if accountsdriver in supporteddrivers or worlddriver in supporteddrivers:
  		# Optimize and restart timer
  		optimize_db()
***************
*** 59,103 ****
  
  def optimize_db():
! 	if accountsdriver == 'mysql' or worlddriver == 'mysql':
  		try:
  			# What are we optimizing
! 			if accountsdriver == 'mysql' and worlddriver == 'mysql':
  				log( LOG_MESSAGE, "MySQL: Optimizing accounts and world databases..." )
! 			elif accountsdriver == 'mysql' or worlddriver == 'mysql':
! 				if accountsdriver == 'mysql':
  					log( LOG_MESSAGE, "MySQL: Optimizing accounts database..." )
! 				elif worlddriver == 'mysql':
  					log( LOG_MESSAGE, "MySQL: Optimizing world database..." )
  			# Time to optimize
! 			if accountsdriver == 'mysql':
! 				database.open( wolfpack.database.ACCOUNTS )
! 				database.execute( "OPTIMIZE TABLE `accounts`" )
  				database.close()
  				log( LOG_MESSAGE, "MySQL: Optimized accounts database!" )
! 			if worlddriver == 'mysql':
! 				database.open( wolfpack.database.WORLD )
! 				database.execute( "OPTIMIZE TABLE `characters`, `corpses`, `corpses_equipment`, `effects`, `effects_properties`, `guilds`, `guilds_canidates`, `guilds_members`, `items`, `npcs`, `players`, `settings`, `skills`, `spawnregions`, `tags`, `uobject`, `uobjectmap` " )
  				database.close()
  				log( LOG_MESSAGE, "MySQL: Optimized world database!" )
  		except:
  			log( LOG_MESSAGE, " MySQL: Performing world/accounts optimize failed." )
! 	if accountsdriver == 'sqlite' or worlddriver == 'sqlite':
  		try:
! 			if accountsdriver == 'sqlite' and worlddriver == 'sqlite':
  				log( LOG_MESSAGE, "SQLite: Optimizing accounts and world databases..." )
! 			elif accountsdriver == 'sqlite' or worlddriver == 'sqlite':
! 				if accountsdriver == 'sqlite':
  					log( LOG_MESSAGE, "SQLite: Optimizing accounts database..." )
! 				elif worlddriver == 'sqlite':
  					log( LOG_MESSAGE, "SQLite: Optimizing world database..." )
  			# Time to optimize
! 			if accountsdriver == 'sqlite':
! 				database.open( wolfpack.database.ACCOUNTS )
! 				database.execute( "VACUUM accounts" )
  				database.close()
  				log( LOG_MESSAGE, "SQLite: Optimized accounts database!" )
! 			if worlddriver == 'mysql':
! 				database.open( wolfpack.database.WORLD )
! 				database.execute( "VACUUM characters, corpses, corpses_equipment, effects, effects_properties, guilds, guilds_canidates, guilds_members, items, npcs, players, settings, skills, spawnregions, tags, uobject, uobjectmap " )
  				database.close()
  				log( LOG_MESSAGE, "SQLite: Optimized world database!" )
--- 61,105 ----
  
  def optimize_db():
! 	if accountsdriver == mysql or worlddriver == mysql:
  		try:
  			# What are we optimizing
! 			if accountsdriver == mysql and worlddriver == mysql:
  				log( LOG_MESSAGE, "MySQL: Optimizing accounts and world databases..." )
! 			elif accountsdriver == mysql or worlddriver == mysql:
! 				if accountsdriver == mysql:
  					log( LOG_MESSAGE, "MySQL: Optimizing accounts database..." )
! 				elif worlddriver == mysql:
  					log( LOG_MESSAGE, "MySQL: Optimizing world database..." )
  			# Time to optimize
! 			if accountsdriver == mysql:
! 				database.open( database.ACCOUNTS )
! 				database.execute( "OPTIMIZE TABLE %s" % database.MYSQL_ACCOUNTS )
  				database.close()
  				log( LOG_MESSAGE, "MySQL: Optimized accounts database!" )
! 			if worlddriver == mysql:
! 				database.open( database.WORLD )
! 				database.execute( "OPTIMIZE TABLE %s" % database.MYSQL_WORLD )
  				database.close()
  				log( LOG_MESSAGE, "MySQL: Optimized world database!" )
  		except:
  			log( LOG_MESSAGE, " MySQL: Performing world/accounts optimize failed." )
! 	if accountsdriver == sqlite or worlddriver == sqlite:
  		try:
! 			if accountsdriver == sqlite and worlddriver == sqlite:
  				log( LOG_MESSAGE, "SQLite: Optimizing accounts and world databases..." )
! 			elif accountsdriver == sqlite or worlddriver == sqlite:
! 				if accountsdriver == sqlite:
  					log( LOG_MESSAGE, "SQLite: Optimizing accounts database..." )
! 				elif worlddriver == sqlite:
  					log( LOG_MESSAGE, "SQLite: Optimizing world database..." )
  			# Time to optimize
! 			if accountsdriver == sqlite:
! 				database.open( database.ACCOUNTS )
! 				database.execute( "VACUUM %s" % database.SQLITE_ACCOUNTS )
  				database.close()
  				log( LOG_MESSAGE, "SQLite: Optimized accounts database!" )
! 			if worlddriver == mysql:
! 				database.open( database.WORLD )
! 				database.execute( "VACUUM %s" % database.SQLITE_WORLD )
  				database.close()
  				log( LOG_MESSAGE, "SQLite: Optimized world database!" )

[wpdev-commits] xmlscripts/scripts/system mysql_backup_db.py,1.2,1.3

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10155/system

Modified Files:
	mysql_backup_db.py 
Log Message:
Updated the tables.


Index: mysql_backup_db.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/mysql_backup_db.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mysql_backup_db.py	26 May 2004 11:50:33 -0000	1.2
--- mysql_backup_db.py	14 Jun 2004 17:46:54 -0000	1.3
***************
*** 39,43 ****
  time = 24 * 3600000 * 7 # Every Week
  
! worldtables = "`boats`, `boats_itemids`, `boats_itemoffsets`,`bookpages`,`books`, `characters`, `corpses`, `corpses_equipment`, `effects`, `effects_properties`, `guilds`, `guilds_canidates`, `guilds_members`, `houses`, `items`, `multis`, `multis_bans`, `multis_friends`, `npcs`, `players`, `settings`, `skills`, `tags`, `uobject`, `uobjectmap`"
  
  """
--- 39,43 ----
  time = 24 * 3600000 * 7 # Every Week
  
! worldtables = "`characters`, `corpses`, `corpses_equipment`, `effects`, `effects_properties`, `guilds`, `guilds_canidates`, `guilds_members`, `items`, `npcs`, `players`, `settings`, `skills`, `spawnregions,` `tags`, `uobject`, `uobjectmap`"
  
  """

[wpdev-commits] xmlscripts/scripts/system mysql_optimize_db.py,1.3,1.4

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8682/system

Modified Files:
	mysql_optimize_db.py 
Log Message:
Updated the optimize command.
SQLite is now optimized
Database tables updated.


Index: mysql_optimize_db.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/mysql_optimize_db.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mysql_optimize_db.py	24 May 2004 08:48:58 -0000	1.3
--- mysql_optimize_db.py	14 Jun 2004 17:44:57 -0000	1.4
***************
*** 63,72 ****
  			# What are we optimizing
  			if accountsdriver == 'mysql' and worlddriver == 'mysql':
! 				log( LOG_MESSAGE, "Optimizing accounts and world databases..." )
  			elif accountsdriver == 'mysql' or worlddriver == 'mysql':
  				if accountsdriver == 'mysql':
! 					log( LOG_MESSAGE, "Optimizing accounts database..." )
  				elif worlddriver == 'mysql':
! 					log( LOG_MESSAGE, "Optimizing world database..." )
  			# Time to optimize
  			if accountsdriver == 'mysql':
--- 63,72 ----
  			# What are we optimizing
  			if accountsdriver == 'mysql' and worlddriver == 'mysql':
! 				log( LOG_MESSAGE, "MySQL: Optimizing accounts and world databases..." )
  			elif accountsdriver == 'mysql' or worlddriver == 'mysql':
  				if accountsdriver == 'mysql':
! 					log( LOG_MESSAGE, "MySQL: Optimizing accounts database..." )
  				elif worlddriver == 'mysql':
! 					log( LOG_MESSAGE, "MySQL: Optimizing world database..." )
  			# Time to optimize
  			if accountsdriver == 'mysql':
***************
*** 74,85 ****
  				database.execute( "OPTIMIZE TABLE `accounts`" )
  				database.close()
! 				log( LOG_MESSAGE, "Optimized accounts database!" )
  			if worlddriver == 'mysql':
  				database.open( wolfpack.database.WORLD )
! 				database.execute( "OPTIMIZE TABLE `boats`, `boats_itemids`, `boats_itemoffsets`,`bookpages`,`books`, `characters`, `corpses`, `corpses_equipment`, `effects`, `effects_properties`, `guilds`, `guilds_canidates`, `guilds_members`, `houses`, `items`, `multis`, `multis_bans`, `multis_friends`, `npcs`, `players`, `settings`, `skills`, `tags`, `uobject`, `uobjectmap` " )
  				database.close()
! 				log( LOG_MESSAGE, "Optimized world database!" )
  		except:
! 			log( LOG_MESSAGE, " Performing world optimize failed." )
  	return
  
--- 74,107 ----
  				database.execute( "OPTIMIZE TABLE `accounts`" )
  				database.close()
! 				log( LOG_MESSAGE, "MySQL: Optimized accounts database!" )
  			if worlddriver == 'mysql':
  				database.open( wolfpack.database.WORLD )
! 				database.execute( "OPTIMIZE TABLE `characters`, `corpses`, `corpses_equipment`, `effects`, `effects_properties`, `guilds`, `guilds_canidates`, `guilds_members`, `items`, `npcs`, `players`, `settings`, `skills`, `spawnregions`, `tags`, `uobject`, `uobjectmap` " )
  				database.close()
! 				log( LOG_MESSAGE, "MySQL: Optimized world database!" )
  		except:
! 			log( LOG_MESSAGE, " MySQL: Performing world/accounts optimize failed." )
! 	if accountsdriver == 'sqlite' or worlddriver == 'sqlite':
! 		try:
! 			if accountsdriver == 'sqlite' and worlddriver == 'sqlite':
! 				log( LOG_MESSAGE, "SQLite: Optimizing accounts and world databases..." )
! 			elif accountsdriver == 'sqlite' or worlddriver == 'sqlite':
! 				if accountsdriver == 'sqlite':
! 					log( LOG_MESSAGE, "SQLite: Optimizing accounts database..." )
! 				elif worlddriver == 'sqlite':
! 					log( LOG_MESSAGE, "SQLite: Optimizing world database..." )
! 			# Time to optimize
! 			if accountsdriver == 'sqlite':
! 				database.open( wolfpack.database.ACCOUNTS )
! 				database.execute( "VACUUM accounts" )
! 				database.close()
! 				log( LOG_MESSAGE, "SQLite: Optimized accounts database!" )
! 			if worlddriver == 'mysql':
! 				database.open( wolfpack.database.WORLD )
! 				database.execute( "VACUUM characters, corpses, corpses_equipment, effects, effects_properties, guilds, guilds_canidates, guilds_members, items, npcs, players, settings, skills, spawnregions, tags, uobject, uobjectmap " )
! 				database.close()
! 				log( LOG_MESSAGE, "SQLite: Optimized world database!" )
! 		except:
! 			log( LOG_MESSAGE, "SQLite: Performing world/accounts optimize failed." )
  	return
  

[wpdev-commits] xmlscripts/scripts/magic circle7.py,1.5,1.6

[Ki H. P. <kh...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/magic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27578/xmlscripts/scripts/magic

Modified Files:
	circle7.py 
Log Message:
polymorph duration fix


Index: circle7.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle7.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** circle7.py	13 Jun 2004 12:21:35 -0000	1.5
--- circle7.py	13 Jun 2004 12:23:05 -0000	1.6
***************
*** 371,375 ****
  		char.update()
  
! 		duration = int(char.skill[MAGERY] * 200)
  		char.addtimer(duration, "magic.circle7.polymorph_expire", [], 1)
  
--- 371,375 ----
  		char.update()
  
! 		duration = int(300 + char.skill[MAGERY] * 100)
  		char.addtimer(duration, "magic.circle7.polymorph_expire", [], 1)
  

[wpdev-commits] xmlscripts/scripts/magic circle7.py,1.4,1.5

[Ki H. P. <kh...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/magic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23773/xmlscripts/scripts/magic

Modified Files:
	circle7.py 
Log Message:
polymorph fix.


Index: circle7.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle7.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** circle7.py	26 May 2004 13:07:22 -0000	1.4
--- circle7.py	13 Jun 2004 12:21:35 -0000	1.5
***************
*** 371,375 ****
  		char.update()
  
! 		duration = int(char.skill[MAGERY] / 100)
  		char.addtimer(duration, "magic.circle7.polymorph_expire", [], 1)
  
--- 371,375 ----
  		char.update()
  
! 		duration = int(char.skill[MAGERY] * 200)
  		char.addtimer(duration, "magic.circle7.polymorph_expire", [], 1)
  

[wpdev-commits] wolfpack uobject.cpp,1.164,1.165

[Ki H. P. <kh...@us...>]

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

Modified Files:
	uobject.cpp 
Log Message:
removeevent segfault fix


Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** uobject.cpp	3 Jun 2004 14:42:59 -0000	1.164
--- uobject.cpp	13 Jun 2004 07:12:26 -0000	1.165
***************
*** 377,381 ****
  			newScriptChain[0] = reinterpret_cast<cPythonScript*>( count - 1 );
  
! 			for ( unsigned int i = 1; i < count; ++i )
  			{
  				if ( scriptChain[i]->name() != name )
--- 377,381 ----
  			newScriptChain[0] = reinterpret_cast<cPythonScript*>( count - 1 );
  
! 			for ( unsigned int i = 1; i <= count; ++i )
  			{
  				if ( scriptChain[i]->name() != name )

[wpdev-commits] xmlscripts/definitions/items/armory/colored/plate bronze.xml,1.4,1.5

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/plate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1281/armory/colored/plate

Modified Files:
	bronze.xml 
Log Message:
Dupe Item Errors.


Index: bronze.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/plate/bronze.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bronze.xml	8 Jun 2004 19:54:39 -0000	1.4
--- bronze.xml	10 Jun 2004 00:41:13 -0000	1.5
***************
*** 11,15 ****
  	<!-- plate armor -->
  	<!-- female plate armor -->
! 	<item id="1c04_agapite" inherit="1c04">
  		<baseid>1c04</baseid>
  		<bronze_armor />
--- 11,15 ----
  	<!-- plate armor -->
  	<!-- female plate armor -->
! 	<item id="1c04_bronze" inherit="1c04">
  		<baseid>1c04</baseid>
  		<bronze_armor />

[wpdev-commits] xmlscripts/definitions/items/misc holiday.xml,1.5,1.6

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/items/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1281/misc

Modified Files:
	holiday.xml 
Log Message:
Dupe Item Errors.


Index: holiday.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/misc/holiday.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** holiday.xml	9 Jun 2004 21:39:26 -0000	1.5
--- holiday.xml	10 Jun 2004 00:41:13 -0000	1.6
***************
*** 60,75 ****
  
  	<!-- Rose of Trinsic -->
! 	<item id="232b">
! 		<id>0x232b</id>
  		<category>Holiday\Rose of Trinsic 1</category>
  	</item>
  
! 	<item id="232c">
! 		<id>0x232c</id>
  		<category>Holiday\Rose of Trinsic 3</category>
  	</item>
  
! 	<item id="232d">
! 		<id>0x232d</id>
  		<category>Holiday\Rose of Trinsic 3</category>
  	</item>
--- 60,75 ----
  
  	<!-- Rose of Trinsic -->
! 	<item id="234b">
! 		<id>0x234b</id>
  		<category>Holiday\Rose of Trinsic 1</category>
  	</item>
  
! 	<item id="234c">
! 		<id>0x234c</id>
  		<category>Holiday\Rose of Trinsic 3</category>
  	</item>
  
! 	<item id="234d">
! 		<id>0x234d</id>
  		<category>Holiday\Rose of Trinsic 3</category>
  	</item>

[wpdev-commits] wolfpack basechar.cpp,1.117,1.118 basechar.h,1.70,1.71 customtags.cpp,1.46,1.47 customtags.h,1.28,1.29 defines.h,1.52,1.53 definitions.cpp,1.7,1.8 targetrequests.h,1.66,1.67 timing.cpp,1.7,1.8 typedefs.h,1.36,1.37 uobject.h,1.97,1.98 wolfpack.pro,1.195,1.196 world.h,1.13,1.14

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

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

Modified Files:
	basechar.cpp basechar.h customtags.cpp customtags.h defines.h 
	definitions.cpp targetrequests.h timing.cpp typedefs.h 
	uobject.h wolfpack.pro world.h 
Log Message:
Some compiler warning fixes

Index: world.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** world.h	2 Jun 2004 15:04:08 -0000	1.13
--- world.h	10 Jun 2004 00:27:12 -0000	1.14
***************
*** 108,111 ****
--- 108,112 ----
  		return _lastCharSerial + 1;
  	}
+ 	
  	SERIAL findItemSerial() const
  	{

Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** targetrequests.h	2 Jun 2004 15:04:07 -0000	1.66
--- targetrequests.h	10 Jun 2004 00:27:12 -0000	1.67
***************
*** 57,61 ****
  	virtual bool responsed( cUOSocket* socket, cUORxTarget* target )
  	{
- 		int curtim = Server::instance()->time();
  		P_ITEM pi = FindItemBySerial( target->serial() );
  		P_PLAYER pc_currchar = socket->player();
--- 57,60 ----
***************
*** 71,75 ****
  			return true;
  
! 		unsigned int currentTime = QDateTime::currentDateTime().toTime_t();
  		unsigned int age = currentTime - corpse->murderTime();
  		P_CHAR murderer = FindCharBySerial(corpse->murderer());
--- 70,74 ----
  			return true;
  
! 		unsigned int currentTime = Server::instance()->time();
  		unsigned int age = currentTime - corpse->murderTime();
  		P_CHAR murderer = FindCharBySerial(corpse->murderer());

Index: customtags.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** customtags.h	2 Jun 2004 15:04:04 -0000	1.28
--- customtags.h	10 Jun 2004 00:27:12 -0000	1.29
***************
*** 70,73 ****
--- 70,74 ----
  	cVariant( const QString& );
  	cVariant( int );
+ 	cVariant( unsigned int);
  	cVariant( cBaseChar* );
  	cVariant( cItem* );

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** basechar.cpp	6 Jun 2004 19:26:50 -0000	1.117
--- basechar.cpp	10 Jun 2004 00:27:12 -0000	1.118
***************
*** 2607,2616 ****
  		if ( scriptChain )
  		{
! 			cPythonScript::callChainedEventHandler( EVENT_DEATH, scriptChain, args );
  		}
  		Py_DECREF( args );
  	}
  
! 	return true;
  }
  
--- 2607,2616 ----
  		if ( scriptChain )
  		{
! 			result = cPythonScript::callChainedEventHandler( EVENT_DEATH, scriptChain, args );
  		}
  		Py_DECREF( args );
  	}
  
! 	return result;
  }
  
***************
*** 3142,3145 ****
--- 3142,3148 ----
  bool cBaseChar::sysmessage( const QString& message, unsigned short color, unsigned short font )
  {
+ 	Q_UNUSED(message);
+ 	Q_UNUSED(color);
+ 	Q_UNUSED(font);
  	return false;
  }
***************
*** 3147,3150 ****
--- 3150,3157 ----
  bool cBaseChar::sysmessage( unsigned int message, const QString& params, unsigned short color, unsigned short font )
  {
+ 	Q_UNUSED(message);
+ 	Q_UNUSED(params);
+ 	Q_UNUSED(color);
+ 	Q_UNUSED(font);
  	return false;
  }
***************
*** 3152,3155 ****
--- 3159,3167 ----
  bool cBaseChar::message( const QString& message, unsigned short color, cUObject* source, unsigned short font, unsigned char mode )
  {
+ 	Q_UNUSED(message);
+ 	Q_UNUSED(color);
+ 	Q_UNUSED(source);
+ 	Q_UNUSED(font);
+ 	Q_UNUSED(mode);
  	return false;
  }
***************
*** 3157,3160 ****
--- 3169,3173 ----
  bool cBaseChar::send( cUOPacket* packet )
  {
+ 	Q_UNUSED(packet);
  	return false;
  }

Index: uobject.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** uobject.h	3 Jun 2004 14:42:59 -0000	1.97
--- uobject.h	10 Jun 2004 00:27:12 -0000	1.98
***************
*** 39,42 ****
--- 39,43 ----
  #include "spawnregions.h"
  #include "pythonscript.h"
+ #include "world.h"
  
  // System includes
***************
*** 132,140 ****
  	bool isItem() const
  	{
! 		return ( serial_ != INVALID_SERIAL && serial_ > 0 && serial_ >= 0x40000000 );
  	}
  	bool isChar() const
  	{
! 		return ( serial_ != INVALID_SERIAL && serial_ > 0 && serial_ < 0x40000000 );
  	}
  	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL ) = 0;
--- 133,141 ----
  	bool isItem() const
  	{
! 		return isItemSerial( serial_ );
  	}
  	bool isChar() const
  	{
! 		return isCharSerial( serial_ );
  	}
  	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL ) = 0;

Index: typedefs.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/typedefs.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** typedefs.h	3 Jun 2004 14:42:59 -0000	1.36
--- typedefs.h	10 Jun 2004 00:27:12 -0000	1.37
***************
*** 45,54 ****
  typedef int GUILDID;
  typedef unsigned int TIMERVAL;
- typedef int PLAYER;
- typedef int CHARACTER;
  typedef unsigned char LIGHTLEVEL;
  typedef unsigned char SECONDS;
! typedef int ITEM;
! typedef int SERIAL;
  typedef cItem* P_ITEM;
  typedef const cItem* PC_ITEM;
--- 45,51 ----
  typedef int GUILDID;
  typedef unsigned int TIMERVAL;
  typedef unsigned char LIGHTLEVEL;
  typedef unsigned char SECONDS;
! typedef unsigned int SERIAL;
  typedef cItem* P_ITEM;
  typedef const cItem* PC_ITEM;

Index: definitions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** definitions.cpp	2 Jun 2004 15:04:04 -0000	1.7
--- definitions.cpp	10 Jun 2004 00:27:12 -0000	1.8
***************
*** 707,711 ****
  {
  	PyObject_HEAD_INIT( NULL )
! 	0, "element", sizeof( wpElementType ), 0, wpDealloc, 0, ( getattrfunc ) wpElement_getAttr
  };
  
--- 707,717 ----
  {
  	PyObject_HEAD_INIT( NULL )
! 	0,
! 	"element", 
! 	sizeof( wpElementType ), 
! 	0, 
! 	wpDealloc, 
! 	0, 
! 	( getattrfunc ) wpElement_getAttr
  };
  
***************
*** 880,881 ****
--- 886,888 ----
  	}
  }
+ 

Index: defines.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/defines.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** defines.h	2 Jun 2004 15:04:04 -0000	1.52
--- defines.h	10 Jun 2004 00:27:12 -0000	1.53
***************
*** 133,137 ****
  
  #define MY_CLOCKS_PER_SEC 1000
! #define INVALID_SERIAL -1
  
  #define CONN_MAIN 1
--- 133,137 ----
  
  #define MY_CLOCKS_PER_SEC 1000
! #define INVALID_SERIAL (~0)
  
  #define CONN_MAIN 1

Index: customtags.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** customtags.cpp	2 Jun 2004 15:04:04 -0000	1.46
--- customtags.cpp	10 Jun 2004 00:27:12 -0000	1.47
***************
*** 116,119 ****
--- 116,128 ----
  
  /*!
+   Constructs a new variant with an integer value, \a val.
+ */
+ cVariant::cVariant( unsigned int val )
+ {
+ 	typ = Int;
+ 	value.i = (int)val;
+ }
+ 
+ /*!
    Constructs a new variant with a floating point value, \a val.
  */

Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.195
retrieving revision 1.196
diff -C2 -d -r1.195 -r1.196
*** wolfpack.pro	27 May 2004 03:02:24 -0000	1.195
--- wolfpack.pro	10 Jun 2004 00:27:12 -0000	1.196
***************
*** 34,46 ****
  	# we dont use those.
  	QMAKE_LIBS_X11 -= -lX11 -lXext -lm
- 
- 	# TODO: rewrite and put into ./configure
- 	release {
- 		CONFIG += warn_off
- 		linux {
- 			QMAKE_CFLAGS_RELEASE = -O3
- 			QMAKE_CFLAGS += -march=athlon-xp -O3 -pipe -fomit-frame-pointer -falign-functions=16 -falign-labels=8 -falign-loops=8 -falign-jumps=8 -fsched-spec-load -frerun-loop-opt -finline-limit=800 -funroll-loops -fprefetch-loop-arrays -ffast-math -mfpmath=sse -msse -m3dnow -fschedule-insns2 -fexpensive-optimizations -fmove-all-movables -fdelete-null-pointer-checks
- 		}
- 	}
  }
  
--- 34,37 ----

Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** basechar.h	2 Jun 2004 15:04:02 -0000	1.70
--- basechar.h	10 Jun 2004 00:27:12 -0000	1.71
***************
*** 621,625 ****
  		uchar lock; // 0: Up, 1: Down, 2: Locked (Default: 0)
  
! 		stSkillValue() : value( 0 ), cap( 1000 ), lock( 0 ), changed( false )
  		{
  		}
--- 621,625 ----
  		uchar lock; // 0: Up, 1: Down, 2: Locked (Default: 0)
  
! 		stSkillValue() : changed( false ), value( 0 ), cap( 1000 ), lock( 0 )
  		{
  		}

Index: timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** timing.cpp	2 Jun 2004 15:04:07 -0000	1.7
--- timing.cpp	10 Jun 2004 00:27:12 -0000	1.8
***************
*** 290,296 ****
  	}
  
- 	unsigned int oldStamina = character->stamina();
- 	unsigned int oldMana = character->mana();
- 
  	if ( character->regenHitpointsTime() <= time )
  	{
--- 290,293 ----
***************
*** 475,479 ****
  
  void cTiming::removeDecayItem(P_ITEM item) {
! 	register DecayIterator it;
  	register SERIAL serial = item->serial();
  	for (it = decayitems.begin(); it != decayitems.end(); ++it) {
--- 472,476 ----
  
  void cTiming::removeDecayItem(P_ITEM item) {
! 	DecayIterator it;
  	register SERIAL serial = item->serial();
  	for (it = decayitems.begin(); it != decayitems.end(); ++it) {
***************
*** 486,490 ****
  
  void cTiming::removeDecaySerial(SERIAL serial) {
! 	register DecayIterator it;
  	for (it = decayitems.begin(); it != decayitems.end(); ++it) {
  		if ((*it).second == serial) {
--- 483,487 ----
  
  void cTiming::removeDecaySerial(SERIAL serial) {
! 	DecayIterator it;
  	for (it = decayitems.begin(); it != decayitems.end(); ++it) {
  		if ((*it).second == serial) {
***************
*** 494,495 ****
--- 491,493 ----
  	}
  }
+ 

[wpdev-commits] wolfpack/network uosocket.cpp,1.377,1.378

[Sebastian H. <dar...@us...>]

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

Modified Files:
	uosocket.cpp 
Log Message:
Enabled 6th character slot.

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.377
retrieving revision 1.378
diff -C2 -d -r1.377 -r1.378
*** uosocket.cpp	9 Jun 2004 22:49:43 -0000	1.377
--- uosocket.cpp	9 Jun 2004 22:53:19 -0000	1.378
***************
*** 794,800 ****
  
  	// If we have more than 5 characters
! 	if ( characters.size() >= 5 )
  	{
! 		cancelCreate( tr( "You already have more than 5 characters" ) )
  	}
  
--- 794,800 ----
  
  	// If we have more than 5 characters
! 	if ( characters.size() >= 6 )
  	{
! 		cancelCreate( tr( "You already have more than 6 characters" ) )
  	}
  

[wpdev-commits] wolfpack/network uosocket.cpp,1.376,1.377 uotxpackets.h,1.107,1.108

[Sebastian H. <dar...@us...>]

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

Modified Files:
	uosocket.cpp uotxpackets.h 
Log Message:
Enabled 6th character slot.

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.376
retrieving revision 1.377
diff -C2 -d -r1.376 -r1.377
*** uosocket.cpp	2 Jun 2004 15:04:10 -0000	1.376
--- uosocket.cpp	9 Jun 2004 22:49:43 -0000	1.377
***************
*** 522,526 ****
  	clientFeatures.setLbr( true );
  	clientFeatures.setT2a( true );
! 	clientFeatures.setShort( 1, 0x801f ); // AoS TEST
  	send( &clientFeatures );
  
--- 522,526 ----
  	clientFeatures.setLbr( true );
  	clientFeatures.setT2a( true );
! 	clientFeatures.setShort( 1, 0xFFFF ); // AoS TEST
  	send( &clientFeatures );
  

Index: uotxpackets.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** uotxpackets.h	2 Jun 2004 15:04:10 -0000	1.107
--- uotxpackets.h	9 Jun 2004 22:49:43 -0000	1.108
***************
*** 125,129 ****
  	short charLimit;
  public:
! 	cUOTxCharTownList() : cUOPacket( 9 ), flags( 0x8 ), charLimit( -1 )
  	{
  	}
--- 125,129 ----
  	short charLimit;
  public:
! 	cUOTxCharTownList() : cUOPacket( 9 ), flags( 0x48 ), charLimit( -1 )
  	{
  	}

[wpdev-commits] xmlscripts/definitions/items/armory/helmets kabuto.xml,1.1,1.2

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24039/armory/helmets

Modified Files:
	kabuto.xml 
Log Message:
Missing cliloc? :/


Index: kabuto.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/kabuto.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kabuto.xml	9 Jun 2004 21:40:37 -0000	1.1
--- kabuto.xml	9 Jun 2004 22:03:22 -0000	1.2
***************
*** 11,14 ****
--- 11,15 ----
  	<!-- Kabuto North-South -->
  	<item id="236d">
+ 		<name>kabuto</name>
  		<id>0x236d</id>
  		<decay />

[wpdev-commits] xmlscripts/scripts/wolfpack armorinfo.py,1.5,1.6

[Richard M. <dr...@us...>]

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

Modified Files:
	armorinfo.py 
Log Message:
New Helm


Index: armorinfo.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/armorinfo.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** armorinfo.py	26 May 2004 13:07:27 -0000	1.5
--- armorinfo.py	9 Jun 2004 21:47:26 -0000	1.6
***************
*** 826,829 ****
--- 826,839 ----
  		RESISTANCE_POISON: 3,
  		RESISTANCE_ENERGY: 3
+ 	},
+ 	# Kabuto
+ 	# This will need to be adjusted later for balance once Stratics has data.
+ 	'236d': {
+ 		REQSTR: 45,
+ 		RESISTANCE_PHYSICAL: 4,
+ 		RESISTANCE_FIRE: 3,
+ 		RESISTANCE_COLD: 4,
+ 		RESISTANCE_POISON: 5,
+ 		RESISTANCE_ENERGY: 6
  	}
  }

[wpdev-commits] xmlscripts/definitions/system encryption.xml,1.2,1.3

[Sebastian H. <dar...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3898/system

Modified Files:
	encryption.xml 
Log Message:
New encryption keys for the 4.0.3 client.

Index: encryption.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/encryption.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** encryption.xml	13 May 2004 07:03:55 -0000	1.2
--- encryption.xml	9 Jun 2004 21:44:17 -0000	1.3
***************
*** 12,15 ****
--- 12,16 ----
  
  		<!-- Client identification string (optional) ; Key1 ; Key2 -->
+ 		<item> Client 4.0.3 ; 0x2EBBB7CD ; 0xA2495E7F </item>
  		<item> Client 4.0.2 ; 0x2E63ADDD ; 0xA225227F </item>
  		<item> Client 4.0.1 ; 0x2E2BA7ED ; 0xA2017E7F </item>

[wpdev-commits] xmlscripts/definitions/items/armory armory_list.xml,1.8,1.9

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32016/armory

Modified Files:
	armory_list.xml 
Log Message:
New Artwork, new helm!


Index: armory_list.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/armory_list.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** armory_list.xml	19 Mar 2004 22:15:49 -0000	1.8
--- armory_list.xml	9 Jun 2004 21:40:37 -0000	1.9
***************
*** 44,47 ****
--- 44,48 ----
  	<include file="definitions/items/armory/helmets/close_helmet.xml"/>
  	<include file="definitions/items/armory/helmets/helmet.xml"/>
+ 	<include file="definitions/items/armory/helmets/kabuto.xml"/>
  	<include file="definitions/items/armory/helmets/nose_helm.xml"/>
  	<include file="definitions/items/armory/helmets/orc_helm.xml"/>

[wpdev-commits] xmlscripts/definitions/items/armory/helmets kabuto.xml,NONE,1.1

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32016/armory/helmets

Added Files:
	kabuto.xml 
Log Message:
New Artwork, new helm!


--- NEW FILE: kabuto.xml ---
<!--
/*=========================================================
 *   )      (\_     | WOLFPACK 13.0.0 Scripts
 *  ((    _/{  "-;  | Created by: Dreoth
 *   )).-' {{ ;'`   | Revised by:
 *  ( (  ;._ \\     | Last modification:
 *=======================================================*/
-->
<definitions>

	<!-- Kabuto North-South -->
	<item id="236d">
		<id>0x236d</id>
		<decay />
		<nodye />
		<durability><random min="40" max="50" /></durability>
		<tag name="resname" value="iron" />
		<restock>10</restock>
		<smelt>12</smelt>
		<weight>5.0</weight>
		<buyprice>127</buyprice>
		<sellprice>63</sellprice>
		<type>1009</type>
		<events>equipment</events>
		<category>Armor\Base\Helmets\Kabuto (N/S)</category>
	</item>

	<!-- Kabuto East-West-->
	<item id="236c" inherit="236d">
		<id>0x236c</id>
		<baseid>236d</baseid>
		<category>Armor\Base\Helmets\Kabuto (E/W)</category>
	</item>

</definitions>