[wpdev-commits] wolfpack ChangeLog,1.39,1.40 items.cpp,1.445,1.446

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

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

Modified Files:
	ChangeLog items.cpp 
Log Message:
Fixes

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.445
retrieving revision 1.446
diff -C2 -d -r1.445 -r1.446
*** items.cpp	31 Aug 2004 14:04:53 -0000	1.445
--- items.cpp	7 Sep 2004 23:01:49 -0000	1.446
***************
*** 447,451 ****
  QString cItem::getName( bool shortName )
  {
! 	if ( !name_.isNull() )
  		return name_;
  
--- 447,451 ----
  QString cItem::getName( bool shortName )
  {
! 	if ( !name_.isEmpty() && !name_.startsWith("#") )
  		return name_;
  
***************
*** 1162,1166 ****
  	textSpeech->setType( speechType );
  	textSpeech->setLanguage( "" );
! 	textSpeech->setName( name() );
  	textSpeech->setColor( color );
  	textSpeech->setText( message );
--- 1162,1166 ----
  	textSpeech->setType( speechType );
  	textSpeech->setLanguage( "" );
! 	textSpeech->setName( getName(true) );
  	textSpeech->setColor( color );
  	textSpeech->setText( message );

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** ChangeLog	7 Sep 2004 20:21:27 -0000	1.39
--- ChangeLog	7 Sep 2004 23:01:49 -0000	1.40
***************
*** 36,39 ****
--- 36,40 ----
  	- Char.settag and item.settag now correctly fail if the type of the value is not supported.
  	- Fixed bug #0000252 (Negative parameters to char.checkskill got casted to unsigned short)
+ 	- Fixed item names for item.say
  
  Wolfpack 12.9.9 Beta (4. September 2004)