From 907cc45b44b0f727fbe31475720b342174cede64 Mon Sep 17 00:00:00 2001 From: tomrus88 Date: Sun, 31 May 2009 13:48:51 +0400 Subject: [PATCH] Fixed compile error. --- src/game/Player.cpp | 8 ++++---- src/game/UpdateData.cpp | 36 ++++++++++++------------------------ src/game/UpdateData.h | 2 +- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 56c2c1215..af3b977f2 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -20200,7 +20200,7 @@ void Player::SetEquipmentSet(uint32 index, EquipmentSet eqset) if(!found) // something wrong... { - sLog.outError("Player %s tried to save equipment set "I64FMTD" (index %u), but that equipment set not found!", GetName(), eqset.Guid, index); + sLog.outError("Player %s tried to save equipment set "UI64FMTD" (index %u), but that equipment set not found!", GetName(), eqset.Guid, index); return; } } @@ -20236,21 +20236,21 @@ void Player::_SaveEquipmentSets() ++itr; break; // nothing do case EQUIPMENT_SET_CHANGED: - CharacterDatabase.PExecute("UPDATE character_equipmentsets SET name='%s', iconname='%s', item0='%u', item1='%u', item2='%u', item3='%u', item4='%u', item5='%u', item6='%u', item7='%u', item8='%u', item9='%u', item10='%u', item11='%u', item12='%u', item13='%u', item14='%u', item15='%u', item16='%u', item17='%u', item18='%u' WHERE guid='%u' AND setguid='"I64FMTD"' AND setindex='%u'", + CharacterDatabase.PExecute("UPDATE character_equipmentsets SET name='%s', iconname='%s', item0='%u', item1='%u', item2='%u', item3='%u', item4='%u', item5='%u', item6='%u', item7='%u', item8='%u', item9='%u', item10='%u', item11='%u', item12='%u', item13='%u', item14='%u', item15='%u', item16='%u', item17='%u', item18='%u' WHERE guid='%u' AND setguid='"UI64FMTD"' AND setindex='%u'", eqset.Name.c_str(), eqset.IconName.c_str(), eqset.Items[0], eqset.Items[1], eqset.Items[2], eqset.Items[3], eqset.Items[4], eqset.Items[5], eqset.Items[6], eqset.Items[7], eqset.Items[8], eqset.Items[9], eqset.Items[10], eqset.Items[11], eqset.Items[12], eqset.Items[13], eqset.Items[14], eqset.Items[15], eqset.Items[16], eqset.Items[17], eqset.Items[18], GetGUIDLow(), eqset.Guid, index); eqset.state = EQUIPMENT_SET_UNCHANGED; ++itr; break; case EQUIPMENT_SET_NEW: - CharacterDatabase.PExecute("INSERT INTO character_equipmentsets VALUES ('%u', '"I64FMTD"', '%u', '%s', '%s', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')", + CharacterDatabase.PExecute("INSERT INTO character_equipmentsets VALUES ('%u', '"UI64FMTD"', '%u', '%s', '%s', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')", GetGUIDLow(), eqset.Guid, index, eqset.Name.c_str(), eqset.IconName.c_str(), eqset.Items[0], eqset.Items[1], eqset.Items[2], eqset.Items[3], eqset.Items[4], eqset.Items[5], eqset.Items[6], eqset.Items[7], eqset.Items[8], eqset.Items[9], eqset.Items[10], eqset.Items[11], eqset.Items[12], eqset.Items[13], eqset.Items[14], eqset.Items[15], eqset.Items[16], eqset.Items[17], eqset.Items[18]); eqset.state = EQUIPMENT_SET_UNCHANGED; ++itr; break; case EQUIPMENT_SET_DELETED: - CharacterDatabase.PExecute("DELETE FROM character_equipmentsets WHERE setguid="I64FMTD, eqset.Guid); + CharacterDatabase.PExecute("DELETE FROM character_equipmentsets WHERE setguid="UI64FMTD, eqset.Guid); m_EquipmentSets.erase(itr++); break; } diff --git a/src/game/UpdateData.cpp b/src/game/UpdateData.cpp index e3e51df22..2f6f769a7 100644 --- a/src/game/UpdateData.cpp +++ b/src/game/UpdateData.cpp @@ -45,7 +45,7 @@ void UpdateData::AddUpdateBlock(const ByteBuffer &block) ++m_blockCount; } -void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size) +void UpdateData::Compress( uint8* dst, uint32 *dst_size, uint8* src, int src_size ) { z_stream c_stream; @@ -103,14 +103,17 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size) bool UpdateData::BuildPacket(WorldPacket *packet) { + if(!packet->empty()) + packet->clear(); + ByteBuffer buf(m_data.size()); - buf << (uint32) (!m_outOfRangeGUIDs.empty() ? m_blockCount + 1 : m_blockCount); + buf << uint32(!m_outOfRangeGUIDs.empty() ? m_blockCount + 1 : m_blockCount); if(!m_outOfRangeGUIDs.empty()) { - buf << (uint8) UPDATETYPE_OUT_OF_RANGE_OBJECTS; - buf << (uint32) m_outOfRangeGUIDs.size(); + buf << uint8(UPDATETYPE_OUT_OF_RANGE_OBJECTS); + buf << uint32(m_outOfRangeGUIDs.size()); for(std::set::const_iterator i = m_outOfRangeGUIDs.begin(); i != m_outOfRangeGUIDs.end(); ++i) { @@ -120,35 +123,20 @@ bool UpdateData::BuildPacket(WorldPacket *packet) buf.append(m_data); - packet->clear(); - size_t pSize = buf.size(); if (pSize > 100 ) // compress large packets { - *packet << uint32(pSize); - packet->append(buf); - - uint32 destsize = pSize; - - Compress(const_cast(packet->contents()) + sizeof(uint32), - &destsize, - const_cast(packet->contents()) + sizeof(uint32), - pSize); - - if (destsize == 0) - { - sLog.outError("Error while compressing update packet!"); - return false; - } - - packet->resize( destsize + sizeof(uint32) ); packet->SetOpcode( SMSG_COMPRESSED_UPDATE_OBJECT ); + *packet << uint32(pSize); // original size + uint32 destsize = pSize; + Compress((uint8*)buf.contents(), &destsize, (uint8*)buf.contents(), pSize); + packet->append(buf.contents(), destsize); } else // send small packets without compression { - packet->append( buf ); packet->SetOpcode( SMSG_UPDATE_OBJECT ); + packet->append( buf ); } return true; diff --git a/src/game/UpdateData.h b/src/game/UpdateData.h index e31140e7d..8b6cc1692 100644 --- a/src/game/UpdateData.h +++ b/src/game/UpdateData.h @@ -65,6 +65,6 @@ class UpdateData std::set m_outOfRangeGUIDs; ByteBuffer m_data; - void Compress(void* dst, uint32 *dst_size, void* src, int src_size); + void Compress(uint8* dst, uint32 *dst_size, uint8* src, int src_size); }; #endif