From 145bdeb83c20e3e0928cf74fd06d0c2d42243a43 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 13 Dec 2016 07:25:41 +0000 Subject: [PATCH] closer to stock only better logic --- .../src/shared/buffers/ObjvarBuffer.h | 14 ++++++++------ .../src/shared/core/SwgSnapshot.cpp | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h index 6b7c0b01..86592fa7 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h @@ -110,20 +110,22 @@ inline bool ObjvarBuffer::IndexKey::operator<(const IndexKey &rhs) const { if (m_objectId < rhs.m_objectId) return true; - else if (m_objectId == rhs.m_objectId) + + if (m_objectId == rhs.m_objectId) return (m_nameId < rhs.m_nameId); - else - return false; + + return false; } inline bool ObjvarBuffer::IndexKey::operator>(const IndexKey &rhs) const { if (m_objectId > rhs.m_objectId) return true; - else if (m_objectId == rhs.m_objectId) + + if (m_objectId == rhs.m_objectId) return (m_nameId > rhs.m_nameId); - else - return false; + + return false; } // ====================================================================== diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp index a27150f4..19885914 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp @@ -140,7 +140,6 @@ SwgSnapshot::SwgSnapshot(DB::ModeQuery::Mode mode, bool useGoldDatabase) : // ---------------------------------------------------------------------- SwgSnapshot::~SwgSnapshot(){ - m_bufferList.clear(); } // ----------------------------------------------------------------------