Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw

Browse Source 
Conflicts:
	src/server/collision/Management/MMapManager.h
This commit is contained in:
Sebastian Valle committed 2013-10-29 13:13:37 -05:00
2 parents 4ce12dc481 3d5a317b75
commit bb057ae40b
650 files changed
+6004 -3288
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/Commands/cs_debug.cpp
+26
View File
@@ -31,6 +31,7 @@ EndScriptData */
#include "GridNotifiers.h"
#include "GridNotifiersImpl.h"
#include "GossipDef.h"
#include "Transport.h"
#include "Language.h"
#include <fstream>
@@ -91,6 +92,7 @@ public:
{ "areatriggers", rbac::RBAC_PERM_COMMAND_DEBUG_AREATRIGGERS, false, &HandleDebugAreaTriggersCommand, "", NULL },
{ "los", rbac::RBAC_PERM_COMMAND_DEBUG_LOS, false, &HandleDebugLoSCommand, "", NULL },
{ "moveflags", rbac::RBAC_PERM_COMMAND_DEBUG_MOVEFLAGS, false, &HandleDebugMoveflagsCommand, "", NULL },
{ "transport", rbac::RBAC_PERM_COMMAND_DEBUG_TRANSPORT, false, &HandleDebugTransportCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand commandTable[] =
@@ -1363,6 +1365,30 @@ public:
handler->PSendSysMessage("Waypoint SQL written to SQL Developer log");
return true;
}
static bool HandleDebugTransportCommand(ChatHandler* handler, char const* args)
{
Transport* transport = handler->GetSession()->GetPlayer()->GetTransport();
if (!transport)
return false;
bool start = false;
if (!stricmp(args, "stop"))
transport->EnableMovement(false);
else if (!stricmp(args, "start"))
{
transport->EnableMovement(true);
start = true;
}
else
{
handler->PSendSysMessage("Transport %s is %s", transport->GetName().c_str(), transport->GetGoState() == GO_STATE_READY ? "stopped" : "moving");
return true;
}
handler->PSendSysMessage("Transport %s %s", transport->GetName().c_str(), start ? "started" : "stopped");
return true;
}
};
void AddSC_debug_commandscript()
src/server/scripts/Commands/cs_group.cpp
+48 -3
View File
@@ -260,24 +260,35 @@ public:
static bool HandleGroupListCommand(ChatHandler* handler, char const* args)
{
// Get ALL the variables!
Player* playerTarget;
uint32 phase = 0;
uint64 guidTarget;
std::string nameTarget;
std::string zoneName;
const char* onlineState = "";
// Parse the guid to uint32...
uint32 parseGUID = MAKE_NEW_GUID(atol((char*)args), 0, HIGHGUID_PLAYER);
// ... and try to extract a player out of it.
if (sObjectMgr->GetPlayerNameByGUID(parseGUID, nameTarget))
{
playerTarget = sObjectMgr->GetPlayerByLowGUID(parseGUID);
guidTarget = parseGUID;
}
// If not, we return false and end right away.
else if (!handler->extractPlayerTarget((char*)args, &playerTarget, &guidTarget, &nameTarget))
return false;
// Next, we need a group. So we define a group variable.
Group* groupTarget = NULL;
// We try to extract a group from an online player.
if (playerTarget)
groupTarget = playerTarget->GetGroup();
// If not, we extract it from the SQL.
if (!groupTarget)
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GROUP_MEMBER);
@@ -287,6 +298,7 @@ public:
groupTarget = sGroupMgr->GetGroupByDbStoreId((*resultGroup)[0].GetUInt32());
}
// If both fails, players simply has no party. Return false.
if (!groupTarget)
{
handler->PSendSysMessage(LANG_GROUP_NOT_IN_GROUP, nameTarget.c_str());
@@ -294,12 +306,20 @@ public:
return false;
}
handler->PSendSysMessage(LANG_GROUP_TYPE, (groupTarget->isRaidGroup() ? "raid" : "party"));
// We get the group members after successfully detecting a group.
Group::MemberSlotList const& members = groupTarget->GetMemberSlots();
// To avoid a cluster fuck, namely trying multiple queries to simply get a group member count...
handler->PSendSysMessage(LANG_GROUP_TYPE, (groupTarget->isRaidGroup() ? "raid" : "party"), members.size());
// ... we simply move the group type and member count print after retrieving the slots and simply output it's size.
// While rather dirty codestyle-wise, it saves space (if only a little). For each member, we look several informations up.
for (Group::MemberSlotList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
{
// Define temporary variable slot to iterator.
Group::MemberSlot const& slot = *itr;
// Check for given flag and assign it to that iterator
std::string flags;
if (slot.flags & MEMBER_FLAG_ASSISTANT)
flags = "Assistant";
@@ -321,13 +341,38 @@ public:
if (flags.empty())
flags = "None";
// Check if iterator is online. If is...
Player* p = ObjectAccessor::FindPlayer((*itr).guid);
const char* onlineState = (p && p->IsInWorld()) ? "online" : "offline";
if (p && p->IsInWorld())
{
// ... than, it prints information like "is online", where he is, etc...
onlineState = "online";
phase = (!p->IsGameMaster() ? p->GetPhaseMask() : -1);
uint32 locale = handler->GetSessionDbcLocale();
AreaTableEntry const* area = GetAreaEntryByAreaID(p->GetAreaId());
if (area)
{
AreaTableEntry const* zone = GetAreaEntryByAreaID(area->zone);
if (zone)
zoneName = zone->area_name[locale];
}
}
else
{
// ... else, everything is set to offline or neutral values.
zoneName = "<ERROR>";
onlineState = "Offline";
phase = 0;
}
// Now we can print those informations for every single member of each group!
handler->PSendSysMessage(LANG_GROUP_PLAYER_NAME_GUID, slot.name.c_str(), onlineState,
GUID_LOPART(slot.guid), flags.c_str(), lfg::GetRolesString(slot.roles).c_str());
zoneName.c_str(), phase, GUID_LOPART(slot.guid), flags.c_str(),
lfg::GetRolesString(slot.roles).c_str());
}
// And finish after every iterator is done.
return true;
}
};
src/server/scripts/Commands/cs_misc.cpp
+1 -1
View File
@@ -1655,7 +1655,7 @@ public:
// Output III. LANG_PINFO_BANNED if ban exists and is applied
if (banTime >= 0)
handler->PSendSysMessage(LANG_PINFO_BANNED, banType.c_str(), banTime > 0 ? secsToTimeString(banTime - time(NULL), true).c_str() : "permanently", banReason.c_str(), bannedBy.c_str());
handler->PSendSysMessage(LANG_PINFO_BANNED, banType.c_str(), banReason.c_str(), banTime > 0 ? secsToTimeString(banTime - time(NULL), true).c_str() : "permanently", bannedBy.c_str());
// Output IV. LANG_PINFO_MUTED if mute is applied
if (muteTime > 0)
src/server/scripts/Commands/cs_npc.cpp
+14 -26
View File
@@ -245,24 +245,22 @@ public:
float o = chr->GetOrientation();
Map* map = chr->GetMap();
if (chr->GetTransport())
if (Transport* trans = chr->GetTransport())
{
uint32 tguid = chr->GetTransport()->AddNPCPassenger(0, id, chr->GetTransOffsetX(), chr->GetTransOffsetY(), chr->GetTransOffsetZ(), chr->GetTransOffsetO());
if (tguid > 0)
{
PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_INS_CREATURE_TRANSPORT);
uint32 guid = sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT);
CreatureData& data = sObjectMgr->NewOrExistCreatureData(guid);
data.id = id;
data.phaseMask = chr->GetPhaseMaskForSpawn();
data.posX = chr->GetTransOffsetX();
data.posY = chr->GetTransOffsetY();
data.posZ = chr->GetTransOffsetZ();
data.orientation = chr->GetTransOffsetO();
stmt->setInt32(0, int32(tguid));
stmt->setInt32(1, int32(id));
stmt->setInt32(2, int32(chr->GetTransport()->GetEntry()));
stmt->setFloat(3, chr->GetTransOffsetX());
stmt->setFloat(4, chr->GetTransOffsetY());
stmt->setFloat(5, chr->GetTransOffsetZ());
stmt->setFloat(6, chr->GetTransOffsetO());
Creature* creature = trans->CreateNPCPassenger(guid, &data);
WorldDatabase.Execute(stmt);
}
creature->SaveToDB(trans->GetGOInfo()->moTransport.mapID, 1 << map->GetSpawnMode(), chr->GetPhaseMaskForSpawn());
sObjectMgr->AddCreatureToGrid(guid, &data);
return true;
}
@@ -899,17 +897,6 @@ public:
return false;
}
if (target->GetTransport() && target->GetGUIDTransport())
{
PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_TRANSPORT_EMOTE);
stmt->setInt32(0, int32(emote));
stmt->setInt32(1, target->GetTransport()->GetEntry());
stmt->setInt32(2, target->GetGUIDTransport());
WorldDatabase.Execute(stmt);
}
target->SetUInt32Value(UNIT_NPC_EMOTESTATE, emote);
return true;
@@ -1337,7 +1324,8 @@ public:
{
if (!*args)
return false;
char* charID = strtok((char*)args, " ");
char* charID = handler->extractKeyFromLink((char*)args, "Hcreature_entry");
if (!charID)
return false;
src/server/scripts/Commands/cs_tele.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ public:
std::string name = args;
if (sObjectMgr->GetGameTele(name))
if (sObjectMgr->GetGameTeleExactName(name))
{
handler->SendSysMessage(LANG_COMMAND_TP_ALREADYEXIST);
handler->SetSentErrorMessage(true);
src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+2 -2
View File
@@ -50,7 +50,7 @@ public:
struct npc_water_elementalAI : public ScriptedAI
{
npc_water_elementalAI(Creature* creature) : ScriptedAI(creature) {}
npc_water_elementalAI(Creature* creature) : ScriptedAI(creature) { }
uint32 waterBoltTimer;
uint64 balindaGUID;
@@ -99,7 +99,7 @@ public:
struct boss_balindaAI : public ScriptedAI
{
boss_balindaAI(Creature* creature) : ScriptedAI(creature), summons(me) {}
boss_balindaAI(Creature* creature) : ScriptedAI(creature), summons(me) { }
uint32 arcaneExplosionTimer;
uint32 coneOfColdTimer;
src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ public:
struct boss_drektharAI : public ScriptedAI
{
boss_drektharAI(Creature* creature) : ScriptedAI(creature) {}
boss_drektharAI(Creature* creature) : ScriptedAI(creature) { }
uint32 WhirlwindTimer;
uint32 Whirlwind2Timer;
src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ public:
struct boss_galvangarAI : public ScriptedAI
{
boss_galvangarAI(Creature* creature) : ScriptedAI(creature) {}
boss_galvangarAI(Creature* creature) : ScriptedAI(creature) { }
uint32 CleaveTimer;
uint32 FrighteningShoutTimer;
src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ public:
struct boss_vanndarAI : public ScriptedAI
{
boss_vanndarAI(Creature* creature) : ScriptedAI(creature) {}
boss_vanndarAI(Creature* creature) : ScriptedAI(creature) { }
uint32 AvatarTimer;
uint32 ThunderclapTimer;
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
+9 -9
View File
@@ -359,7 +359,7 @@ public:
struct npc_phalanxAI : public ScriptedAI
{
npc_phalanxAI(Creature* creature) : ScriptedAI(creature) {}
npc_phalanxAI(Creature* creature) : ScriptedAI(creature) { }
uint32 ThunderClap_Timer;
uint32 FireballVolley_Timer;
@@ -613,7 +613,7 @@ public:
struct npc_dughal_stormwingAI : public npc_escortAI
{
npc_dughal_stormwingAI(Creature* creature) : npc_escortAI(creature) {}
npc_dughal_stormwingAI(Creature* creature) : npc_escortAI(creature) { }
void WaypointReached(uint32 waypointId) OVERRIDE
{
@@ -634,8 +634,8 @@ public:
}
}
void EnterCombat(Unit* who) OVERRIDE {}
void Reset() OVERRIDE {}
void EnterCombat(Unit* who) OVERRIDE { }
void Reset() OVERRIDE { }
void JustDied(Unit* killer) OVERRIDE
{
@@ -804,7 +804,7 @@ public:
}
}
void Reset() OVERRIDE {}
void Reset() OVERRIDE { }
void JustDied(Unit* slayer) OVERRIDE
{
@@ -1019,7 +1019,7 @@ public:
break;
}
}
void Reset() OVERRIDE {}
void Reset() OVERRIDE { }
void JustDied(Unit* slayer) OVERRIDE
{
@@ -1125,10 +1125,10 @@ public:
struct npc_tobias_seecherAI : public npc_escortAI
{
npc_tobias_seecherAI(Creature* creature) : npc_escortAI(creature) {}
npc_tobias_seecherAI(Creature* creature) : npc_escortAI(creature) { }
void EnterCombat(Unit* who) OVERRIDE {}
void Reset() OVERRIDE {}
void EnterCombat(Unit* who) OVERRIDE { }
void Reset() OVERRIDE { }
void JustDied(Unit* killer) OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+2 -2
View File
@@ -36,7 +36,7 @@ public:
struct boss_ambassador_flamelashAI : public ScriptedAI
{
boss_ambassador_flamelashAI(Creature* creature) : ScriptedAI(creature) {}
boss_ambassador_flamelashAI(Creature* creature) : ScriptedAI(creature) { }
uint32 FireBlast_Timer;
uint32 Spirit_Timer;
@@ -47,7 +47,7 @@ public:
Spirit_Timer = 24000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void SummonSpirits(Unit* victim)
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
+2 -2
View File
@@ -40,7 +40,7 @@ public:
struct boss_anubshiahAI : public ScriptedAI
{
boss_anubshiahAI(Creature* creature) : ScriptedAI(creature) {}
boss_anubshiahAI(Creature* creature) : ScriptedAI(creature) { }
uint32 ShadowBolt_Timer;
uint32 CurseOfTongues_Timer;
@@ -57,7 +57,7 @@ public:
EnvelopingWeb_Timer = 16000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
+2 -2
View File
@@ -38,7 +38,7 @@ public:
struct boss_general_angerforgeAI : public ScriptedAI
{
boss_general_angerforgeAI(Creature* creature) : ScriptedAI(creature) {}
boss_general_angerforgeAI(Creature* creature) : ScriptedAI(creature) { }
uint32 MightyBlow_Timer;
uint32 HamString_Timer;
@@ -55,7 +55,7 @@ public:
Medics = false;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void SummonAdds(Unit* victim)
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ public:
struct boss_gorosh_the_dervishAI : public ScriptedAI
{
boss_gorosh_the_dervishAI(Creature* creature) : ScriptedAI(creature) {}
boss_gorosh_the_dervishAI(Creature* creature) : ScriptedAI(creature) { }
uint32 WhirlWind_Timer;
uint32 MortalStrike_Timer;
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
+2 -2
View File
@@ -38,7 +38,7 @@ public:
struct boss_grizzleAI : public ScriptedAI
{
boss_grizzleAI(Creature* creature) : ScriptedAI(creature) {}
boss_grizzleAI(Creature* creature) : ScriptedAI(creature) { }
uint32 GroundTremor_Timer;
uint32 Frenzy_Timer;
@@ -49,7 +49,7 @@ public:
Frenzy_Timer =0;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+2 -2
View File
@@ -39,7 +39,7 @@ public:
struct boss_high_interrogator_gerstahnAI : public ScriptedAI
{
boss_high_interrogator_gerstahnAI(Creature* creature) : ScriptedAI(creature) {}
boss_high_interrogator_gerstahnAI(Creature* creature) : ScriptedAI(creature) { }
uint32 ShadowWordPain_Timer;
uint32 ManaBurn_Timer;
@@ -54,7 +54,7 @@ public:
ShadowShield_Timer = 8000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
+2 -2
View File
@@ -42,7 +42,7 @@ public:
struct boss_magmusAI : public ScriptedAI
{
boss_magmusAI(Creature* creature) : ScriptedAI(creature) {}
boss_magmusAI(Creature* creature) : ScriptedAI(creature) { }
uint32 FieryBurst_Timer;
uint32 WarStomp_Timer;
@@ -53,7 +53,7 @@ public:
WarStomp_Timer =0;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
+2 -2
View File
@@ -41,7 +41,7 @@ public:
struct boss_moira_bronzebeardAI : public ScriptedAI
{
boss_moira_bronzebeardAI(Creature* creature) : ScriptedAI(creature) {}
boss_moira_bronzebeardAI(Creature* creature) : ScriptedAI(creature) { }
uint32 Heal_Timer;
uint32 MindBlast_Timer;
@@ -56,7 +56,7 @@ public:
Smite_Timer = 8000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ public:
struct instance_blackrock_depths_InstanceMapScript : public InstanceScript
{
instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint32 encounter[MAX_ENCOUNTER];
std::string str_data;
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ public:
struct boss_drakkisathAI : public BossAI
{
boss_drakkisathAI(Creature* creature) : BossAI(creature, DATA_GENERAL_DRAKKISATH) {}
boss_drakkisathAI(Creature* creature) : BossAI(creature, DATA_GENERAL_DRAKKISATH) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ public:
struct boss_gizrul_the_slavenerAI : public BossAI
{
boss_gizrul_the_slavenerAI(Creature* creature) : BossAI(creature, DATA_GIZRUL_THE_SLAVENER) {}
boss_gizrul_the_slavenerAI(Creature* creature) : BossAI(creature, DATA_GIZRUL_THE_SLAVENER) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ public:
struct boss_halyconAI : public BossAI
{
boss_halyconAI(Creature* creature) : BossAI(creature, DATA_HALYCON) {}
boss_halyconAI(Creature* creature) : BossAI(creature, DATA_HALYCON) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ public:
struct boss_highlordomokkAI : public BossAI
{
boss_highlordomokkAI(Creature* creature) : BossAI(creature, DATA_HIGHLORD_OMOKK) {}
boss_highlordomokkAI(Creature* creature) : BossAI(creature, DATA_HIGHLORD_OMOKK) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ public:
struct boss_lord_valthalakAI : public BossAI
{
boss_lord_valthalakAI(Creature* creature) : BossAI(creature, DATA_LORD_VALTHALAK) {}
boss_lord_valthalakAI(Creature* creature) : BossAI(creature, DATA_LORD_VALTHALAK) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ public:
struct boss_mothersmolderwebAI : public BossAI
{
boss_mothersmolderwebAI(Creature* creature) : BossAI(creature, DATA_MOTHER_SMOLDERWEB) {}
boss_mothersmolderwebAI(Creature* creature) : BossAI(creature, DATA_MOTHER_SMOLDERWEB) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ public:
struct boss_overlordwyrmthalakAI : public BossAI
{
boss_overlordwyrmthalakAI(Creature* creature) : BossAI(creature, DATA_OVERLORD_WYRMTHALAK) {}
boss_overlordwyrmthalakAI(Creature* creature) : BossAI(creature, DATA_OVERLORD_WYRMTHALAK) { }
bool Summoned;
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
+2 -2
View File
@@ -75,7 +75,7 @@ public:
struct boss_pyroguard_emberseerAI : public BossAI
{
boss_pyroguard_emberseerAI(Creature* creature) : BossAI(creature, DATA_PYROGAURD_EMBERSEER) {}
boss_pyroguard_emberseerAI(Creature* creature) : BossAI(creature, DATA_PYROGAURD_EMBERSEER) { }
void Reset() OVERRIDE
{
@@ -340,7 +340,7 @@ public:
struct npc_blackhand_incarceratorAI : public ScriptedAI
{
npc_blackhand_incarceratorAI(Creature* creature) : ScriptedAI(creature) {}
npc_blackhand_incarceratorAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ public:
struct boss_quatermasterzigrisAI : public BossAI
{
boss_quatermasterzigrisAI(Creature* creature) : BossAI(creature, DATA_QUARTERMASTER_ZIGRIS) {}
boss_quatermasterzigrisAI(Creature* creature) : BossAI(creature, DATA_QUARTERMASTER_ZIGRIS) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ public:
struct boss_shadowvoshAI : public BossAI
{
boss_shadowvoshAI(Creature* creature) : BossAI(creature, DATA_SHADOW_HUNTER_VOSHGAJIN) {}
boss_shadowvoshAI(Creature* creature) : BossAI(creature, DATA_SHADOW_HUNTER_VOSHGAJIN) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ public:
struct boss_thebeastAI : public BossAI
{
boss_thebeastAI(Creature* creature) : BossAI(creature, DATA_THE_BEAST) {}
boss_thebeastAI(Creature* creature) : BossAI(creature, DATA_THE_BEAST) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ public:
struct boss_urok_doomhowlAI : public BossAI
{
boss_urok_doomhowlAI(Creature* creature) : BossAI(creature, DATA_UROK_DOOMHOWL) {}
boss_urok_doomhowlAI(Creature* creature) : BossAI(creature, DATA_UROK_DOOMHOWL) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ public:
struct boss_warmastervooneAI : public BossAI
{
boss_warmastervooneAI(Creature* creature) : BossAI(creature, DATA_WARMASTER_VOONE) {}
boss_warmastervooneAI(Creature* creature) : BossAI(creature, DATA_WARMASTER_VOONE) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+1 -1
View File
@@ -218,7 +218,7 @@ public:
}
}
void JustSummoned(Creature* /*summon*/) OVERRIDE {}
void JustSummoned(Creature* /*summon*/) OVERRIDE { }
void SetData(uint32 type, uint32 data) OVERRIDE
{
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ class npc_firesworn : public CreatureScript
struct npc_fireswornAI : public ScriptedAI
{
npc_fireswornAI(Creature* creature) : ScriptedAI(creature) {}
npc_fireswornAI(Creature* creature) : ScriptedAI(creature) { }
uint32 immolateTimer;
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ class instance_deadmines : public InstanceMapScript
struct instance_deadmines_InstanceMapScript : public InstanceScript
{
instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint64 FactoryDoorGUID;
uint64 IronCladDoorGUID;
src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ public:
struct boss_curatorAI : public ScriptedAI
{
boss_curatorAI(Creature* creature) : ScriptedAI(creature) {}
boss_curatorAI(Creature* creature) : ScriptedAI(creature) { }
uint32 AddTimer;
uint32 HatefulBoltTimer;
src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ public:
struct boss_maiden_of_virtueAI : public ScriptedAI
{
boss_maiden_of_virtueAI(Creature* creature) : ScriptedAI(creature) {}
boss_maiden_of_virtueAI(Creature* creature) : ScriptedAI(creature) { }
uint32 Repentance_Timer;
uint32 Holyfire_Timer;
src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+3 -3
View File
@@ -90,7 +90,7 @@ public:
ResetTimer = 2000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void KilledUnit(Unit* /*victim*/) OVERRIDE
{
@@ -126,7 +126,7 @@ public:
struct boss_midnightAI : public ScriptedAI
{
boss_midnightAI(Creature* creature) : ScriptedAI(creature) {}
boss_midnightAI(Creature* creature) : ScriptedAI(creature) { }
uint64 Attumen;
uint8 Phase;
@@ -142,7 +142,7 @@ public:
me->SetVisible(true);
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void KilledUnit(Unit* /*victim*/) OVERRIDE
{
src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+6 -6
View File
@@ -399,7 +399,7 @@ public:
struct boss_baroness_dorothea_millstipeAI : public boss_moroes_guestAI
{
//Shadow Priest
boss_baroness_dorothea_millstipeAI(Creature* creature) : boss_moroes_guestAI(creature) {}
boss_baroness_dorothea_millstipeAI(Creature* creature) : boss_moroes_guestAI(creature) { }
uint32 ManaBurn_Timer;
uint32 MindFlay_Timer;
@@ -462,7 +462,7 @@ public:
struct boss_baron_rafe_dreugerAI : public boss_moroes_guestAI
{
//Retr Pally
boss_baron_rafe_dreugerAI(Creature* creature) : boss_moroes_guestAI(creature){}
boss_baron_rafe_dreugerAI(Creature* creature) : boss_moroes_guestAI(creature){ }
uint32 HammerOfJustice_Timer;
uint32 SealOfCommand_Timer;
@@ -519,7 +519,7 @@ public:
struct boss_lady_catriona_von_indiAI : public boss_moroes_guestAI
{
//Holy Priest
boss_lady_catriona_von_indiAI(Creature* creature) : boss_moroes_guestAI(creature) {}
boss_lady_catriona_von_indiAI(Creature* creature) : boss_moroes_guestAI(creature) { }
uint32 DispelMagic_Timer;
uint32 GreaterHeal_Timer;
@@ -589,7 +589,7 @@ public:
struct boss_lady_keira_berrybuckAI : public boss_moroes_guestAI
{
//Holy Pally
boss_lady_keira_berrybuckAI(Creature* creature) : boss_moroes_guestAI(creature) {}
boss_lady_keira_berrybuckAI(Creature* creature) : boss_moroes_guestAI(creature) { }
uint32 Cleanse_Timer;
uint32 GreaterBless_Timer;
@@ -663,7 +663,7 @@ public:
struct boss_lord_robin_darisAI : public boss_moroes_guestAI
{
//Arms Warr
boss_lord_robin_darisAI(Creature* creature) : boss_moroes_guestAI(creature) {}
boss_lord_robin_darisAI(Creature* creature) : boss_moroes_guestAI(creature) { }
uint32 Hamstring_Timer;
uint32 MortalStrike_Timer;
@@ -719,7 +719,7 @@ public:
struct boss_lord_crispin_ferenceAI : public boss_moroes_guestAI
{
//Arms Warr
boss_lord_crispin_ferenceAI(Creature* creature) : boss_moroes_guestAI(creature) {}
boss_lord_crispin_ferenceAI(Creature* creature) : boss_moroes_guestAI(creature) { }
uint32 Disarm_Timer;
uint32 HeroicStrike_Timer;
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+4 -4
View File
@@ -110,16 +110,16 @@ public:
struct netherspite_infernalAI : public ScriptedAI
{
netherspite_infernalAI(Creature* creature) : ScriptedAI(creature),
HellfireTimer(0), CleanupTimer(0), malchezaar(0), point(NULL) {}
HellfireTimer(0), CleanupTimer(0), malchezaar(0), point(NULL) { }
uint32 HellfireTimer;
uint32 CleanupTimer;
uint64 malchezaar;
InfernalPoint *point;
void Reset() OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+2 -2
View File
@@ -520,7 +520,7 @@ public:
struct water_elementalAI : public ScriptedAI
{
water_elementalAI(Creature* creature) : ScriptedAI(creature) {}
water_elementalAI(Creature* creature) : ScriptedAI(creature) { }
uint32 CastTimer;
@@ -529,7 +529,7 @@ public:
CastTimer = 2000 + (rand()%3000);
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+7 -7
View File
@@ -148,7 +148,7 @@ public:
struct npc_demon_chainAI : public ScriptedAI
{
npc_demon_chainAI(Creature* creature) : ScriptedAI(creature) {}
npc_demon_chainAI(Creature* creature) : ScriptedAI(creature) { }
uint64 SacrificeGUID;
@@ -157,9 +157,9 @@ public:
SacrificeGUID = 0;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void AttackStart(Unit* /*who*/) OVERRIDE {}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void AttackStart(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void JustDied(Unit* /*killer*/) OVERRIDE
@@ -186,7 +186,7 @@ public:
struct npc_fiendish_portalAI : public PassiveAI
{
npc_fiendish_portalAI(Creature* creature) : PassiveAI(creature), summons(me){}
npc_fiendish_portalAI(Creature* creature) : PassiveAI(creature), summons(me){ }
SummonList summons;
@@ -220,7 +220,7 @@ public:
struct npc_fiendish_impAI : public ScriptedAI
{
npc_fiendish_impAI(Creature* creature) : ScriptedAI(creature) {}
npc_fiendish_impAI(Creature* creature) : ScriptedAI(creature) { }
uint32 FireboltTimer;
@@ -231,7 +231,7 @@ public:
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+5 -5
View File
@@ -238,7 +238,7 @@ public:
struct npc_titoAI : public ScriptedAI
{
npc_titoAI(Creature* creature) : ScriptedAI(creature) {}
npc_titoAI(Creature* creature) : ScriptedAI(creature) { }
uint64 DorotheeGUID;
uint32 YipTimer;
@@ -249,7 +249,7 @@ public:
YipTimer = 10000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void JustDied(Unit* /*killer*/) OVERRIDE
{
@@ -724,7 +724,7 @@ public:
struct npc_cycloneAI : public ScriptedAI
{
npc_cycloneAI(Creature* creature) : ScriptedAI(creature) {}
npc_cycloneAI(Creature* creature) : ScriptedAI(creature) { }
uint32 MoveTimer;
@@ -733,7 +733,7 @@ public:
MoveTimer = 1000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE
@@ -1073,7 +1073,7 @@ public:
RomuloDead = false;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void AttackStart(Unit* who) OVERRIDE
{
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ public:
struct instance_karazhan_InstanceMapScript : public InstanceScript
{
instance_karazhan_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_karazhan_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string strSaveData;
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+2 -2
View File
@@ -176,7 +176,7 @@ public:
Start(false, false);
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void WaypointReached(uint32 waypointId) OVERRIDE
{
@@ -512,7 +512,7 @@ public:
me->RemoveCorpse();
}
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void MovementInform(uint32 type, uint32 id) OVERRIDE
{
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+7 -7
View File
@@ -461,8 +461,8 @@ public:
DoCast(me, SPELL_FLAMESTRIKE2, true);
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
@@ -509,7 +509,7 @@ public:
FakeDeath = false;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE
{
@@ -600,7 +600,7 @@ public:
struct npc_felkael_phoenix_eggAI : public ScriptedAI
{
npc_felkael_phoenix_eggAI(Creature* creature) : ScriptedAI(creature) {}
npc_felkael_phoenix_eggAI(Creature* creature) : ScriptedAI(creature) { }
uint32 HatchTimer;
@@ -609,8 +609,8 @@ public:
HatchTimer = 10000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
@@ -652,7 +652,7 @@ public:
DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true);
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+7 -7
View File
@@ -510,7 +510,7 @@ public:
struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI
{
//Rogue
boss_kagani_nightstrikeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
boss_kagani_nightstrikeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { }
uint32 Gouge_Timer;
uint32 Kick_Timer;
@@ -614,7 +614,7 @@ public:
struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI
{
//Warlock
boss_ellris_duskhallowAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
boss_ellris_duskhallowAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { }
uint32 Immolate_Timer;
uint32 Shadow_Bolt_Timer;
@@ -705,7 +705,7 @@ public:
struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI
{
//Monk
boss_eramas_brightblazeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
boss_eramas_brightblazeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { }
uint32 Knockdown_Timer;
uint32 Snap_Kick_Timer;
@@ -766,7 +766,7 @@ public:
struct boss_yazzaiAI : public boss_priestess_lackey_commonAI
{
//Mage
boss_yazzaiAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
boss_yazzaiAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { }
bool HasIceBlocked;
@@ -896,7 +896,7 @@ public:
struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI
{
//Warrior
boss_warlord_salarisAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
boss_warlord_salarisAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { }
uint32 Intercept_Stun_Timer;
uint32 Disarm_Timer;
@@ -1127,7 +1127,7 @@ public:
struct boss_apokoAI : public boss_priestess_lackey_commonAI
{
//Shaman
boss_apokoAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
boss_apokoAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { }
uint32 Totem_Timer;
uint8 Totem_Amount;
@@ -1225,7 +1225,7 @@ public:
struct boss_zelfanAI : public boss_priestess_lackey_commonAI
{
//Engineer
boss_zelfanAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
boss_zelfanAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { }
uint32 Goblin_Dragon_Gun_Timer;
uint32 Rocket_Launch_Timer;
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+6 -6
View File
@@ -332,14 +332,14 @@ public:
struct npc_fel_crystalAI : public ScriptedAI
{
npc_fel_crystalAI(Creature* creature) : ScriptedAI(creature) {}
npc_fel_crystalAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void AttackStart(Unit* /*who*/) OVERRIDE {}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void AttackStart(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 /*diff*/) OVERRIDE {}
void UpdateAI(uint32 /*diff*/) OVERRIDE { }
void JustDied(Unit* /*killer*/) OVERRIDE
{
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+4 -4
View File
@@ -222,7 +222,7 @@ public:
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
}
void Reset() OVERRIDE {}
void Reset() OVERRIDE { }
void JustDied(Unit* slayer) OVERRIDE
{
@@ -233,10 +233,10 @@ public:
}
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void AttackStart(Unit* /*who*/) OVERRIDE {}
void AttackStart(Unit* /*who*/) OVERRIDE { }
};
};
src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ public:
struct instance_magisters_terrace_InstanceMapScript : public InstanceScript
{
instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint32 Encounter[MAX_ENCOUNTER];
uint32 DelrissaDeathCount;
src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+1 -1
View File
@@ -115,7 +115,7 @@ public:
struct npc_kalecgosAI : public ScriptedAI
{
npc_kalecgosAI(Creature* creature) : ScriptedAI(creature) {}
npc_kalecgosAI(Creature* creature) : ScriptedAI(creature) { }
uint32 m_uiTransformTimer;
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+4 -4
View File
@@ -288,7 +288,7 @@ public:
struct npc_unworthy_initiate_anchorAI : public PassiveAI
{
npc_unworthy_initiate_anchorAI(Creature* creature) : PassiveAI(creature), prisonerGUID(0) {}
npc_unworthy_initiate_anchorAI(Creature* creature) : PassiveAI(creature), prisonerGUID(0) { }
uint64 prisonerGUID;
@@ -615,7 +615,7 @@ public:
struct npc_salanar_the_horsemanAI : public ScriptedAI
{
npc_salanar_the_horsemanAI(Creature* creature) : ScriptedAI(creature) {}
npc_salanar_the_horsemanAI(Creature* creature) : ScriptedAI(creature) { }
void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE
{
@@ -687,7 +687,7 @@ public:
struct npc_ros_dark_riderAI : public ScriptedAI
{
npc_ros_dark_riderAI(Creature* creature) : ScriptedAI(creature) {}
npc_ros_dark_riderAI(Creature* creature) : ScriptedAI(creature) { }
void EnterCombat(Unit* /*who*/) OVERRIDE
{
@@ -742,7 +742,7 @@ public:
struct npc_dkc1_gothikAI : public ScriptedAI
{
npc_dkc1_gothikAI(Creature* creature) : ScriptedAI(creature) {}
npc_dkc1_gothikAI(Creature* creature) : ScriptedAI(creature) { }
void MoveInLineOfSight(Unit* who) OVERRIDE
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+4 -4
View File
@@ -51,7 +51,7 @@ public:
struct npc_crusade_persuadedAI : public ScriptedAI
{
npc_crusade_persuadedAI(Creature* creature) : ScriptedAI(creature) {}
npc_crusade_persuadedAI(Creature* creature) : ScriptedAI(creature) { }
uint32 speechTimer;
uint32 speechCounter;
@@ -375,7 +375,7 @@ public:
struct npc_scarlet_courierAI : public ScriptedAI
{
npc_scarlet_courierAI(Creature* creature) : ScriptedAI(creature) {}
npc_scarlet_courierAI(Creature* creature) : ScriptedAI(creature) { }
uint32 uiStage;
uint32 uiStage_timer;
@@ -467,7 +467,7 @@ public:
struct npc_high_inquisitor_valrothAI : public ScriptedAI
{
npc_high_inquisitor_valrothAI(Creature* creature) : ScriptedAI(creature) {}
npc_high_inquisitor_valrothAI(Creature* creature) : ScriptedAI(creature) { }
uint32 uiRenew_timer;
uint32 uiInquisitor_Penance_timer;
@@ -603,7 +603,7 @@ public:
struct npc_a_special_surpriseAI : public ScriptedAI
{
npc_a_special_surpriseAI(Creature* creature) : ScriptedAI(creature) {}
npc_a_special_surpriseAI(Creature* creature) : ScriptedAI(creature) { }
uint32 ExecuteSpeech_Timer;
uint32 ExecuteSpeech_Counter;
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+4 -4
View File
@@ -1678,10 +1678,10 @@ public:
struct npc_the_lich_king_tirion_dawnAI : public ScriptedAI
{
npc_the_lich_king_tirion_dawnAI(Creature* creature) : ScriptedAI(creature) { Reset(); }
void Reset() OVERRIDE {}
void AttackStart(Unit* /*who*/) {} // very sample, just don't make them aggreesive OVERRIDE
void UpdateAI(uint32 /*diff*/) OVERRIDE {}
void JustDied(Unit* /*killer*/) OVERRIDE {}
void Reset() OVERRIDE { }
void AttackStart(Unit* /*who*/) { } // very sample, just don't make them aggreesive OVERRIDE
void UpdateAI(uint32 /*diff*/) OVERRIDE { }
void JustDied(Unit* /*killer*/) OVERRIDE { }
};
};
src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ public:
struct npc_valkyr_battle_maidenAI : public PassiveAI
{
npc_valkyr_battle_maidenAI(Creature* creature) : PassiveAI(creature) {}
npc_valkyr_battle_maidenAI(Creature* creature) : PassiveAI(creature) { }
uint32 FlyBackTimer;
float x, y, z;
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ public:
struct boss_arcanist_doanAI : public ScriptedAI
{
boss_arcanist_doanAI(Creature* creature) : ScriptedAI(creature) {}
boss_arcanist_doanAI(Creature* creature) : ScriptedAI(creature) { }
uint32 Polymorph_Timer;
uint32 AoESilence_Timer;
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+2 -2
View File
@@ -45,7 +45,7 @@ public:
struct boss_azshir_the_sleeplessAI : public ScriptedAI
{
boss_azshir_the_sleeplessAI(Creature* creature) : ScriptedAI(creature) {}
boss_azshir_the_sleeplessAI(Creature* creature) : ScriptedAI(creature) { }
uint32 SoulSiphon_Timer;
uint32 CallOftheGrave_Timer;
@@ -58,7 +58,7 @@ public:
Terrify_Timer = 20000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ public:
struct boss_bloodmage_thalnosAI : public ScriptedAI
{
boss_bloodmage_thalnosAI(Creature* creature) : ScriptedAI(creature) {}
boss_bloodmage_thalnosAI(Creature* creature) : ScriptedAI(creature) { }
bool HpYell;
uint32 FlameShock_Timer;
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+11 -7
View File
@@ -162,8 +162,8 @@ public:
uint32 delay;
uint32 spell;
uint32 spell2;
void Reset() OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void SetType(uint32 _type)
{
switch (Creaturetype = _type)
@@ -233,7 +233,7 @@ public:
struct npc_headAI : public ScriptedAI
{
npc_headAI(Creature* creature) : ScriptedAI(creature) {}
npc_headAI(Creature* creature) : ScriptedAI(creature) { }
uint64 bodyGUID;
@@ -254,7 +254,7 @@ public:
laugh = urand(15000, 30000);
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void SaySound(uint8 textEntry, Unit* target = 0)
{
@@ -580,7 +580,11 @@ public:
Map::PlayerList const& players = me->GetMap()->GetPlayers();
if (!players.isEmpty())
sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), 285);
{
if (Group* group = players.begin()->GetSource()->GetGroup())
if (group->isLFGGroup())
sLFGMgr->FinishDungeon(group->GetGUID(), 285);
}
}
void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE
@@ -792,7 +796,7 @@ public:
struct npc_pulsing_pumpkinAI : public ScriptedAI
{
npc_pulsing_pumpkinAI(Creature* creature) : ScriptedAI(creature) {}
npc_pulsing_pumpkinAI(Creature* creature) : ScriptedAI(creature) { }
bool sprouted;
uint64 debuffGUID;
@@ -817,7 +821,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE
{
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+4 -4
View File
@@ -62,7 +62,7 @@ public:
struct boss_herodAI : public ScriptedAI
{
boss_herodAI(Creature* creature) : ScriptedAI(creature) {}
boss_herodAI(Creature* creature) : ScriptedAI(creature) { }
bool Enrage;
@@ -148,9 +148,9 @@ public:
uint32 Start_Timer;
void Reset() OVERRIDE {}
void WaypointReached(uint32 /*waypointId*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void Reset() OVERRIDE { }
void WaypointReached(uint32 /*waypointId*/) OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ public:
struct boss_high_inquisitor_fairbanksAI : public ScriptedAI
{
boss_high_inquisitor_fairbanksAI(Creature* creature) : ScriptedAI(creature) {}
boss_high_inquisitor_fairbanksAI(Creature* creature) : ScriptedAI(creature) { }
uint32 CurseOfBlood_Timer;
uint32 DispelMagic_Timer;
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ public:
struct boss_houndmaster_lokseyAI : public ScriptedAI
{
boss_houndmaster_lokseyAI(Creature* creature) : ScriptedAI(creature) {}
boss_houndmaster_lokseyAI(Creature* creature) : ScriptedAI(creature) { }
uint32 BloodLust_Timer;
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+2 -2
View File
@@ -46,7 +46,7 @@ public:
struct boss_scornAI : public ScriptedAI
{
boss_scornAI(Creature* creature) : ScriptedAI(creature) {}
boss_scornAI(Creature* creature) : ScriptedAI(creature) { }
uint32 LichSlap_Timer;
uint32 FrostboltVolley_Timer;
@@ -61,7 +61,7 @@ public:
FrostNova_Timer = 30000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ public:
struct instance_scarlet_monastery_InstanceMapScript : public InstanceScript
{
instance_scarlet_monastery_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_scarlet_monastery_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint64 PumpkinShrineGUID;
uint64 HorsemanGUID;
src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ class boss_darkmaster_gandling : public CreatureScript
struct boss_darkmaster_gandlingAI : public BossAI
{
boss_darkmaster_gandlingAI(Creature* creature) : BossAI(creature, DATA_DARKMASTERGANDLING) {}
boss_darkmaster_gandlingAI(Creature* creature) : BossAI(creature, DATA_DARKMASTERGANDLING) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ public:
struct boss_death_knight_darkreaverAI : public ScriptedAI
{
boss_death_knight_darkreaverAI(Creature* creature) : ScriptedAI(creature) {}
boss_death_knight_darkreaverAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ class boss_doctor_theolen_krastinov : public CreatureScript
struct boss_theolenkrastinovAI : public BossAI
{
boss_theolenkrastinovAI(Creature* creature) : BossAI(creature, DATA_DOCTORTHEOLENKRASTINOV) {}
boss_theolenkrastinovAI(Creature* creature) : BossAI(creature, DATA_DOCTORTHEOLENKRASTINOV) { }
void EnterCombat(Unit* /*who*/) OVERRIDE
{
src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ class boss_illucia_barov : public CreatureScript
struct boss_illuciabarovAI : public BossAI
{
boss_illuciabarovAI(Creature* creature) : BossAI(creature, DATA_LADYILLUCIABAROV) {}
boss_illuciabarovAI(Creature* creature) : BossAI(creature, DATA_LADYILLUCIABAROV) { }
void EnterCombat(Unit* /*who*/) OVERRIDE
{
src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ class boss_instructor_malicia : public CreatureScript
struct boss_instructormaliciaAI : public BossAI
{
boss_instructormaliciaAI(Creature* creature) : BossAI(creature, DATA_INSTRUCTORMALICIA) {}
boss_instructormaliciaAI(Creature* creature) : BossAI(creature, DATA_INSTRUCTORMALICIA) { }
uint32 FlashCounter;
uint32 TouchCounter;
src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ public:
struct boss_jandicebarovAI : public ScriptedAI
{
boss_jandicebarovAI(Creature* creature) : ScriptedAI(creature) {}
boss_jandicebarovAI(Creature* creature) : ScriptedAI(creature) { }
uint32 CurseOfBlood_Timer;
uint32 Illusion_Timer;
@@ -169,7 +169,7 @@ public:
struct npc_illusionofjandicebarovAI : public ScriptedAI
{
npc_illusionofjandicebarovAI(Creature* creature) : ScriptedAI(creature) {}
npc_illusionofjandicebarovAI(Creature* creature) : ScriptedAI(creature) { }
uint32 Cleave_Timer;
src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ public:
struct boss_kormokAI : public ScriptedAI
{
boss_kormokAI(Creature* creature) : ScriptedAI(creature) {}
boss_kormokAI(Creature* creature) : ScriptedAI(creature) { }
uint32 ShadowVolley_Timer;
uint32 BoneShield_Timer;
src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ class boss_lord_alexei_barov : public CreatureScript
struct boss_lordalexeibarovAI : public BossAI
{
boss_lordalexeibarovAI(Creature* creature) : BossAI(creature, DATA_LORDALEXEIBAROV) {}
boss_lordalexeibarovAI(Creature* creature) : BossAI(creature, DATA_LORDALEXEIBAROV) { }
void Reset() OVERRIDE
{
src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ class boss_lorekeeper_polkelt : public CreatureScript
struct boss_lorekeeperpolkeltAI : public BossAI
{
boss_lorekeeperpolkeltAI(Creature* creature) : BossAI(creature, DATA_LOREKEEPERPOLKELT) {}
boss_lorekeeperpolkeltAI(Creature* creature) : BossAI(creature, DATA_LOREKEEPERPOLKELT) { }
void EnterCombat(Unit* /*who*/) OVERRIDE
{
src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+2 -2
View File
@@ -48,7 +48,7 @@ public:
struct boss_rasfrostAI : public ScriptedAI
{
boss_rasfrostAI(Creature* creature) : ScriptedAI(creature) {}
boss_rasfrostAI(Creature* creature) : ScriptedAI(creature) { }
uint32 IceArmor_Timer;
uint32 Frostbolt_Timer;
@@ -69,7 +69,7 @@ public:
DoCast(me, SPELL_ICEARMOR, true);
}
void EnterCombat(Unit* /*who*/)OVERRIDE {}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void UpdateAI(uint32 diff) OVERRIDE
{
src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ class boss_the_ravenian : public CreatureScript
struct boss_theravenianAI : public BossAI
{
boss_theravenianAI(Creature* creature) : BossAI(creature, DATA_THERAVENIAN) {}
boss_theravenianAI(Creature* creature) : BossAI(creature, DATA_THERAVENIAN) { }
void EnterCombat(Unit* /*who*/) OVERRIDE
{
src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ public:
struct boss_vectusAI : public ScriptedAI
{
boss_vectusAI(Creature* creature) : ScriptedAI(creature) {}
boss_vectusAI(Creature* creature) : ScriptedAI(creature) { }
uint32 m_uiFireShield_Timer;
uint32 m_uiBlastWave_Timer;
src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ public:
struct instance_shadowfang_keep_InstanceMapScript : public InstanceScript
{
instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+2 -2
View File
@@ -145,8 +145,8 @@ public:
}
}
void Reset() OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
};
};
src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ public:
struct boss_cannon_master_willeyAI : public ScriptedAI
{
boss_cannon_master_willeyAI(Creature* creature) : ScriptedAI(creature) {}
boss_cannon_master_willeyAI(Creature* creature) : ScriptedAI(creature) { }
uint32 KnockAway_Timer;
uint32 Pummel_Timer;
src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ public:
struct boss_dathrohan_balnazzarAI : public ScriptedAI
{
boss_dathrohan_balnazzarAI(Creature* creature) : ScriptedAI(creature) {}
boss_dathrohan_balnazzarAI(Creature* creature) : ScriptedAI(creature) { }
uint32 m_uiCrusadersHammer_Timer;
uint32 m_uiCrusaderStrike_Timer;
src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ public:
struct boss_magistrate_barthilasAI : public ScriptedAI
{
boss_magistrate_barthilasAI(Creature* creature) : ScriptedAI(creature) {}
boss_magistrate_barthilasAI(Creature* creature) : ScriptedAI(creature) { }
uint32 DrainingBlow_Timer;
uint32 CrowdPummel_Timer;
src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
+2 -2
View File
@@ -59,9 +59,9 @@ class boss_postmaster_malown : public CreatureScript
struct boss_postmaster_malownAI : public BossAI
{
boss_postmaster_malownAI(Creature* creature) : BossAI(creature, TYPE_MALOWN) {}
boss_postmaster_malownAI(Creature* creature) : BossAI(creature, TYPE_MALOWN) { }
void Reset() OVERRIDE {}
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE
{
src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ public:
struct boss_timmy_the_cruelAI : public ScriptedAI
{
boss_timmy_the_cruelAI(Creature* creature) : ScriptedAI(creature) {}
boss_timmy_the_cruelAI(Creature* creature) : ScriptedAI(creature) { }
uint32 RavenousClaw_Timer;
bool HasYelled;
src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+6 -6
View File
@@ -100,14 +100,14 @@ public:
struct npc_freed_soulAI : public ScriptedAI
{
npc_freed_soulAI(Creature* creature) : ScriptedAI(creature) {}
npc_freed_soulAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE
{
Talk(SAY_ZAPPED);
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
};
};
@@ -142,7 +142,7 @@ public:
struct npc_restless_soulAI : public ScriptedAI
{
npc_restless_soulAI(Creature* creature) : ScriptedAI(creature) {}
npc_restless_soulAI(Creature* creature) : ScriptedAI(creature) { }
uint64 Tagger;
uint32 Die_Timer;
@@ -155,7 +155,7 @@ public:
Tagged = false;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE
{
@@ -224,7 +224,7 @@ public:
struct npc_spectral_ghostly_citizenAI : public ScriptedAI
{
npc_spectral_ghostly_citizenAI(Creature* creature) : ScriptedAI(creature) {}
npc_spectral_ghostly_citizenAI(Creature* creature) : ScriptedAI(creature) { }
uint32 Die_Timer;
bool Tagged;
@@ -235,7 +235,7 @@ public:
Tagged = false;
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE
{
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+2 -2
View File
@@ -675,7 +675,7 @@ public:
struct npc_shadow_imageAI : public ScriptedAI
{
npc_shadow_imageAI(Creature* creature) : ScriptedAI(creature) {}
npc_shadow_imageAI(Creature* creature) : ScriptedAI(creature) { }
uint32 ShadowfuryTimer;
uint32 KillTimer;
@@ -689,7 +689,7 @@ public:
KillTimer = 15000;
}
void EnterCombat(Unit* /*who*/)OVERRIDE {}
void EnterCombat(Unit* /*who*/)OVERRIDE { }
void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE
{
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+6 -6
View File
@@ -531,7 +531,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetSpeed(MOVE_RUN, 0.8f);
}
void Reset() OVERRIDE {}
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE
{
DoZoneInCombat();
@@ -565,12 +565,12 @@ public:
me->SetTarget(me->GetGUID());
me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01f); // core bug
}
void Reset() OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void AttackStart(Unit* /*who*/) OVERRIDE {}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void AttackStart(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 /*diff*/) OVERRIDE {}
void UpdateAI(uint32 /*diff*/) OVERRIDE { }
};
};
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+2 -2
View File
@@ -1055,7 +1055,7 @@ public:
struct npc_volatile_felfire_fiendAI : public ScriptedAI
{
npc_volatile_felfire_fiendAI(Creature* creature) : ScriptedAI(creature) {}
npc_volatile_felfire_fiendAI(Creature* creature) : ScriptedAI(creature) { }
uint32 uiExplodeTimer;
@@ -1256,7 +1256,7 @@ public:
struct npc_sinster_reflectionAI : public ScriptedAI
{
npc_sinster_reflectionAI(Creature* creature) : ScriptedAI(creature) {}
npc_sinster_reflectionAI(Creature* creature) : ScriptedAI(creature) { }
uint8 victimClass;
uint32 uiTimer[3];
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+2 -2
View File
@@ -464,7 +464,7 @@ public:
struct npc_dark_fiendAI : public ScriptedAI
{
npc_dark_fiendAI(Creature* creature) : ScriptedAI(creature) {}
npc_dark_fiendAI(Creature* creature) : ScriptedAI(creature) { }
uint32 WaitTimer;
bool InAction;
@@ -525,7 +525,7 @@ public:
struct npc_void_sentinelAI : public ScriptedAI
{
npc_void_sentinelAI(Creature* creature) : ScriptedAI(creature){}
npc_void_sentinelAI(Creature* creature) : ScriptedAI(creature){ }
uint32 PulseTimer;
uint32 VoidBlastTimer;
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ public:
struct instance_sunwell_plateau_InstanceMapScript : public InstanceScript
{
instance_sunwell_plateau_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_sunwell_plateau_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint32 m_auiEncounter[MAX_ENCOUNTER];
src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
+1 -3
View File
@@ -62,6 +62,4 @@ enum LiadrinnSpeeches
#define CS_GOSSIP3 "Why did they stop?"
#define CS_GOSSIP4 "Your insight is appreciated."
void AddSC_sunwell_plateau()
{
}
void AddSC_sunwell_plateau() { }
src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ public:
struct instance_the_stockade_InstanceMapScript : public InstanceScript
{
instance_the_stockade_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_the_stockade_InstanceMapScript(Map* map) : InstanceScript(map) { }
};
};
src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ class boss_ironaya : public CreatureScript
struct boss_ironayaAI : public ScriptedAI
{
boss_ironayaAI(Creature* creature) : ScriptedAI(creature) {}
boss_ironayaAI(Creature* creature) : ScriptedAI(creature) { }
uint32 uiArcingTimer;
bool bHasCastedWstomp;
src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+2 -2
View File
@@ -41,11 +41,11 @@ enum Events
class instance_uldaman : public InstanceMapScript
{
public:
instance_uldaman() : InstanceMapScript("instance_uldaman", 70) {}
instance_uldaman() : InstanceMapScript("instance_uldaman", 70) { }
struct instance_uldaman_InstanceMapScript : public InstanceScript
{
instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map) { }
void Initialize() OVERRIDE
{
src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ class npc_jadespine_basilisk : public CreatureScript
struct npc_jadespine_basiliskAI : public ScriptedAI
{
npc_jadespine_basiliskAI(Creature* creature) : ScriptedAI(creature) {}
npc_jadespine_basiliskAI(Creature* creature) : ScriptedAI(creature) { }
uint32 uiCslumberTimer;
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+1 -1
View File
@@ -389,7 +389,7 @@ class npc_akilzon_eagle : public CreatureScript
DoZoneInCombat();
}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void MovementInform(uint32, uint32) OVERRIDE
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+1 -1
View File
@@ -359,7 +359,7 @@ class npc_halazzi_lynx : public CreatureScript
struct npc_halazzi_lynxAI : public ScriptedAI
{
npc_halazzi_lynxAI(Creature* creature) : ScriptedAI(creature) {}
npc_halazzi_lynxAI(Creature* creature) : ScriptedAI(creature) { }
uint32 FrenzyTimer;
uint32 shredder_timer;
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+9 -9
View File
@@ -222,7 +222,7 @@ struct boss_hexlord_addAI : public ScriptedAI
instance = creature->GetInstanceScript();
}
void Reset() OVERRIDE {}
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*who*/) OVERRIDE
{
@@ -526,7 +526,7 @@ class boss_thurg : public CreatureScript
struct boss_thurgAI : public boss_hexlord_addAI
{
boss_thurgAI(Creature* creature) : boss_hexlord_addAI(creature) {}
boss_thurgAI(Creature* creature) : boss_hexlord_addAI(creature) { }
uint32 bloodlust_timer;
uint32 cleave_timer;
@@ -583,7 +583,7 @@ class boss_alyson_antille : public CreatureScript
struct boss_alyson_antilleAI : public boss_hexlord_addAI
{
//Holy Priest
boss_alyson_antilleAI(Creature* creature) : boss_hexlord_addAI(creature) {}
boss_alyson_antilleAI(Creature* creature) : boss_hexlord_addAI(creature) { }
uint32 flashheal_timer;
uint32 dispelmagic_timer;
@@ -670,7 +670,7 @@ class boss_alyson_antille : public CreatureScript
struct boss_gazakrothAI : public boss_hexlord_addAI
{
boss_gazakrothAI(Creature* creature) : boss_hexlord_addAI(creature) {}
boss_gazakrothAI(Creature* creature) : boss_hexlord_addAI(creature) { }
uint32 firebolt_timer;
@@ -721,7 +721,7 @@ class boss_lord_raadan : public CreatureScript
struct boss_lord_raadanAI : public boss_hexlord_addAI
{
boss_lord_raadanAI(Creature* creature) : boss_hexlord_addAI(creature) {}
boss_lord_raadanAI(Creature* creature) : boss_hexlord_addAI(creature) { }
uint32 flamebreath_timer;
uint32 thunderclap_timer;
@@ -772,7 +772,7 @@ class boss_darkheart : public CreatureScript
struct boss_darkheartAI : public boss_hexlord_addAI
{
boss_darkheartAI(Creature* creature) : boss_hexlord_addAI(creature) {}
boss_darkheartAI(Creature* creature) : boss_hexlord_addAI(creature) { }
uint32 psychicwail_timer;
@@ -814,7 +814,7 @@ class boss_slither : public CreatureScript
struct boss_slitherAI : public boss_hexlord_addAI
{
boss_slitherAI(Creature* creature) : boss_hexlord_addAI(creature) {}
boss_slitherAI(Creature* creature) : boss_hexlord_addAI(creature) { }
uint32 venomspit_timer;
@@ -872,7 +872,7 @@ class boss_fenstalker : public CreatureScript
struct boss_fenstalkerAI : public boss_hexlord_addAI
{
boss_fenstalkerAI(Creature* creature) : boss_hexlord_addAI(creature) {}
boss_fenstalkerAI(Creature* creature) : boss_hexlord_addAI(creature) { }
uint32 volatileinf_timer;
@@ -915,7 +915,7 @@ class boss_koragg : public CreatureScript
struct boss_koraggAI : public boss_hexlord_addAI
{
boss_koraggAI(Creature* creature) : boss_hexlord_addAI(creature) {}
boss_koraggAI(Creature* creature) : boss_hexlord_addAI(creature) { }
uint32 coldstare_timer;
uint32 mightyblow_timer;
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+13 -13
View File
@@ -457,9 +457,9 @@ class npc_janalai_firebomb : public CreatureScript
struct npc_janalai_firebombAI : public ScriptedAI
{
npc_janalai_firebombAI(Creature* creature) : ScriptedAI(creature){}
npc_janalai_firebombAI(Creature* creature) : ScriptedAI(creature){ }
void Reset() OVERRIDE {}
void Reset() OVERRIDE { }
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE
{
@@ -467,14 +467,14 @@ class npc_janalai_firebomb : public CreatureScript
DoCast(me, SPELL_FIRE_BOMB_DUMMY, true);
}
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 {}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void UpdateAI(uint32 /*diff*/) OVERRIDE {}
void UpdateAI(uint32 /*diff*/) OVERRIDE { }
};
CreatureAI* GetAI(Creature* creature) const OVERRIDE
@@ -551,9 +551,9 @@ class npc_janalai_hatcher : public CreatureScript
return num == 0; // if num == 0, no more templist
}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void AttackStart(Unit* /*who*/) OVERRIDE {}
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE { }
void AttackStart(Unit* /*who*/) OVERRIDE { }
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
void MovementInform(uint32, uint32) OVERRIDE
{
@@ -678,7 +678,7 @@ class npc_janalai_hatchling : public CreatureScript
class npc_janalai_egg : public CreatureScript
{
public:
npc_janalai_egg(): CreatureScript("npc_janalai_egg") {}
npc_janalai_egg(): CreatureScript("npc_janalai_egg") { }
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
@@ -687,11 +687,11 @@ public:
struct npc_janalai_eggAI : public ScriptedAI
{
npc_janalai_eggAI(Creature* creature) : ScriptedAI(creature){}
npc_janalai_eggAI(Creature* creature) : ScriptedAI(creature){ }
void Reset() OVERRIDE {}
void Reset() OVERRIDE { }
void UpdateAI(uint32 /*diff*/) OVERRIDE {}
void UpdateAI(uint32 /*diff*/) OVERRIDE { }
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE
{
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+3 -3
View File
@@ -570,11 +570,11 @@ class npc_zuljin_vortex : public CreatureScript
struct npc_zuljin_vortexAI : public ScriptedAI
{
npc_zuljin_vortexAI(Creature* creature) : ScriptedAI(creature) {}
npc_zuljin_vortexAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE {}
void Reset() OVERRIDE { }
void EnterCombat(Unit* /*target*/) OVERRIDE {}
void EnterCombat(Unit* /*target*/) OVERRIDE { }
void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE
{
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ class instance_zulaman : public InstanceMapScript
struct instance_zulaman_InstanceMapScript : public InstanceScript
{
instance_zulaman_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_zulaman_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint64 HarkorsSatchelGUID;
uint64 TanzarsTrunkGUID;
Loaded 100 of 650 files, more files were not shown because too many files have changed in this diff. Show more