[wpdev-commits] wolfpack commands.cpp,1.209,1.210 gumps.cpp,1.147,1.148 gumps.h,1.34,1.35 makemenus.cpp,1.60,1.61 makemenus.h,1.31,1.32 multis.cpp,1.35,1.36 multis.h,1.22,1.23 territories.cpp,1.34,1.35 tracking.cpp,1.18,1.19

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

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv9160

Modified Files:
	commands.cpp gumps.cpp gumps.h makemenus.cpp makemenus.h 
	multis.cpp multis.h territories.cpp tracking.cpp 
Log Message:
Added GO_MENU, using the AddMenu engine
Changed cGump interface to receive the gump choice data by reference instead of copy


Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.209
retrieving revision 1.210
diff -C2 -d -r1.209 -r1.210
*** commands.cpp	8 Jan 2004 08:33:38 -0000	1.209
--- commands.cpp	8 Jan 2004 23:43:57 -0000	1.210
***************
*** 213,216 ****
--- 213,217 ----
  	{
  		socket->sysMessage( "Bringin up travel gump" );
+ 		MakeMenus::instance()->callMakeMenu( socket, "GO_MENU" );
  		return;
  	}

Index: gumps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** gumps.cpp	23 Nov 2003 03:46:22 -0000	1.147
--- gumps.cpp	8 Jan 2004 23:43:57 -0000	1.148
***************
*** 118,122 ****
  
  
! void cGump::handleResponse( cUOSocket* socket, gumpChoice_st choice )
  {
  	Q_UNUSED(socket);
--- 118,122 ----
  
  
! void cGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
  {
  	Q_UNUSED(socket);
***************
*** 190,194 ****
  }
  
! void cSpawnRegionInfoGump::handleResponse( cUOSocket* socket, gumpChoice_st choice )
  {
  	if( choice.button == 0 )
--- 190,194 ----
  }
  
! void cSpawnRegionInfoGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
  {
  	if( choice.button == 0 )
***************
*** 260,264 ****
  }
  
! void cTagsInfoGump::handleResponse( cUOSocket* socket, gumpChoice_st choice )
  {
  	if( choice.button == 0 )
--- 260,264 ----
  }
  
! void cTagsInfoGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
  {
  	if( choice.button == 0 )
***************
*** 336,340 ****
  }
    
! void cWhoMenuGump::handleResponse( cUOSocket *socket, gumpChoice_st choice )
  {
  	if( choice.button == 0 )
--- 336,340 ----
  }
    
! void cWhoMenuGump::handleResponse( cUOSocket *socket, const gumpChoice_st& choice )
  {
  	if( choice.button == 0 )
***************
*** 427,431 ****
  }
  
! void cSocketInfoGump::handleResponse( cUOSocket* socket, gumpChoice_st choice )
  {
  	if( !socket_ )
--- 427,431 ----
  }
  
! void cSocketInfoGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
  {
  	if( !socket_ )
***************
*** 497,501 ****
  		case 6:
  			{
! 				std::map< UINT16, QString >::iterator it = choice.textentries.find( 1 );
  				if( it != choice.textentries.end() )
  					socket_->sysMessage( it->second );
--- 497,501 ----
  		case 6:
  			{
! 				std::map< UINT16, QString >::const_iterator it = choice.textentries.find( 1 );
  				if( it != choice.textentries.end() )
  					socket_->sysMessage( it->second );
***************
*** 587,591 ****
  }
    
! void cPagesGump::handleResponse( cUOSocket *socket, gumpChoice_st choice )
  {
  	if( choice.button == 0 )
--- 587,591 ----
  }
    
! void cPagesGump::handleResponse( cUOSocket *socket, const gumpChoice_st& choice )
  {
  	if( choice.button == 0 )
***************
*** 691,695 ****
  }
  
! void cPageInfoGump::handleResponse( cUOSocket* socket, gumpChoice_st choice )
  {
  	if( choice.button == 0 )
--- 691,695 ----
  }
  
! void cPageInfoGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
  {
  	if( choice.button == 0 )
***************
*** 757,761 ****
  		case 4:
  			{
! 				std::map< UINT16, QString >::iterator it = choice.textentries.find( 1 );
  				if( it != choice.textentries.end() )
  					socket_->sysMessage( it->second );
--- 757,761 ----
  		case 4:
  			{
! 				std::map< UINT16, QString >::const_iterator it = choice.textentries.find( 1 );
  				if( it != choice.textentries.end() )
  					socket_->sysMessage( it->second );
***************
*** 878,882 ****
  }
  
! void cHelpGump::handleResponse( cUOSocket* socket, gumpChoice_st choice )
  {
  	if( choice.button == 0 ) // canceled
--- 878,882 ----
  }
  
! void cHelpGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
  {
  	if( choice.button == 0 ) // canceled
***************
*** 901,905 ****
  
  		QStringList lines;
! 		std::map< UINT16, QString >::iterator it = choice.textentries.begin();
  		while( it != choice.textentries.end() )
  		{
--- 901,905 ----
  
  		QStringList lines;
! 		std::map< UINT16, QString >::const_iterator it = choice.textentries.begin();
  		while( it != choice.textentries.end() )
  		{

Index: gumps.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** gumps.h	5 Jan 2004 06:25:37 -0000	1.34
--- gumps.h	8 Jan 2004 23:43:57 -0000	1.35
***************
*** 92,96 ****
  	Q_UINT32 addRawText( const QString &data );
  
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  	
  	// Comfort Setters
--- 92,96 ----
  	Q_UINT32 addRawText( const QString &data );
  
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  	
  	// Comfort Setters
***************
*** 221,225 ****
  	cSpawnRegionInfoGump( cSpawnRegion* region );
  	
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  };
  
--- 221,225 ----
  	cSpawnRegionInfoGump( cSpawnRegion* region );
  	
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  };
  
***************
*** 232,236 ****
  	cTagsInfoGump( const cUObject* object_ );
  
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  };
  
--- 232,236 ----
  	cTagsInfoGump( const cUObject* object_ );
  
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  };
  
***************
*** 244,248 ****
  	cWhoMenuGump( UINT32 page );
  
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  };
  
--- 244,248 ----
  	cWhoMenuGump( UINT32 page );
  
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  };
  
***************
*** 255,259 ****
  	cSocketInfoGump( cUOSocket* socket_ );
  
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  };
  
--- 255,259 ----
  	cSocketInfoGump( cUOSocket* socket_ );
  
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  };
  
