From 06d319e5f851e2a670cd0ef8fb83708e3637ff8b Mon Sep 17 00:00:00 2001 From: Vinolentus Date: Wed, 16 Mar 2011 03:22:24 +0300 Subject: [PATCH] [11256] Restore broken in [7207] Creature::SaveToDB overwriting. Signed-off-by: VladimirMangos --- src/game/Pet.h | 2 +- src/game/TemporarySummon.h | 9 +++++++++ src/game/Vehicle.h | 2 +- src/shared/revision_nr.h | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/game/Pet.h b/src/game/Pet.h index 9b81b0830..a5e39718d 100644 --- a/src/game/Pet.h +++ b/src/game/Pet.h @@ -260,7 +260,7 @@ class Pet : public Creature private: PetModeFlags m_petModeFlags; - void SaveToDB(uint32, uint8) // overwrited of Creature::SaveToDB - don't must be called + void SaveToDB(uint32, uint8, uint32) // overwrited of Creature::SaveToDB - don't must be called { MANGOS_ASSERT(false); } diff --git a/src/game/TemporarySummon.h b/src/game/TemporarySummon.h index ede581b15..0dd0a56b4 100644 --- a/src/game/TemporarySummon.h +++ b/src/game/TemporarySummon.h @@ -34,6 +34,15 @@ class TemporarySummon : public Creature ObjectGuid const& GetSummonerGuid() const { return m_summoner ; } Unit* GetSummoner() const { return ObjectAccessor::GetUnit(*this, m_summoner); } private: + void SaveToDB(uint32, uint8, uint32) // overwrited of Creature::SaveToDB - don't must be called + { + MANGOS_ASSERT(false); + } + void DeleteFromDB() // overwrited of Creature::DeleteFromDB - don't must be called + { + MANGOS_ASSERT(false); + } + TempSummonType m_type; uint32 m_timer; uint32 m_lifetime; diff --git a/src/game/Vehicle.h b/src/game/Vehicle.h index ca38c99fd..35a91090d 100644 --- a/src/game/Vehicle.h +++ b/src/game/Vehicle.h @@ -48,7 +48,7 @@ class Vehicle : public Creature uint32 m_vehicleId; private: - void SaveToDB(uint32, uint8) // overwrited of Creature::SaveToDB - don't must be called + void SaveToDB(uint32, uint8, uint32) // overwrited of Creature::SaveToDB - don't must be called { MANGOS_ASSERT(false); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 45c918b93..3ee6e9a30 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 "11255" + #define REVISION_NR "11256" #endif // __REVISION_NR_H__