[wpdev-commits] wolfpack basedef.cpp,1.13,1.14 items.cpp,1.442,1.443

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

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

Modified Files:
	basedef.cpp items.cpp 
Log Message:
Fixes for item weight on load

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.442
retrieving revision 1.443
diff -C2 -d -r1.442 -r1.443
*** items.cpp	28 Aug 2004 14:42:04 -0000	1.442
--- items.cpp	29 Aug 2004 16:32:50 -0000	1.443
***************
*** 384,387 ****
--- 384,388 ----
  	priv_ = reader.readByte();
  	basedef_ = ItemBaseDefs::instance()->get( reader.readAscii() );
+ 	totalweight_ = weight();
  
  	// Add to container and handle weight

Index: basedef.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** basedef.cpp	28 Aug 2004 21:14:53 -0000	1.13
--- basedef.cpp	29 Aug 2004 16:32:50 -0000	1.14
***************
*** 145,149 ****
  		const cElement* element = Definitions::instance()->getDefinition( WPDT_NPC, id_ );
  
! 		if ( !element )
  		{
  			Console::instance()->log( LOG_WARNING, QString( "Missing npc definition '%1'.\n" ).arg( id_ ) );
--- 145,149 ----
  		const cElement* element = Definitions::instance()->getDefinition( WPDT_NPC, id_ );
  
! 		if ( !element && !id_.isEmpty() )
  		{
  			Console::instance()->log( LOG_WARNING, QString( "Missing npc definition '%1'.\n" ).arg( id_ ) );
***************
*** 289,293 ****
  		const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, id_ );
  
! 		if ( !element )
  		{
  			Console::instance()->log( LOG_WARNING, QString( "Missing item definition '%1'.\n" ).arg( id_ ) );
--- 289,293 ----
  		const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, id_ );
  
! 		if ( !element && !id_.isEmpty() )
  		{
  			Console::instance()->log( LOG_WARNING, QString( "Missing item definition '%1'.\n" ).arg( id_ ) );