***************
*** 269,273 ****
  	cPagesGump( UINT32 page, WPPAGE_TYPE ptype );
  
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  };
  
--- 269,273 ----
  	cPagesGump( UINT32 page, WPPAGE_TYPE ptype );
  
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  };
  
***************
*** 280,284 ****
  	cPageInfoGump( cPage* page_ );
  
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  };
  
--- 280,284 ----
  	cPageInfoGump( cPage* page_ );
  
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  };
  
***************
*** 291,295 ****
  	cHelpGump( SERIAL charSerial );
  
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  };
  
--- 291,295 ----
  	cHelpGump( SERIAL charSerial );
  
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  };
  

Index: makemenus.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/makemenus.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** makemenus.cpp	14 Sep 2003 16:09:01 -0000	1.60
--- makemenus.cpp	8 Jan 2004 23:43:57 -0000	1.61
***************
*** 762,765 ****
--- 762,767 ----
  	QString TagName = Tag->name();
  	QString Value = Tag->getValue();
+ 	if ( TagName == "params" )
+ 		params = Value;
  
  	cMakeSection::processNode( Tag );
***************
*** 781,784 ****
--- 783,791 ----
  		return;
  	}
+ 	else if ( name_ == "go" )
+ 	{
+ 		void commandGo( cUOSocket *socket, const QString &command, QStringList &args ) throw();
+ 		commandGo( socket, "go", QStringList::split(" ", params) );
+ 	}
  }
  
***************
*** 1467,1471 ****
  }
  
! void cMakeMenuGump::handleResponse( cUOSocket* socket, gumpChoice_st choice )
  {
  	if( choice.button == 0 || !socket || !menu_ )
--- 1474,1478 ----
  }
  
