[Planeshift-cvs] CVS: planeshift/src/server adminmanager.cpp, 1.336, 1.337 cachemanager.cpp, 1.165, 1.166 command.cpp, 1.217, 1.218 progressionmanager.cpp, 1.239, 1.240 psserverchar.cpp, 1.377, 1.378 questmanager.cpp, 1.92, 1.93 spawnmanager.cpp, 1.171, 1.172 workmanager.cpp, 1.185, 1.186

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

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

Modified Files:
	adminmanager.cpp cachemanager.cpp command.cpp 
	progressionmanager.cpp psserverchar.cpp questmanager.cpp 
	spawnmanager.cpp workmanager.cpp 
Log Message:
Took out dfryer's addition of the loaded set to true in the psItem ctor.  This was
 probably the source of the nested mysql commands suddenly encountered on the server
 in the last 24 hrs, because it caused much premature saving during the initialization
 of items.
Also changed name of Loaded() function to SetLoaded() to follow naming standards a
 bit.  (Functions should start with verbs.)

Index: adminmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v
retrieving revision 1.336
retrieving revision 1.337
diff -C2 -d -r1.336 -r1.337
*** adminmanager.cpp	23 Jul 2006 19:00:04 -0000	1.336
--- adminmanager.cpp	28 Jul 2006 04:38:27 -0000	1.337
***************
*** 1627,1631 ****
      }
  
!     newitem->Loaded();  // Item is fully created
      newitem->Save();    // First save
  
--- 1627,1631 ----
      }
  
!     newitem->SetLoaded();  // Item is fully created
      newitem->Save();    // First save
  
***************
*** 3255,3259 ****
          if (item)
          {
!             item->Loaded();  // Item is fully created
              item->Save();    // First save
          }
--- 3255,3259 ----
          if (item)
          {
!             item->SetLoaded();  // Item is fully created
              item->Save();    // First save
          }

Index: cachemanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/cachemanager.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -d -r1.165 -r1.166
*** cachemanager.cpp	27 Jul 2006 06:07:46 -0000	1.165
--- cachemanager.cpp	28 Jul 2006 04:38:27 -0000	1.166
***************
*** 1492,1496 ****
              for (size_t i=0; i < itemset->GetSize(); i++)
                  if (itemset->Get(i))
!                     itemset->Get(i)->Loaded();
  
              return itemset;
--- 1492,1496 ----
              for (size_t i=0; i < itemset->GetSize(); i++)
                  if (itemset->Get(i))
!                     itemset->Get(i)->SetLoaded();
  
              return itemset;

Index: command.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/command.cpp,v
retrieving revision 1.217
retrieving revision 1.218
diff -C2 -d -r1.217 -r1.218
*** command.cpp	23 Jul 2006 19:00:04 -0000	1.217
--- command.cpp	28 Jul 2006 04:38:27 -0000	1.218
***************
*** 1111,1115 ****
      }
  
!     iteminstance->Loaded();  // Item is fully created
      iteminstance->Save();    // First save
  
--- 1111,1115 ----
      }
  
!     iteminstance->SetLoaded();  // Item is fully created
      iteminstance->Save();    // First save
  

Index: progressionmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/progressionmanager.cpp,v
retrieving revision 1.239
retrieving revision 1.240
diff -C2 -d -r1.239 -r1.240
*** progressionmanager.cpp	27 Jul 2006 16:59:00 -0000	1.239
--- progressionmanager.cpp	28 Jul 2006 04:38:27 -0000	1.240
***************
*** 1961,1965 ****
          }
          
!         iteminstance->Loaded();  // Item is fully created
          iteminstance->Save();    // First save
  
--- 1961,1965 ----
          }
          
!         iteminstance->SetLoaded();  // Item is fully created
          iteminstance->Save();    // First save
  

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.377
retrieving revision 1.378
diff -C2 -d -r1.377 -r1.378
*** psserverchar.cpp	27 Jul 2006 06:07:46 -0000	1.377
--- psserverchar.cpp	28 Jul 2006 04:38:27 -0000	1.378
***************
*** 2341,2345 ****
      }
      
!     holdingItem->Loaded();  // Loaded and ready
  
      return holdingItem;                                                            
--- 2341,2345 ----
      }
      
!     holdingItem->SetLoaded();  // Loaded and ready
  
      return holdingItem;                                                            

Index: questmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/questmanager.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** questmanager.cpp	5 Jul 2006 07:18:50 -0000	1.92
--- questmanager.cpp	28 Jul 2006 04:38:27 -0000	1.93
***************
*** 908,912 ****
      }
  
!     item->Loaded();  // Item is fully created
      item->Save();    // First save
  
--- 908,912 ----
      }
  
!     item->SetLoaded();  // Item is fully created
      item->Save();    // First save
  

Index: spawnmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/spawnmanager.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -d -r1.171 -r1.172
*** spawnmanager.cpp	26 Jul 2006 21:04:04 -0000	1.171
--- spawnmanager.cpp	28 Jul 2006 04:38:27 -0000	1.172
***************
*** 884,888 ****
      {
          item = itemstat->InstantiateBasicItem();
!         item->Loaded();
      }
  
--- 884,888 ----
      {
          item = itemstat->InstantiateBasicItem();
!         item->SetLoaded();
      }
  

Index: workmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/workmanager.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -d -r1.185 -r1.186
*** workmanager.cpp	25 Jul 2006 14:33:09 -0000	1.185
--- workmanager.cpp	28 Jul 2006 04:38:27 -0000	1.186
***************
*** 659,663 ****
              }                
  
!             item->Loaded();  // Item is fully created
              item->Save();    // First save
  
--- 659,663 ----
              }                
  
!             item->SetLoaded();  // Item is fully created
              item->Save();    // First save
  
***************
*** 2276,2280 ****
              worker->gemobj->GetPlayerID(), worker->gemobj->GetGuildID(), owner->GetCharName(), owner);
  #endif    
!         newItem->Loaded();  // Item is fully created
          newItem->Save();    // First save
  
--- 2276,2280 ----
              worker->gemobj->GetPlayerID(), worker->gemobj->GetGuildID(), owner->GetCharName(), owner);
  #endif    
!         newItem->SetLoaded();  // Item is fully created
          newItem->Save();    // First save