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

Core/Misc: Apply various cosmetic changes that were made to 3.3.5 branch when porting master branch code there

Browse Source
This commit is contained in:
Shauren
2022-04-01 20:36:30 +02:00
parent 2485d13e35
commit 98e848436d
6 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/AI/SmartScripts/SmartAI.cpp
View File

@@ -69,8 +69,8 @@ void SmartAI::StartPath(bool run/* = false*/, uint32 pathId/* = 0*/, bool repeat
if (invoker && invoker->GetTypeId() == TYPEID_PLAYER)
{
_escortNPCFlags = me->m_unitData->NpcFlags[0];
me->ReplaceAllNpcFlags((NPCFlags)0);
_escortNPCFlags = me->GetNpcFlags();
me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE);
}
me->GetMotionMaster()->MovePath(_path, _repeatWaypointPath);

5
src/server/game/Entities/Unit/Unit.h
View File

@@ -2124,9 +2124,4 @@ namespace Trinity
};
}
inline void SetUnitCurrentCastSpell(Unit* unit, Spell* spell)
{
unit->SetCurrentCastSpell(spell);
}
#endif

1
src/server/game/Spells/Spell.h
View File

@@ -237,7 +237,6 @@ static const uint32 SPELL_INTERRUPT_NONPLAYER = 32747;
class TC_GAME_API Spell
{
friend void SetUnitCurrentCastSpell(Unit* unit, Spell* spell);
friend class SpellScript;
public:

4
src/server/scripts/Commands/cs_gobject.cpp
View File

@@ -571,7 +571,7 @@ public:
return true;
}
static bool HandleGameObjectSetStateCommand(ChatHandler* handler, GameObjectSpawnId guidLow, int32 objectType, Optional<int32> objectState)
static bool HandleGameObjectSetStateCommand(ChatHandler* handler, GameObjectSpawnId guidLow, int32 objectType, Optional<uint32> objectState)
{
if (!guidLow)
return false;
@@ -614,7 +614,7 @@ public:
object->SendCustomAnim(*objectState);
break;
case 5:
if (objectState < 0 || objectState > GO_DESTRUCTIBLE_REBUILDING)
if (*objectState > GO_DESTRUCTIBLE_REBUILDING)
return false;
object->SetDestructibleState(GameObjectDestructibleState(*objectState));

4
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
View File

@@ -20,6 +20,8 @@
#include "CreatureAIImpl.h"
struct Position;
#define DataHeader "CS"
#define CoSScriptName "instance_culling_of_stratholme"
@@ -83,8 +85,6 @@ uint32 constexpr EncounterCount = 5;
* - gets current instance state using GetData, then checks if we should despawn ourselves (bitmask check) *
\***********************************************************************************************************************/
struct Position;
// Note: These are bitmask values to allow combining, but only a single bit will ever be true in instance script
enum COSProgressStates : uint32
{

4
src/server/scripts/Kalimdor/zone_silithus.cpp
View File

@@ -507,7 +507,7 @@ public:
DoCast(player, SPELL_ARCANE_CHANNELING, true);//Arcane Channeling
break;
case 35:
me->CastSpell(Position{ -8088, 1520.43f, 2.67f }, SPELL_TIME_STOP, true);
me->CastSpell(Position(-8088, 1520.43f, 2.67f), SPELL_TIME_STOP, true);
break;
case 36:
DoCast(player, SPELL_CALL_PRISMATIC_BARRIER, true);
@@ -557,7 +557,7 @@ public:
break;
case 50:
Fandral->AI()->Talk(FANDRAL_EMOTE_2);
Fandral->CastSpell(Position{ -8127, 1525, 17.5f }, SPELL_THROW_HAMMER, true);
Fandral->CastSpell(Position(-8127, 1525, 17.5f), SPELL_THROW_HAMMER, true);
break;
case 51:
{