From 74a9ff8cde345c6271a424c163e71caee014e8e3 Mon Sep 17 00:00:00 2001 From: arrai Date: Sat, 22 Nov 2008 18:13:14 +0100 Subject: [PATCH] Fixed unintialized Creature::m_isVehicle --- src/game/Creature.cpp | 5 +++-- src/game/Creature.h | 1 - src/game/Pet.h | 1 - src/game/Player.h | 1 - src/game/Unit.h | 3 ++- src/game/Vehicle.cpp | 1 - 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 50bbdc14..19107131 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -96,11 +96,12 @@ Unit(), i_AI(NULL), lootForPickPocketed(false), lootForBody(false), m_groupLootTimer(0), lootingGroupLeaderGUID(0), m_lootMoney(0), m_lootRecipient(0), m_deathTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_respawnradius(0.0f), -m_gossipOptionLoaded(false), m_emoteState(0), m_isPet(false), m_isTotem(false), -m_regenTimer(2000), m_defaultMovementType(IDLE_MOTION_TYPE), m_equipmentId(0), +m_gossipOptionLoaded(false), m_emoteState(0), m_isPet(false), m_isTotem(false), m_isVehicle(false), +m_defaultMovementType(IDLE_MOTION_TYPE), m_equipmentId(0), m_AlreadyCallAssistence(false), m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false), m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL),m_creatureInfo(NULL), m_DBTableGuid(0) { + m_regenTimer = 200; m_valuesCount = UNIT_END; for(int i =0; i<4; ++i) diff --git a/src/game/Creature.h b/src/game/Creature.h index af97e517..a23e8be1 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -625,7 +625,6 @@ class MANGOS_DLL_SPEC Creature : public Unit bool m_isTotem; // set only in Totem::Totem void RegenerateMana(); void RegenerateHealth(); - uint32 m_regenTimer; MovementGeneratorType m_defaultMovementType; Cell m_currentCell; // store current cell where creature listed uint32 m_DBTableGuid; ///< For new or temporary creatures is 0 for saved it is lowguid diff --git a/src/game/Pet.h b/src/game/Pet.h index f43a1e30..29c96dcc 100644 --- a/src/game/Pet.h +++ b/src/game/Pet.h @@ -221,7 +221,6 @@ class Pet : public Creature bool m_removed; // prevent overwrite pet state in DB at next Pet::Update if pet already removed(saved) protected: - uint32 m_regenTimer; uint32 m_happinessTimer; PetType m_petType; int32 m_duration; // time until unsummon (used mostly for summoned guardians and not used for controlled pets) diff --git a/src/game/Player.h b/src/game/Player.h index 9bb7d7f3..e724bd9a 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -2236,7 +2236,6 @@ class MANGOS_DLL_SPEC Player : public Unit bool m_DailyQuestChanged; time_t m_lastDailyQuestTime; - uint32 m_regenTimer; uint32 m_breathTimer; uint32 m_drunkTimer; uint16 m_drunk; diff --git a/src/game/Unit.h b/src/game/Unit.h index 3b585b4f..46cedc37 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -493,7 +493,7 @@ enum UnitFlags2 UNIT_FLAG2_FEIGN_DEATH = 0x00000001, UNIT_FLAG2_COMPREHEND_LANG = 0x00000008, UNIT_FLAG2_FORCE_MOVE = 0x00000040, - UNIT_FLAG2_UNKNOWN1 = 0x00000800 + UNIT_FLAG2_REGENERATE_POWER = 0x00000800 }; /// Non Player Character flags @@ -1370,6 +1370,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject uint32 m_unit_movement_flags; uint32 m_reactiveTimer[MAX_REACTIVE]; + uint32 m_regenTimer; private: void SendAttackStop(Unit* victim); // only from AttackStop(Unit*) diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp index 374b083f..12acd640 100644 --- a/src/game/Vehicle.cpp +++ b/src/game/Vehicle.cpp @@ -82,7 +82,6 @@ bool Vehicle::Create(uint32 guidlow, Map *map, uint32 Entry, uint32 vehicleId, u SetVehicleId(vehicleId); SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK); - SetUInt32Value(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_UNKNOWN1); //SetUInt32Value(UNIT_FIELD_BYTES_1, 0x02000001); //SetUInt32Value(UNIT_FIELD_BYTES_2, 0x00000001); SetFloatValue(UNIT_FIELD_HOVERHEIGHT, 1.0f); -- 2.11.4.GIT