! void cMakeMenuGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
  {
  	if( choice.button == 0 || !socket || !menu_ )
***************
*** 1566,1576 ****
  			return;
  		cMakeAction* action = actions[ choice.button - submenus.size() - 4 - 1000 ];
! 		std::vector< UINT32 > switches = choice.switches;
! 		std::vector< UINT32 >::iterator it = switches.begin();
  		if( !action->makesections().empty() )
  		{
  			cMakeMenu* basemenu = menu_->baseMenu();
  			cMakeSection* section = action->makesections()[0];
! 			while( it != switches.end() )
  			{
  				if( (*it) == 1 )
--- 1573,1582 ----
  			return;
  		cMakeAction* action = actions[ choice.button - submenus.size() - 4 - 1000 ];
! 		std::vector< UINT32 >::const_iterator it = choice.switches.begin();
  		if( !action->makesections().empty() )
  		{
  			cMakeMenu* basemenu = menu_->baseMenu();
  			cMakeSection* section = action->makesections()[0];
! 			while( it != choice.switches.end() )
  			{
  				if( (*it) == 1 )
***************
*** 1632,1636 ****
  	UINT32 yoffset = 60;
  	UINT32 i = 1;
! 	while( it.current() )
  	{
  		if( it.current()->baseAction() && it.current()->baseAction()->baseMenu() )
--- 1638,1642 ----
  	UINT32 yoffset = 60;
  	UINT32 i = 1;
! 	for ( ; it.current(); ++it )
  	{
  		if( it.current()->baseAction() && it.current()->baseAction()->baseMenu() )
***************
*** 1647,1655 ****
  		yoffset += 20;
  		++i;
- 		++it;
  	}
  }
  
! void cLastTenGump::handleResponse( cUOSocket* socket, gumpChoice_st choice )
  {
  	if( choice.button == 0 || !socket )
--- 1653,1660 ----
  		yoffset += 20;
  		++i;
  	}
  }
  
! void cLastTenGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
  {
  	if( choice.button == 0 || !socket )
***************
*** 1699,1710 ****
  cAllMakeMenus::~cAllMakeMenus()
  {
! 	std::map< QString, cMakeMenu* >::iterator iter(menus_.begin());
! 	std::map< QString, cMakeMenu* >::iterator end (menus_.end());
! 	while( iter != end )
! 	{
! 		delete iter->second;
! 		++iter;
! 	}
! 	menus_.clear();
  }
  
--- 1704,1708 ----
  cAllMakeMenus::~cAllMakeMenus()
  {
! 	unload();
  }
  
***************
*** 1728,1732 ****
  	QStringList sections = DefManager->getSections( WPDT_MENU );
  	QStringList::const_iterator it = sections.begin();
! 	while( it != sections.end() )
  	{
  		const cElement* DefSection = DefManager->getDefinition( WPDT_MENU, (*it) );
--- 1726,1730 ----
  	QStringList sections = DefManager->getSections( WPDT_MENU );
  	QStringList::const_iterator it = sections.begin();
! 	for ( ; it != sections.end(); ++it )
  	{
  		const cElement* DefSection = DefManager->getDefinition( WPDT_MENU, (*it) );
***************
*** 1734,1743 ****
  		{
  			cMakeMenu* pMakeMenu = new cMakeMenu( DefSection );
! 			if( pMakeMenu && !( (*it) == "ADD_MENU" && SrvParams->addMenuByCategoryTag() ) )
  			{
  				menus_.insert( make_pair< QString, cMakeMenu* >( (*it), pMakeMenu ) );
  			}
  		}
! 		++it;
  	}
  
--- 1732,1810 ----
  		{
  			cMakeMenu* pMakeMenu = new cMakeMenu( DefSection );
! 			if( pMakeMenu && !( ((*it) == "ADD_MENU" || (*it) == "GO_MENU") && SrvParams->addMenuByCategoryTag() ) )
  			{
  				menus_.insert( make_pair< QString, cMakeMenu* >( (*it), pMakeMenu ) );
  			}
  		}
! 	}
! 
! 	// build gomenu by category tags
! 	if( SrvParams->addMenuByCategoryTag() )
! 	{
! 		cMakeMenu* pGoMenu = new cMakeMenu( tr("Go Menu") );
! 		menus_.insert( make_pair< QString, cMakeMenu* >( "GO_MENU", pGoMenu ) );
! 		QStringList sections = DefManager->getSections( WPDT_LOCATION );
! 		QStringList::const_iterator it = sections.begin();
! 		for (; it != sections.end(); ++it )
! 		{
! 			const cElement *defSection = DefManager->getDefinition( WPDT_LOCATION, (*it) );
! 			
! 			if( defSection )
! 			{
! 				QString category    = defSection->getAttribute("category");
! 				QString description = defSection->getAttribute("category");
! 				
! 				if( !category.isEmpty() )
! 				{
! 					cMakeMenu* currentBaseMenu = pGoMenu;
! 					
! 					QStringList categorization = QStringList::split( "\\", category );
! 					QStringList::const_iterator cit = categorization.begin();
! 					while( cit != categorization.end() )
! 					{
! 						QString current = (*cit);
! 						++cit;
! 						if( cit != categorization.end() )
! 						{
! 							bool menuExists = false;
! 							cMakeMenu::SubMenuContainer submenus = currentBaseMenu->subMenus();
! 							cMakeMenu::SubMenuContainer::const_iterator sit = submenus.begin();
! 							for ( ; sit != submenus.end(); ++sit )
! 							{
! 								if( (*sit)->name() == current )
! 								{
! 									menuExists = true;
! 									currentBaseMenu = (*sit);
! 									break;
! 								}
! 							}
! 							
! 							if( !menuExists )
! 							{
! 								// generate submenu, set current basemenu and continue
! 								cMakeMenu* pNewMenu = new cMakeMenu( current, currentBaseMenu );
! 								currentBaseMenu->addSubMenu( pNewMenu );
! 								currentBaseMenu = pNewMenu;
! 							}
! 						}
! 						else // last item means name
! 						{
! 							// generate cMakeAction object for the item definition...
! 							cMakeAction* pItem = new cMakeAction( current, 0, description, cMakeAction::CODE_ACTION, currentBaseMenu );
! 							if( pItem )
! 							{
! 								currentBaseMenu->addAction( pItem );
! 								cDoCodeAction* pMakeSection = new cDoCodeAction( "go", pItem );
! 								if( pMakeSection )
! 								{
! 									pItem->appendSection( pMakeSection );
! 									pMakeSection->setParams( defSection->text() );
! 								}
! 							}
! 						}
! 					}
! 				}
! 			}
! 		}
  	}
  
***************
*** 1761,1765 ****
  			
  			QStringList::const_iterator it = sections.begin();
! 			while( it != sections.end() )
  			{
  				const cElement *defSection = DefManager->getDefinition( WPDT_ITEM, (*it) );
--- 1828,1832 ----
  			
  			QStringList::const_iterator it = sections.begin();
! 			for ( ; it != sections.end(); ++it )
  			{
  				const cElement *defSection = DefManager->getDefinition( WPDT_ITEM, (*it) );
***************
*** 1822,1826 ****
  									cMakeMenu::SubMenuContainer submenus = currentBaseMenu->subMenus();
  									cMakeMenu::SubMenuContainer::const_iterator sit = submenus.begin();
! 									while( sit != submenus.end() )
  									{
  										if( (*sit)->name() == current )
--- 1889,1893 ----
  									cMakeMenu::SubMenuContainer submenus = currentBaseMenu->subMenus();
  									cMakeMenu::SubMenuContainer::const_iterator sit = submenus.begin();
! 									for ( ; sit != submenus.end(); ++sit )
  									{
  										if( (*sit)->name() == current )
***************
*** 1830,1834 ****
  											break;
  										}
- 										++sit;
  									}
  	
--- 1897,1900 ----
***************
*** 1862,1866 ****
  					}
  				}
- 				++it;
  			}
  		}
--- 1928,1931 ----
***************
*** 1875,1879 ****
  			
  			QStringList::const_iterator it = sections.begin();
! 			while( it != sections.end() )
  			{
  				const cElement *defSection = DefManager->getDefinition( WPDT_NPC, (*it) );
--- 1940,1944 ----
  			
  			QStringList::const_iterator it = sections.begin();
! 			for ( ; it != sections.end(); ++it )
  			{
  				const cElement *defSection = DefManager->getDefinition( WPDT_NPC, (*it) );
***************
*** 1936,1940 ****
  									cMakeMenu::SubMenuContainer submenus = currentBaseMenu->subMenus();
  									cMakeMenu::SubMenuContainer::const_iterator sit = submenus.begin();
! 									while( sit != submenus.end() )
  									{
  										if( (*sit)->name() == current )
--- 2001,2005 ----
  									cMakeMenu::SubMenuContainer submenus = currentBaseMenu->subMenus();
  									cMakeMenu::SubMenuContainer::const_iterator sit = submenus.begin();
! 									for ( ; sit != submenus.end(); ++sit )
  									{
  										if( (*sit)->name() == current )
***************
*** 1944,1948 ****
  											break;
  										}
- 											++sit;
  									}
  	
--- 2009,2012 ----
***************
*** 1977,1981 ****
  					}
  				}
- 				++it;
  			}
  		}
--- 2041,2044 ----
***************
*** 1988,1992 ****
  		{
  			cAllResources::iterator it = Resources::instance()->begin();
! 			while( it != Resources::instance()->end() )
  			{
  				cResource* pResource = it->second;
--- 2051,2055 ----
  		{
  			cAllResources::iterator it = Resources::instance()->begin();
! 			for (; it != Resources::instance()->end(); ++it )
  			{
  				cResource* pResource = it->second;
***************
*** 1999,2003 ****
  						QValueVector< cResource::resourcespec_st > resourcespecs = pResource->resourceSpecs();
  						QValueVector< cResource::resourcespec_st >::iterator rit = resourcespecs.begin();
! 						while( rit != resourcespecs.end() )
  						{
  							cResource::resourcespec_st item = (*rit);
--- 2062,2066 ----
  						QValueVector< cResource::resourcespec_st > resourcespecs = pResource->resourceSpecs();
  						QValueVector< cResource::resourcespec_st >::iterator rit = resourcespecs.begin();
! 						for (; rit != resourcespecs.end(); ++rit )
  						{
  							cResource::resourcespec_st item = (*rit);
***************
*** 2018,2022 ****
  
  								QValueVector< UINT16 >::iterator ait = amounts.begin();
! 								while( ait != amounts.end() )
  								{
  									cMakeCustomSection* pMakeSection = new cMakeCustomSection( "("+QString::number( (*ait) )+")", pMakeAction );
--- 2081,2085 ----
  
  								QValueVector< UINT16 >::iterator ait = amounts.begin();
! 								for (; ait != amounts.end(); ++ait )
  								{
  									cMakeCustomSection* pMakeSection = new cMakeCustomSection( "("+QString::number( (*ait) )+")", pMakeAction );
***************
*** 2028,2039 ****
  											pMakeSection->appendMakeItem( pMakeItem );
  									}
- 									++ait;
  								}
  							}
- 							++rit;
  						}
  					}
  				}
- 				++it;
  			}
  		}
--- 2091,2099 ----
***************
*** 2041,2054 ****
  }
  
