[Planeshift-cvs] CVS: planeshift/src/server/bulkobjects dictionary.cpp,1.96,1.97 pscharacter.cpp,1.346,1.347 psitem.cpp,1.150,1.151

[Arianna B. <ar...@us...>]

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

Modified Files:
	dictionary.cpp pscharacter.cpp psitem.cpp 
Log Message:
Adding CS_GNUC_PRINTF to PS logging system.
Convert %llu an %I64u to %" PRIu64 ".

Index: dictionary.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/dictionary.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** dictionary.cpp	14 Jan 2006 11:33:50 -0000	1.96
--- dictionary.cpp	15 Jan 2006 19:16:16 -0000	1.97
***************
*** 1661,1665 ****
      if ( !looter->MoveToInventory(item) )
      {
!         Debug5(LOG_ANY,"GiveItemResponseOp::Run() Could not give item of stat %llu (%s) to character %u [%s])",
              itemstat->GetUID(),itemstat->GetName(),looter->GetCharacterID(),looter->GetCharName());
          CacheManager::GetSingleton().RemoveInstance(item);
--- 1661,1665 ----
      if ( !looter->MoveToInventory(item) )
      {
!         Debug5(LOG_ANY,"GiveItemResponseOp::Run() Could not give item of stat %" PRIu64 " (%s) to character %u [%s])",
              itemstat->GetUID(),itemstat->GetName(),looter->GetCharacterID(),looter->GetCharName());
          CacheManager::GetSingleton().RemoveInstance(item);
***************
*** 1827,1831 ****
          if (!itemstat)
          {
!             Error3("ItemStat #%llu/%s was not found in OfferReward script op!",itemID,node->GetAttributeValue("name"));
              return false;
          }
--- 1827,1831 ----
          if (!itemstat)
          {
!             Error3("ItemStat #%" PRIu64 "/%s was not found in OfferReward script op!",itemID,node->GetAttributeValue("name"));
              return false;
          }

Index: pscharacter.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/pscharacter.cpp,v
retrieving revision 1.346
retrieving revision 1.347
diff -C2 -d -r1.346 -r1.347
*** pscharacter.cpp	15 Jan 2006 18:50:37 -0000	1.346
--- pscharacter.cpp	15 Jan 2006 19:16:16 -0000	1.347
***************
*** 1992,1996 ****
              csString escpxml_imagename = EscpXML(loot_pending[i]->GetImageName());
              csString escpxml_name = EscpXML(loot_pending[i]->GetName());
!             item.Format("<li><image icon=\"%s\" count=\"1\" /><desc text=\"%s\" /><id text=\"%llu\" /></li>",
                    escpxml_imagename.GetData(),
                    escpxml_name.GetData(),
--- 1992,1996 ----
              csString escpxml_imagename = EscpXML(loot_pending[i]->GetImageName());
              csString escpxml_name = EscpXML(loot_pending[i]->GetName());
!             item.Format("<li><image icon=\"%s\" count=\"1\" /><desc text=\"%s\" /><id text=\"%" PRIu64 "\" /></li>",
                    escpxml_imagename.GetData(),
                    escpxml_name.GetData(),

Index: psitem.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psitem.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** psitem.cpp	15 Jan 2006 17:39:47 -0000	1.150
--- psitem.cpp	15 Jan 2006 19:16:16 -0000	1.151
***************
*** 358,363 ****
      EnableSaving(true);
      
!     Result pattern(db->Select("Select id from trade_patterns where designitem_id=%llu", GetCurrentStats()->GetUID()) );
!     //printf("Select id from trade_patterns where designitem_id=%llu", GetCurrentStats()->GetUID());
      if ( pattern.IsValid() && pattern.Count() == 1 )
          patternID = pattern[0].GetInt("id");
--- 358,363 ----
      EnableSaving(true);
      
!     Result pattern(db->Select("Select id from trade_patterns where designitem_id=%" PRIu64 "", GetCurrentStats()->GetUID()) );
!     //printf("Select id from trade_patterns where designitem_id=%" PRIu64 "", GetCurrentStats()->GetUID());
      if ( pattern.IsValid() && pattern.Count() == 1 )
          patternID = pattern[0].GetInt("id");
***************
*** 557,561 ****
  
      // item_stats_id_standard - base stats if non unique, unique stats if unique
!     fields.FormatPush("%llu",GetBaseStats()->GetUID());
  
      // item_stats_id_unique
--- 557,561 ----
  
      // item_stats_id_standard - base stats if non unique, unique stats if unique
!     fields.FormatPush("%" PRIu64 "",GetBaseStats()->GetUID());
  
      // item_stats_id_unique
***************
*** 731,735 ****
      
      csString ustr;
!     ustr.Format("%llu",uid);
      CS_ASSERT(ustr == uid_str);
  }
--- 731,735 ----
      
      csString ustr;
!     ustr.Format("%" PRIu64 "",uid);
      CS_ASSERT(ustr == uid_str);
  }
***************
*** 2194,2198 ****
      this->maxrnd = maxrnd;
      wantToDie= false;
!     printf("Item spawn (%llu) created\n",itemID);
  }
  
--- 2194,2198 ----
      this->maxrnd = maxrnd;
      wantToDie= false;
!     printf("Item spawn (%" PRIu64 ") created\n",itemID);
  }
  
***************
*** 2202,2211 ****
          return NULL;
  
!     printf("Spawning item (%llu)\n",itemID);
  
      psItemStats *stats=CacheManager::GetSingleton().GetBasicItemStatsByID(itemID);
      if (stats==NULL)
      {
!         Error2("Could not find basic stats with ID %llu for item spawn.\n",itemID);
      }
      else
--- 2202,2211 ----
          return NULL;
  
!     Notify2(LOG_ANY,"Spawning item (%" PRIu64 ")\n",itemID);
  
      psItemStats *stats=CacheManager::GetSingleton().GetBasicItemStatsByID(itemID);
      if (stats==NULL)
      {
!         Error2("Could not find basic stats with ID %" PRIu64 " for item spawn.\n",itemID);
      }
      else
***************
*** 2287,2291 ****
      if (!this->Delete())
      {
!         Error3("Failed to delete item ID %llu.  Error '%s'.",this->GetUID(),db->GetLastError());
          return false;
      }
--- 2287,2291 ----
      if (!this->Delete())
      {
!         Error3("Failed to delete item ID %" PRIu64 ".  Error '%s'.",this->GetUID(),db->GetLastError());
          return false;
      }