From: Kenny G. <ken...@us...> - 2007-04-30 09:14:38
|
Update of /cvsroot/planeshift/planeshift/src/server/bulkobjects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7996/src/server/bulkobjects Modified Files: pscharacter.cpp pscharinventory.cpp psitem.cpp psitemstats.cpp psraceinfo.cpp Log Message: - Change all %zu's to %lu's in my last commit - apparently MSVC does not comply to the C99 standard. I guess %zu works in CS calls but not printf. %lu seems to work on both MSVC and gcc. Index: pscharacter.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/pscharacter.cpp,v retrieving revision 1.483 retrieving revision 1.484 diff -C2 -d -r1.483 -r1.484 *** pscharacter.cpp 30 Apr 2007 02:58:48 -0000 1.483 --- pscharacter.cpp 30 Apr 2007 09:14:32 -0000 1.484 *************** *** 287,291 **** if (sectorinfo==NULL) { ! Error3("Character ID %u has unresolvable sector id %zu.",characterid,row.GetUInt32("loc_sector_id")); return false; } --- 287,291 ---- if (sectorinfo==NULL) { ! Error3("Character ID %u has unresolvable sector id %lu.",characterid,row.GetUInt32("loc_sector_id")); return false; } *************** *** 2554,2558 **** q->lockout_end = now + q->GetQuest()->GetPlayerLockoutTime(); ! Debug5(LOG_QUESTS, characterid, "Loaded quest %-40.40s, status %c, lockout %zu, for player %s.\n", q->GetQuest()->GetName(),q->status, ( q->lockout_end > now ? q->lockout_end-now:0),GetCharFullName()); --- 2554,2558 ---- q->lockout_end = now + q->GetQuest()->GetPlayerLockoutTime(); ! Debug5(LOG_QUESTS, characterid, "Loaded quest %-40.40s, status %c, lockout %lu, for player %s.\n", q->GetQuest()->GetName(),q->status, ( q->lockout_end > now ? q->lockout_end-now:0),GetCharFullName()); Index: pscharinventory.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/pscharinventory.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** pscharinventory.cpp 30 Apr 2007 02:24:43 -0000 1.30 --- pscharinventory.cpp 30 Apr 2007 09:14:32 -0000 1.31 *************** *** 1280,1284 **** for (size_t i=0; i < inventory.GetSize(); i++) { ! printf("Checking item %zu, %s in offered slot %d.\n",i,inventory[i].item->GetName(),inventory[i].exchangeOfferSlot); if (inventory[i].exchangeOfferSlot == slotID) return &inventory[i]; --- 1280,1284 ---- for (size_t i=0; i < inventory.GetSize(); i++) { ! printf("Checking item %lu, %s in offered slot %d.\n",i,inventory[i].item->GetName(),inventory[i].exchangeOfferSlot); if (inventory[i].exchangeOfferSlot == slotID) return &inventory[i]; Index: psitem.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psitem.cpp,v retrieving revision 1.267 retrieving revision 1.268 diff -C2 -d -r1.267 -r1.268 *** psitem.cpp 30 Apr 2007 02:58:48 -0000 1.267 --- psitem.cpp 30 Apr 2007 09:14:32 -0000 1.268 *************** *** 107,111 **** } ! psItem::psItem() : transformationEvent(NULL), gItem(NULL), loaded(false), pendingsave(false) { int i; --- 107,111 ---- } ! psItem::psItem() : transformationEvent(NULL), gItem(NULL), pendingsave(false), loaded(false) { int i; Index: psitemstats.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psitemstats.cpp,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** psitemstats.cpp 30 Apr 2007 01:42:47 -0000 1.110 --- psitemstats.cpp 30 Apr 2007 09:14:32 -0000 1.111 *************** *** 275,279 **** if (row.GetUInt32("cstr_id_gfx_mesh")!=0 && !meshname) { ! Error3("Error, no commonstring exists with number %zu while loading item_stats.id %u.\n",row.GetUInt32("cstr_id_gfx_mesh"),uid); return false; } --- 275,279 ---- if (row.GetUInt32("cstr_id_gfx_mesh")!=0 && !meshname) { ! Error3("Error, no commonstring exists with number %lu while loading item_stats.id %u.\n",row.GetUInt32("cstr_id_gfx_mesh"),uid); return false; } *************** *** 284,288 **** if (row.GetUInt32("cstr_id_gfx_texture")!=0 && !texturename) { ! Error3("Error, no commonstring exists with number %zu while loading item_stats.id %u.\n",row.GetUInt32("cstr_id_gfx_texture"),uid); return false; } --- 284,288 ---- if (row.GetUInt32("cstr_id_gfx_texture")!=0 && !texturename) { ! Error3("Error, no commonstring exists with number %lu while loading item_stats.id %u.\n",row.GetUInt32("cstr_id_gfx_texture"),uid); return false; } Index: psraceinfo.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psraceinfo.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** psraceinfo.cpp 30 Apr 2007 01:42:47 -0000 1.27 --- psraceinfo.cpp 30 Apr 2007 09:14:33 -0000 1.28 *************** *** 137,141 **** if (secinfo==NULL) { ! Error3("Unresolvable sector id %zu in start_sector_id field of race info for race %s. Failing!", row.GetUInt32("start_sector_id"),name.GetData()); return false; --- 137,141 ---- if (secinfo==NULL) { ! Error3("Unresolvable sector id %lu in start_sector_id field of race info for race %s. Failing!", row.GetUInt32("start_sector_id"),name.GetData()); return false; *************** *** 160,164 **** if (meshname==NULL) { ! Warning3(LOG_ANY,"Unresolvable mesh id %zu in mesh_id field of race info for race %s. Using NULL mesh.", row.GetUInt32("cstr_id_mesh"),name.GetData() ); } --- 160,164 ---- if (meshname==NULL) { ! Warning3(LOG_ANY,"Unresolvable mesh id %lu in mesh_id field of race info for race %s. Using NULL mesh.", row.GetUInt32("cstr_id_mesh"),name.GetData() ); } *************** *** 168,172 **** if (textname==NULL) { ! Warning3(LOG_ANY,"Unresolvable texture id %zu in base_texture_id field of race info for race %s. Using NULL texture.", row.GetUInt32("base_texture_id"),name.GetData() ); } --- 168,172 ---- if (textname==NULL) { ! Warning3(LOG_ANY,"Unresolvable texture id %lu in base_texture_id field of race info for race %s. Using NULL texture.", row.GetUInt32("base_texture_id"),name.GetData() ); } |