! void cAllMakeMenus::reload()
  {
! 	std::map< QString, cMakeMenu* >::iterator iter = menus_.begin();
! 	while( iter != menus_.end() )
! 	{
! 		delete iter->second;
! 		++iter;
! 	}
  	menus_.clear();
  
  	for ( cUOSocket* mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next()	)
  	{
--- 2101,2116 ----
  }
  
! void cAllMakeMenus::unload()
  {
! 	std::map< QString, cMakeMenu* >::iterator it = menus_.begin();
! 	std::map< QString, cMakeMenu* >::iterator end = menus_.end();
! 	for (; it != end; ++it )
! 		delete it->second;
  	menus_.clear();
+ }
  
+ void cAllMakeMenus::reload()
+ {
+ 	unload();
  	for ( cUOSocket* mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next()	)
  	{

Index: makemenus.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/makemenus.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** makemenus.h	23 Nov 2003 03:46:22 -0000	1.31
--- makemenus.h	8 Jan 2004 23:43:57 -0000	1.32
***************
*** 249,252 ****
--- 249,256 ----
  
  	virtual void	execute( cUOSocket* const socket );
+ 	void setParams( const QString& a ) { params = a; }
+ 
+ protected:
+ 	QString params;
  };
  
***************
*** 365,369 ****
  	// Getters
  	SubMenuContainer	subMenus() const		{ return submenus_; }
! 	ActionContainer		actions() const		{ return actions_; }
  	QString				name() const			{ return name_; }
  	QString				link() const			{ return link_; }
--- 369,373 ----
  	// Getters
  	SubMenuContainer	subMenus() const		{ return submenus_; }
! 	ActionContainer		actions() const			{ return actions_; }
  	QString				name() const			{ return name_; }
  	QString				link() const			{ return link_; }
***************
*** 428,432 ****
  	
  	// implements cGump
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  };
  
--- 432,436 ----
  	
  	// implements cGump
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  };
  
