diff options
| author | Spp <none@none> | 2010-08-30 23:07:14 +0200 |
|---|---|---|
| committer | Spp <none@none> | 2010-08-30 23:07:14 +0200 |
| commit | e252b8abe764e5e348e8ec89deec944729437147 (patch) | |
| tree | f131abb9ab5f0ebae01d4c0481cce237d78e33eb /src/server/game/Server | |
| parent | a6d075dfc6691797aaa09bd119bd1a1b34034ff5 (diff) | |
Core: Fix more warnings
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Server')
3 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index e5025aa5bd0..e47e5e917d9 100644 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -562,7 +562,7 @@ void WorldSession::HandleAddFriendOpcode(WorldPacket & recv_data) void WorldSession::HandleAddFriendOpcodeCallBack(QueryResult_AutoPtr result, std::string friendNote) { uint64 friendGuid; - uint64 friendAcctid; + uint32 friendAcctid; uint32 team; FriendsResult friendResult; @@ -697,7 +697,7 @@ void WorldSession::HandleSetContactNotesOpcode(WorldPacket & recv_data) uint64 guid; std::string note; recv_data >> guid >> note; - _player->GetSocial()->SetFriendNote(guid, note); + _player->GetSocial()->SetFriendNote(GUID_LOPART(guid), note); } void WorldSession::HandleBugOpcode(WorldPacket & recv_data) diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp index e81cc59e0ff..05a6685105b 100644 --- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp @@ -157,9 +157,9 @@ void WorldSession::HandleMoveWorldportAckOpcode() { if (mapDiff->resetTime) { - if (uint32 timeReset = sInstanceSaveMgr.GetResetTimeFor(mEntry->MapID,diff)) + if (time_t timeReset = sInstanceSaveMgr.GetResetTimeFor(mEntry->MapID,diff)) { - uint32 timeleft = timeReset - time(NULL); + uint32 timeleft = uint32(timeReset - time(NULL)); GetPlayer()->SendInstanceResetWarning(mEntry->MapID, diff, timeleft); } } diff --git a/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp index da52ead96d0..19af7e18b01 100644 --- a/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp @@ -263,14 +263,14 @@ void WorldSession::HandlePetitionShowSignOpcode(WorldPacket & recv_data) // result == NULL also correct in case no sign yet if (result) - signs = result->GetRowCount(); + signs = uint8(result->GetRowCount()); sLog.outDebug("CMSG_PETITION_SHOW_SIGNATURES petition entry: '%u'", petitionguid_low); WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8+8+4+1+signs*12)); data << uint64(petitionguid); // petition guid data << uint64(_player->GetGUID()); // owner guid - data << uint32(petitionguid_low); // guild guid (in mangos always same as GUID_LOPART(petitionguid) + data << uint32(petitionguid_low); // guild guid data << uint8(signs); // sign's count for (uint8 i = 1; i <= signs; ++i) @@ -279,7 +279,7 @@ void WorldSession::HandlePetitionShowSignOpcode(WorldPacket & recv_data) uint64 plguid = fields2[0].GetUInt64(); data << uint64(plguid); // Player GUID - data << (uint32)0; // there 0 ... + data << uint32(0); // there 0 ... result->NextRow(); } @@ -664,12 +664,12 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recv_data) result = CharacterDatabase.PQuery("SELECT playerguid FROM petition_sign WHERE petitionguid = '%u'", GUID_LOPART(petitionguid)); // result == NULL also correct charter without signs if (result) - signs = result->GetRowCount(); + signs = uint8(result->GetRowCount()); WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8+8+4+signs+signs*12)); data << uint64(petitionguid); // petition guid data << uint64(_player->GetGUID()); // owner guid - data << uint32(GUID_LOPART(petitionguid)); // guild guid (in mangos always same as GUID_LOPART(petition guid) + data << uint32(GUID_LOPART(petitionguid)); // guild guid data << uint8(signs); // sign's count for (uint8 i = 1; i <= signs; ++i) @@ -678,7 +678,7 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recv_data) plguid = fields2[0].GetUInt64(); data << uint64(plguid); // Player GUID - data << (uint32)0; // there 0 ... + data << uint32(0); // there 0 ... result->NextRow(); } @@ -750,7 +750,7 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data) uint8 signs; result = CharacterDatabase.PQuery("SELECT playerguid FROM petition_sign WHERE petitionguid = '%u'", GUID_LOPART(petitionguid)); if (result) - signs = result->GetRowCount(); + signs = uint8(result->GetRowCount()); else signs = 0; |
