From 1b39af27b2de305a98fe64cfd83ee23d969d7e08 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 14 Dec 2016 01:48:59 +0000 Subject: [PATCH] final part of fix: move saving of buffers into SwgSnapshot - it crashes if called from the parent class --- .../serverDatabase/src/shared/Snapshot.cpp | 8 ----- .../src/shared/core/SwgSnapshot.cpp | 36 +++++++++++++++++++ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/engine/server/library/serverDatabase/src/shared/Snapshot.cpp b/engine/server/library/serverDatabase/src/shared/Snapshot.cpp index 58e5d9ec..163c2225 100755 --- a/engine/server/library/serverDatabase/src/shared/Snapshot.cpp +++ b/engine/server/library/serverDatabase/src/shared/Snapshot.cpp @@ -87,14 +87,6 @@ bool Snapshot::saveToDB(DB::Session *session) return false; } - for (BufferListType::iterator buffer=m_bufferList.begin(); buffer!=m_bufferList.end(); ++buffer) - { - if (! (*buffer)->save(session)) { - m_isBeingSaved = false; - return false; - } - } - for (step=m_customStepList.begin(); step !=m_customStepList.end(); ++step) { NOT_NULL(*step); diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp index 19885914..b02cd32b 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp @@ -163,6 +163,42 @@ bool SwgSnapshot::saveToDB(DB::Session *session) if (! (m_objectTableBuffer.save(session))) return false; + + m_battlefieldMarkerObjectBuffer.save(session); + m_battlefieldParticipantBuffer.save(session); + m_buildingObjectBuffer.save(session); + m_bountyHunterTargetBuffer.save(session); + m_cellObjectBuffer.save(session); + m_cityObjectBuffer.save(session); + m_creatureObjectBuffer.save(session); + m_experienceBuffer.save(session); + m_factoryObjectBuffer.save(session); + m_guildObjectBuffer.save(session); + m_harvesterInstallationObjectBuffer.save(session); + m_installationObjectBuffer.save(session); + m_intangibleObjectBuffer.save(session); + m_locationBuffer.save(session); + m_manufactureInstallationObjectBuffer.save(session); + m_manufactureSchematicAttributeBuffer.save(session); + m_manufactureSchematicObjectBuffer.save(session); + m_messageBuffer.save(session); + m_missionObjectBuffer.save(session); + m_objvarBuffer.save(session); + m_planetObjectBuffer.save(session); + m_playerObjectBuffer.save(session); + m_playerQuestObjectBuffer.save(session); + m_propertyListBuffer.save(session); + m_resourceContainerObjectBuffer.save(session); + m_resourceTypeBuffer.save(session); + m_scriptBuffer.save(session); + m_shipObjectBuffer.save(session); + m_staticObjectBuffer.save(session); + m_tangibleObjectBuffer.save(session); + m_universeObjectBuffer.save(session); + m_vehicleObjectBuffer.save(session); + m_waypointBuffer.save(session); + m_weaponObjectBuffer.save(session); + if (! (Snapshot::saveToDB(session))) return false;