***************
*** 440,444 ****
  
  	// implements cGump
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  };
  
--- 444,448 ----
  
  	// implements cGump
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  };
  
***************
*** 483,486 ****
--- 487,491 ----
  private:
  	std::map< QString, cMakeMenu* >		menus_;
+ 	void unload();
  };
  

Index: multis.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/multis.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** multis.cpp	23 Sep 2003 23:55:23 -0000	1.35
--- multis.cpp	8 Jan 2004 23:43:57 -0000	1.36
***************
*** 663,667 ****
  }
  
! void cMultiGump::handleResponse( cUOSocket* socket, gumpChoice_st choice )
  {
  	if( choice.button == 0 ) // canceled
--- 663,667 ----
  }
  
! void cMultiGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
  {
  	if( choice.button == 0 ) // canceled
***************
*** 681,685 ****
  	if( choice.button == 1 || choice.button == 2 ) // ok
  	{
! 		std::map< UINT16, QString >::iterator it = choice.textentries.begin();
  		while( it != choice.textentries.end() )
  		{
--- 681,685 ----
  	if( choice.button == 1 || choice.button == 2 ) // ok
  	{
! 		std::map< UINT16, QString >::const_iterator it = choice.textentries.begin();
  		while( it != choice.textentries.end() )
  		{

Index: multis.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/multis.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** multis.h	23 Nov 2003 03:46:22 -0000	1.22
--- multis.h	8 Jan 2004 23:43:57 -0000	1.23
***************
*** 138,142 ****
  	cMultiGump( SERIAL charSerial, SERIAL multiSerial );
  
! 	virtual void handleResponse( cUOSocket* socket, gumpChoice_st choice );
  };
  
--- 138,142 ----
  	cMultiGump( SERIAL charSerial, SERIAL multiSerial );
  
! 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
  };
  

Index: territories.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/territories.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** territories.cpp	23 Nov 2003 03:46:22 -0000	1.34
--- territories.cpp	8 Jan 2004 23:43:57 -0000	1.35
***************
*** 329,333 ****
  				{
  					if( currRegion->guardOwner().isEmpty() )
! 						socket->sysMessage( tr( "You have a safe feeling." ), 0x37 );
  					else
  						socket->sysMessage( tr( "You are now under the protection of %1 guards." ).arg( currRegion->guardOwner() ), 0x37 );
--- 329,333 ----
  				{
  					if( currRegion->guardOwner().isEmpty() )
! 						socket->clilocMessage( 500112 ); // You are now under the protection of the town guards
  					else
  						socket->sysMessage( tr( "You are now under the protection of %1 guards." ).arg( currRegion->guardOwner() ), 0x37 );
***************
*** 336,340 ****
  				{
  					if( lastRegion->guardOwner().isEmpty() )
! 						socket->sysMessage( tr( "You no longer have a safe feeling." ), 0x37 );
  					else
  						socket->sysMessage( tr( "You are no longer under the protection of %1 guards." ).arg( lastRegion->guardOwner() ), 0x37 );
--- 336,340 ----
  				{
  					if( lastRegion->guardOwner().isEmpty() )
! 						socket->clilocMessage( 500113 ); // You have left the protection of the town guards.
  					else
  						socket->sysMessage( tr( "You are no longer under the protection of %1 guards." ).arg( lastRegion->guardOwner() ), 0x37 );

Index: tracking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/tracking.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tracking.cpp	7 Sep 2003 19:07:47 -0000	1.18
--- tracking.cpp	8 Jan 2004 23:43:57 -0000	1.19
***************
*** 85,89 ****
  {
  public:
! 	virtual void handleResponse( cUOSocket *socket, gumpChoice_st choice )
  	{
  		P_PLAYER player = socket->player();
--- 85,89 ----
  {
  public:
! 	virtual void handleResponse( cUOSocket *socket, const gumpChoice_st& choice )
  	{
  		P_PLAYER player = socket->player();
***************
*** 213,217 ****
  	}
  
! 	virtual void handleResponse( cUOSocket *socket, gumpChoice_st choice )
  	{
  		if( choice.button > 4 || choice.button < 1 )
--- 213,217 ----
  	}
  
! 	virtual void handleResponse( cUOSocket *socket, const gumpChoice_st& choice )
  	{
  		if( choice.button > 4 || choice.button < 1 )