Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 08:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core. fix build and some codestyle changes

Browse Source
This commit is contained in:
joschiwald
2013-11-13 23:32:38 +01:00
parent f01fe074cc
commit 0790138d73
20 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/GameObject/GameObject.cpp
View File

@@ -340,7 +340,7 @@ void GameObject::Update(uint32 diff)
G3D::Vector3 src(GetPositionX(), GetPositionY(), GetPositionZ());
sLog->outInfo("misc", "Src: %s Dest: %s", src.toString().c_str(), pos.toString().c_str());
TC_LOG_INFO("misc", "Src: %s Dest: %s", src.toString().c_str(), pos.toString().c_str());
GetMap()->GameObjectRelocation(this, pos.x, pos.y, pos.z, GetOrientation());
}

8
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
View File

@@ -141,7 +141,7 @@ public:
if (!Intro || IsIntro)
return;
if (Creature* Madrigosa = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MADRIGOSA))
if (Creature* Madrigosa = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MADRIGOSA)))
{
Madrigosa->Respawn();
Madrigosa->setActive(true);
@@ -279,12 +279,14 @@ public:
{
if (IntroFrostBoltTimer <= diff)
{
if (Creature* Madrigosa = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MADRIGOSA))
if (Creature* Madrigosa = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MADRIGOSA)))
{
Madrigosa->CastSpell(me, SPELL_INTRO_FROSTBOLT, true);
IntroFrostBoltTimer = 2000;
}
} else IntroFrostBoltTimer -= diff;
}
else
IntroFrostBoltTimer -= diff;
}
if (!UpdateVictim())

2
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
View File

@@ -293,6 +293,8 @@ public:
Phase = 4;
me->DisappearAndDie();
break;
default:
break;
}
Timer[TIMER_PHASE] = 3000;
} else Timer[TIMER_PHASE] -= diff;

6
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
View File

@@ -34,9 +34,9 @@ DoorData const doorData[] =
{ GO_FIRE_BARRIER, DATA_FELMYST, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_MURUS_GATE_1, DATA_MURU, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_MURUS_GATE_2, DATA_MURU, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_BOSS_COLLISION_1, DATA_KALECGOS, DOOR_TYPE_DOOR, BOUNDARY_NONE },
{ GO_BOSS_COLLISION_2, DATA_KALECGOS, DOOR_TYPE_DOOR, BOUNDARY_NONE },
{ GO_FORCE_FIELD, DATA_KALECGOS, DOOR_TYPE_DOOR, BOUNDARY_NONE },
{ GO_BOSS_COLLISION_1, DATA_KALECGOS, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_BOSS_COLLISION_2, DATA_KALECGOS, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_FORCE_FIELD, DATA_KALECGOS, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE } // END
};

2
src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
View File

@@ -81,7 +81,7 @@ public:
Summon = false;
}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void JustSummoned(Creature* summoned) OVERRIDE
{

2
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
View File

@@ -212,7 +212,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void JustSummoned(Creature* summoned) OVERRIDE
{

3
src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
View File

@@ -189,7 +189,6 @@ public:
}
void MoveInLineOfSight(Unit* who) OVERRIDE
{
if (!who)
return;
@@ -393,7 +392,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void JustDied(Unit* /*killer*/) OVERRIDE
{

2
src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
View File

@@ -458,7 +458,7 @@ public:
StartEvent();
}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void StartEvent()
{

2
src/server/scripts/Kalimdor/zone_mulgore.cpp
View File

@@ -284,7 +284,7 @@ public:
amountWP = 49;
}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void MovementInform(uint32 type, uint32 id) OVERRIDE
{

2
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
View File

@@ -144,7 +144,7 @@ public:
summoned->AI()->AttackStart(me);
}
void Reset()OVERRIDE { }
void Reset() OVERRIDE { }
};
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE

2
src/server/scripts/Kalimdor/zone_tanaris.cpp
View File

@@ -500,7 +500,7 @@ public:
}
}
void Reset()OVERRIDE { }
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE
{

17
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
View File

@@ -43,12 +43,21 @@ class instance_forge_of_souls : public InstanceMapScript
teamInInstance = 0;
}
void OnPlayerEnter(Player* player) OVERRIDE
{
if (!teamInInstance)
teamInInstance = player->GetTeam();
}
void OnCreatureCreate(Creature* creature) OVERRIDE
{
Map::PlayerList const &players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
teamInInstance = player->GetTeam();
if (!teamInInstance)
{
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
teamInInstance = player->GetTeam();
}
switch (creature->GetEntry())
{

8
src/server/scripts/Northrend/zone_dalaran.cpp
View File

@@ -64,11 +64,11 @@ public:
creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true);
}
void Reset()OVERRIDE { }
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void AttackStart(Unit* /*who*/)OVERRIDE { }
void AttackStart(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* who) OVERRIDE
@@ -118,7 +118,7 @@ public:
return;
}
void UpdateAI(uint32 /*diff*/)OVERRIDE { }
void UpdateAI(uint32 /*diff*/) OVERRIDE { }
};
CreatureAI* GetAI(Creature* creature) const OVERRIDE

2
src/server/scripts/Northrend/zone_icecrown.cpp
View File

@@ -483,7 +483,7 @@ class npc_tournament_training_dummy : public CreatureScript
me->SetControlled(true, UNIT_STATE_STUNNED);
}
void MoveInLineOfSight(Unit* /*who*/)OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
};

3
src/server/scripts/Northrend/zone_zuldrak.cpp
View File

@@ -141,8 +141,7 @@ public:
DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P
}
void MoveInLineOfSight(Unit* /*who*/)OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE
{

2
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
View File

@@ -1990,7 +1990,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* who) OVERRIDE

4
src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
View File

@@ -16,7 +16,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ScriptMgr.h"
#include "InstanceScript.h"
#include "mechanar.h"
@@ -26,7 +25,7 @@ static DoorData const doorData[] =
{ GO_DOOR_MOARG_1, DATA_GATEWATCHER_IRON_HAND, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_DOOR_MOARG_2, DATA_GATEWATCHER_GYROKILL, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_DOOR_NETHERMANCER, DATA_NETHERMANCER_SEPRETHREA, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }
{ 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }
};
class instance_mechanar : public InstanceMapScript
@@ -42,7 +41,6 @@ class instance_mechanar : public InstanceMapScript
LoadDoorData(doorData);
}
void OnGameObjectCreate(GameObject* gameObject)
{
switch (gameObject->GetEntry())

2
src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
View File

@@ -122,7 +122,7 @@ class npc_millhouse_manastorm : public CreatureScript
}
}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void KilledUnit(Unit* /*victim*/) OVERRIDE
{

4
src/server/scripts/Outland/zone_shadowmoon_valley.cpp
View File

@@ -1286,7 +1286,7 @@ public:
me->SetTarget(0);
}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void HandleAnimation()
{
@@ -1818,7 +1818,7 @@ public:
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void JustDied(Unit* /*killer*/) OVERRIDE
{

4
src/server/scripts/World/npcs_special.cpp
View File

@@ -461,7 +461,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void ReceiveEmote(Player* player, uint32 emote) OVERRIDE
{
@@ -759,7 +759,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE
{