[wpdev-commits] wolfpack ChangeLog,1.53,1.54 console.h,1.18,1.19 world.cpp,1.126,1.127

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

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

Modified Files:
	ChangeLog console.h world.cpp 
Log Message:
0000309

Index: console.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** console.h	19 Aug 2004 01:22:51 -0000	1.18
--- console.h	14 Sep 2004 18:05:15 -0000	1.19
***************
*** 70,74 ****
  {
  private:
! 	QStringList linebuffer_;
  	QString incompleteLine_;
  	QStringList commandQueue;
--- 70,74 ----
  {
  private:
! 	QString linebuffer_;
  	QString incompleteLine_;
  	QStringList commandQueue;
***************
*** 123,126 ****
--- 123,128 ----
  	void stop();
  
+ 	void rollbackChars(unsigned int count);
+ 
  	/*!
  		\brief Send a progress line to the console.
***************
*** 170,174 ****
  			storing all lines sent to the console.
  	*/
! 	const QStringList& linebuffer() const
  	{
  		return linebuffer_;
--- 172,176 ----
  			storing all lines sent to the console.
  	*/
! 	const QString& linebuffer() const
  	{
  		return linebuffer_;

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** world.cpp	9 Sep 2004 02:36:24 -0000	1.126
--- world.cpp	14 Sep 2004 18:05:15 -0000	1.127
***************
*** 463,470 ****
  					{
  						unsigned int revert = QString::number( lastpercent ).length() + 1;
! 						for ( unsigned int i = 0; i < revert; ++i )
! 						{
! 							Console::instance()->send( "\b" );
! 						}
  
  						lastpercent = percent;
--- 463,467 ----
  					{
  						unsigned int revert = QString::number( lastpercent ).length() + 1;
! 						Console::instance()->rollbackChars(revert);
  
  						lastpercent = percent;
***************
*** 521,524 ****
--- 518,525 ----
  			reader.close();
  
+ 			// Rollback the last percentage
+ 			unsigned int revert = QString::number( lastpercent ).length() + 1;
+ 			Console::instance()->rollbackChars(revert);
+ 
  			// post process all loaded objects
  			QPtrList<PersistentObject>::const_iterator cit(objects.begin());
***************
*** 828,837 ****
  	}
  
- 
- 
  	unsigned int duration = getNormalizedTime() - loadStart;
  
! 	Console::instance()->send( "\n\b\b\b\b" ); // 100%
! 	Console::instance()->log( LOG_MESSAGE, QString( "\nThe world loaded in %1 ms.\n" ).arg( duration ) );
  
  	cComponent::load();
--- 829,835 ----
  	}
  
  	unsigned int duration = getNormalizedTime() - loadStart;
  
! 	Console::instance()->log( LOG_MESSAGE, QString( "The world loaded in %1 ms.\n" ).arg( duration ) );
  
  	cComponent::load();

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** ChangeLog	14 Sep 2004 04:40:31 -0000	1.53
--- ChangeLog	14 Sep 2004 18:05:15 -0000	1.54
***************
*** 16,19 ****
--- 16,20 ----
  	  If enabled the desolation season will be sent to players on the felucca facet.
  	- Fixed bug #0000253. (Invalid drop sound for items dropped to ground)
+ 	- Fixed bug #0000309. (Console in web administration caused endless loop)
  
  Wolfpack 12.9.10 Beta (10. September 2004)