From c545392f2e0acd5b5ce4712f82fb889de3ecc8cf Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sun, 22 Aug 2010 21:58:53 +0400 Subject: [PATCH] [10401] Some code style cleanups. --- src/game/PetitionsHandler.cpp | 8 ++--- src/game/Player.cpp | 64 +++++++++++++++++------------------ src/shared/revision_nr.h | 2 +- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp index e59fbd3ed..9d73a33d0 100644 --- a/src/game/PetitionsHandler.cpp +++ b/src/game/PetitionsHandler.cpp @@ -317,7 +317,7 @@ void WorldSession::SendPetitionQueryOpcode(ObjectGuid petitionguid) " type " "FROM petition WHERE petitionguid = '%u'", petitionLowGuid, petitionLowGuid); - if(result) + if (result) { Field* fields = result->Fetch(); ownerguid = ObjectGuid(HIGHGUID_PLAYER, fields[0].GetUInt32()); @@ -333,11 +333,11 @@ void WorldSession::SendPetitionQueryOpcode(ObjectGuid petitionguid) } WorldPacket data(SMSG_PETITION_QUERY_RESPONSE, (4+8+name.size()+1+1+4*12+2+10)); - data << uint32(petitionLowGuid); // guild/team guid (in mangos always same as GUID_LOPART(petition guid) + data << uint32(petitionLowGuid); // guild/team guid (in mangos always same as GUID_LOPART(petition guid) data << ownerguid; // charter owner guid data << name; // name (guild/arena team) data << uint8(0); // some string - if(type == 9) + if (type == 9) { data << uint32(9); data << uint32(9); @@ -363,7 +363,7 @@ void WorldSession::SendPetitionQueryOpcode(ObjectGuid petitionguid) data << uint32(0); // 14 - if(type == 9) + if (type == 9) data << uint32(0); // 15 0 - guild, 1 - arena team else data << uint32(1); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index adc3dbf9c..ae4729286 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -4284,7 +4284,7 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe // unsummon and delete for pets in world is not required: player deleted from CLI or character list with not loaded pet. // Get guids of character's pets, will deleted in transaction - QueryResult *resultPets = CharacterDatabase.PQuery("SELECT id FROM character_pet WHERE owner = '%u'",lowguid); + QueryResult *resultPets = CharacterDatabase.PQuery("SELECT id FROM character_pet WHERE owner = '%u'", lowguid); // NOW we can finally clear other DB data related to character CharacterDatabase.BeginTransaction(); @@ -4299,37 +4299,37 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe delete resultPets; } - CharacterDatabase.PExecute("DELETE FROM characters WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_account_data WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_action WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_aura WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_gifts WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_glyphs WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_homebind WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM group_instance WHERE leaderGuid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_queststatus WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_queststatus_daily WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_queststatus_weekly WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_reputation WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_skills WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_spell WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_spell_cooldown WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_ticket WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM item_instance WHERE owner_guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_social WHERE guid = '%u' OR friend='%u'",lowguid,lowguid); - CharacterDatabase.PExecute("DELETE FROM mail WHERE receiver = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM mail_items WHERE receiver = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_pet WHERE owner = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_pet_declinedname WHERE owner = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM character_equipmentsets WHERE guid = '%u'",lowguid); - CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE PlayerGuid1 = '%u' OR PlayerGuid2 = '%u'",lowguid, lowguid); - CharacterDatabase.PExecute("DELETE FROM guild_bank_eventlog WHERE PlayerGuid = '%u'",lowguid); + CharacterDatabase.PExecute("DELETE FROM characters WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_account_data WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_action WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_aura WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_gifts WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_glyphs WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_homebind WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM group_instance WHERE leaderGuid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_queststatus WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_queststatus_daily WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_queststatus_weekly WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_reputation WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_skills WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_spell WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_spell_cooldown WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_ticket WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM item_instance WHERE owner_guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_social WHERE guid = '%u' OR friend='%u'", lowguid, lowguid); + CharacterDatabase.PExecute("DELETE FROM mail WHERE receiver = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM mail_items WHERE receiver = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_pet WHERE owner = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_pet_declinedname WHERE owner = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM character_equipmentsets WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE PlayerGuid1 = '%u' OR PlayerGuid2 = '%u'", lowguid, lowguid); + CharacterDatabase.PExecute("DELETE FROM guild_bank_eventlog WHERE PlayerGuid = '%u'", lowguid); CharacterDatabase.CommitTransaction(); break; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 6384e157b..b7d81f89f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10400" + #define REVISION_NR "10401" #endif // __REVISION_NR_H__