[Planeshift-cvs] CVS: planeshift/src/server adminmanager.cpp, 1.338, 1.339 workmanager.cpp, 1.193, 1.194

[Keith F. <ven...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11731/src/server

Modified Files:
	adminmanager.cpp workmanager.cpp 
Log Message:
-  Added more bool save flags for preventing the Save() of a psItem when it is not
 fully initialized yet.

Index: adminmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v
retrieving revision 1.338
retrieving revision 1.339
diff -C2 -d -r1.338 -r1.339
*** adminmanager.cpp	5 Aug 2006 00:28:55 -0000	1.338
--- adminmanager.cpp	11 Aug 2006 06:37:47 -0000	1.339
***************
*** 1617,1621 ****
      }
  
! 	newitem->SetItemQuality(basestats->GetQuality());
      newitem->SetStackCount(stackCount);
      newitem->SetLocationInWorld(sectorinfo,xPos,yPos,zPos,angle);
--- 1617,1621 ----
      }
  
! 	newitem->SetItemQuality(basestats->GetQuality(),false);
      newitem->SetStackCount(stackCount);
      newitem->SetLocationInWorld(sectorinfo,xPos,yPos,zPos,angle);

Index: workmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/workmanager.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -C2 -d -r1.193 -r1.194
*** workmanager.cpp	11 Aug 2006 02:33:51 -0000	1.193
--- workmanager.cpp	11 Aug 2006 06:37:47 -0000	1.194
***************
*** 393,399 ****
  
      // Adjust the quality of the item
!     repairTarget->SetItemQuality( repairTarget->GetItemQuality() + workEvent->repairAmount);
  	// Cap it to max
! 	if(repairTarget->GetItemQuality() > repairTarget->GetMaxItemQuality()) repairTarget->SetItemQuality(repairTarget->GetMaxItemQuality());
  
      psserver->SendSystemResult(workEvent->client->GetClientNum(),
--- 393,400 ----
  
      // Adjust the quality of the item
!     repairTarget->SetItemQuality( repairTarget->GetItemQuality() + workEvent->repairAmount, true);
  	// Cap it to max
! 	if (repairTarget->GetItemQuality() > repairTarget->GetMaxItemQuality())
!         repairTarget->SetItemQuality(repairTarget->GetMaxItemQuality(),true);
  
      psserver->SendSystemResult(workEvent->client->GetClientNum(),
***************
*** 2275,2282 ****
  
          // Set stuff
!         newItem->SetItemQuality(itemQuality);
          newItem->SetStackCount(newQty);
!         newItem->SetOwningCharacter( owner , true);
! 		newItem->SetDecayResistance(0.5);
  
          if ( parent )
--- 2276,2283 ----
  
          // Set stuff
!         newItem->SetItemQuality(itemQuality,false);
          newItem->SetStackCount(newQty);
!         newItem->SetOwningCharacter( owner, false);
! 		newItem->SetDecayResistance(0.5,false);
  
          if ( parent )
***************
*** 2284,2289 ****
  
          // Set current player ID and Guild to creator mark
!         newItem->SetCrafterID( worker->gemobj->GetPlayerID() );
!         newItem->SetGuildID( worker->gemobj->GetGuildID() );
          
          // Get sector of container to set locations in world
--- 2285,2290 ----
  
          // Set current player ID and Guild to creator mark
!         newItem->SetCrafterID( worker->gemobj->GetPlayerID(),false );
!         newItem->SetGuildID( worker->gemobj->GetGuildID(),true );
          
          // Get sector of container to set locations in world