Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Fix the lurker below. Thanks to rat.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-30 11:50:55 -05:00
parent c5fe210461
commit 31324d56eb
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/FULL/world_spell_full.sql
View File

@@ -2270,4 +2270,7 @@ UPDATE `script_texts` SET `type` = '3' WHERE `entry` IN ('-1532089','-1532090');
# Chicken Net
DELETE FROM `spell_script_target` WHERE `entry` = '51959' and `type` = '1';
INSERT INTO `spell_script_target` ( `entry`, `type`, `targetEntry`) VALUES ('51959', '1', '28161');
INSERT INTO `spell_script_target` ( `entry`, `type`, `targetEntry`) VALUES ('51959', '1', '28161');
# the lurker below
update creature_template set inhabittype=3 where entry=21217;

1
sql/updates/5484_world_scripts.sql Normal file
View File

@@ -0,0 +1 @@
update creature_template set inhabittype=3 where entry=21217;

10
src/game/IdleMovementGenerator.cpp
View File

@@ -57,14 +57,14 @@ bool RotateMovementGenerator::Update(Unit& owner, const uint32& diff)
float angle = owner.GetOrientation();
if(m_direction == ROTATE_DIRECTION_LEFT)
{
angle += diff / m_duration * M_PI * 2;
if(angle >= M_PI * 2 ) angle = 0;
angle += (float)diff * M_PI * 2 / m_maxDuration;
while(angle >= M_PI * 2 ) angle -= M_PI * 2;
}
else
{
angle -= diff / m_duration * M_PI * 2;
if(angle < 0) angle = M_PI * 2;
}
angle -= (float)diff * M_PI * 2 / m_maxDuration;
while(angle < 0) angle += M_PI * 2;
}
owner.SetOrientation(angle);
owner.SendMovementFlagUpdate(); // this is a hack. we do not have anything correct to send in the beginning

4
src/game/IdleMovementGenerator.h
View File

@@ -39,7 +39,7 @@ extern IdleMovementGenerator si_idleMovement;
class TRINITY_DLL_SPEC RotateMovementGenerator : public MovementGenerator
{
public:
explicit RotateMovementGenerator(uint32 time, RotateDirection direction) : m_duration(time), m_direction(direction) {}
explicit RotateMovementGenerator(uint32 time, RotateDirection direction) : m_duration(time), m_maxDuration(time), m_direction(direction) {}
void Initialize(Unit& owner);
void Finalize(Unit& owner);
@@ -48,7 +48,7 @@ class TRINITY_DLL_SPEC RotateMovementGenerator : public MovementGenerator
MovementGeneratorType GetMovementGeneratorType() { return ROTATE_MOTION_TYPE; }
private:
uint32 m_duration;
uint32 m_duration, m_maxDuration;
RotateDirection m_direction;
};

3
src/game/MotionMaster.cpp
View File

@@ -521,6 +521,9 @@ void MotionMaster::MovePath(uint32 path_id, bool repeatable)
void MotionMaster::MoveRotate(uint32 time, RotateDirection direction)
{
if(!time)
return;
Mutate(new RotateMovementGenerator(time, direction), MOTION_SLOT_ACTIVE);
}