araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 14:39:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core: Generic cleanup (tab2spaces/trailing whitespace removal)

Browse Source
This commit is contained in:
leak
2011-01-26 01:03:35 +01:00
parent 57f85ab7da
commit 137b079eea
57 changed files with 252 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/authserver/Server/AuthSocket.h
+1 -1
View File
@@ -33,7 +33,7 @@ enum RealmFlags
REALM_FLAG_UNK2 = 0x10,
REALM_FLAG_RECOMMENDED = 0x20,
REALM_FLAG_NEW = 0x40,
REALM_FLAG_FULL = 0x80
REALM_FLAG_FULL = 0x80
};
// Handle login commands
src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
+32 -32
View File
@@ -193,7 +193,7 @@ void BattlegroundIC::Update(uint32 diff)
{
if (!demolisher->isAlive())
demolisher->Respawn(true);
}
}
}
siegeEngineWorkshopTimer = WORKSHOP_UPDATE_TIME;
} else siegeEngineWorkshopTimer -= diff;
@@ -215,19 +215,19 @@ void BattlegroundIC::Update(uint32 diff)
if (!banner) // this should never happen
return;
float cords[4] = {banner->GetPositionX(), banner->GetPositionY(), banner->GetPositionZ(), banner->GetOrientation() };
DelObject(nodePoint[i].gameobject_type);
AddObject(nodePoint[i].gameobject_type,nodePoint[i].gameobject_entry,cords[0],cords[1],cords[2],cords[3],0,0,0,0,RESPAWN_ONE_DAY);
GetBGObject(nodePoint[i].gameobject_type)->SetUInt32Value(GAMEOBJECT_FACTION, nodePoint[i].faction == TEAM_ALLIANCE ? BG_IC_Factions[1] : BG_IC_Factions[0]);
UpdateNodeWorldState(&nodePoint[i]);
HandleCapturedNodes(&nodePoint[i],false);
HandleCapturedNodes(&nodePoint[i],false);
SendMessage2ToAll(LANG_BG_IC_TEAM_HAS_TAKEN_NODE,CHAT_MSG_BG_SYSTEM_NEUTRAL,NULL,(nodePoint[i].faction == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE),nodePoint[i].string);
nodePoint[i].needChange = false;
nodePoint[i].timer = BANNER_STATE_CHANGE_TIME;
} else nodePoint[i].timer -= diff;
@@ -247,7 +247,7 @@ void BattlegroundIC::Update(uint32 diff)
}
}
resourceTimer = IC_RESOURCE_TIME;
} else resourceTimer -= diff;
} else resourceTimer -= diff;
}
void BattlegroundIC::StartingEventCloseDoors()
@@ -311,7 +311,7 @@ void BattlegroundIC::AddPlayer(Player *plr)
}
void BattlegroundIC::RemovePlayer(Player* plr, uint64 /*guid*/)
{
{
plr->RemoveAura(SPELL_QUARRY);
plr->RemoveAura(SPELL_OIL_REFINERY);
}
@@ -356,7 +356,7 @@ void BattlegroundIC::FillInitialWorldStates(WorldPacket& data)
uint32 uws = GetWorldStateFromGateEntry(BG_IC_ObjSpawnlocs[i].entry,(GateStatus[GetGateIDFromEntry(BG_IC_ObjSpawnlocs[i].entry)] == BG_IC_GATE_DESTROYED ? true : false));
data << uint32(uws) << uint32(1);
}
for (uint8 i = 0 ; i < MAX_NODE_TYPES ; i++)
data << uint32(nodePoint[i].worldStates[nodePoint[i].nodeState]) << uint32(1);
}
@@ -371,9 +371,9 @@ bool BattlegroundIC::SetupBattleground()
0,0,0,0,RESPAWN_ONE_DAY))
{
sLog->outError("Isle of Conquest: There was an error spawning gameobject %u",BG_IC_ObjSpawnlocs[i].entry);
return false;
return false;
}
}
}
for (uint8 i = 0; i < MAX_NORMAL_NPCS_SPAWNS; i++)
{
@@ -383,9 +383,9 @@ bool BattlegroundIC::SetupBattleground()
RESPAWN_ONE_DAY))
{
sLog->outError("Isle of Conquest: There was an error spawning creature %u",BG_IC_NpcSpawnlocs[i].entry);
return false;
return false;
}
}
}
if (!AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+5,BG_IC_SpiritGuidePos[5][0], BG_IC_SpiritGuidePos[5][1],BG_IC_SpiritGuidePos[5][2], BG_IC_SpiritGuidePos[5][3],ALLIANCE)
|| !AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+6,BG_IC_SpiritGuidePos[6][0], BG_IC_SpiritGuidePos[6][1],BG_IC_SpiritGuidePos[6][2], BG_IC_SpiritGuidePos[6][3],HORDE)
@@ -454,7 +454,7 @@ void BattlegroundIC::HandleKillPlayer(Player* player, Player* killer)
return;
Battleground::HandleKillPlayer(player, killer);
factionReinforcements[player->GetTeamId()] -= 1;
UpdateWorldState((player->GetTeamId() == TEAM_ALLIANCE ? BG_IC_ALLIANCE_RENFORT : BG_IC_HORDE_RENFORT), factionReinforcements[player->GetTeamId()]);
@@ -515,7 +515,7 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target
nodePoint[i].gameobject_entry = nextBanner;
// this is just needed if the next banner is grey
if (nodePoint[i].banners[BANNER_A_CONTESTED] == nextBanner ||
if (nodePoint[i].banners[BANNER_A_CONTESTED] == nextBanner ||
nodePoint[i].banners[BANNER_H_CONTESTED] == nextBanner)
{
nodePoint[i].timer = BANNER_STATE_CHANGE_TIME; // 1 minute for last change (real faction banner)
@@ -535,13 +535,13 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target
SendMessage2ToAll(LANG_BG_IC_TEAM_ASSAULTED_NODE_2,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string, (player->GetTeamId() == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE));
HandleContestedNodes(&nodePoint[i]);
} else if (nextBanner == nodePoint[i].banners[BANNER_A_CONTROLLED] ||
nextBanner == nodePoint[i].banners[BANNER_H_CONTROLLED])
nextBanner == nodePoint[i].banners[BANNER_H_CONTROLLED])
// if we are going to spawn the definitve faction banner, we dont need the timer anymore
{
nodePoint[i].timer = BANNER_STATE_CHANGE_TIME;
nodePoint[i].needChange = false;
SendMessage2ToAll(LANG_BG_IC_TEAM_DEFENDED_NODE,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string);
HandleCapturedNodes(&nodePoint[i],true);
HandleCapturedNodes(&nodePoint[i],true);
UpdatePlayerScore(player, SCORE_BASES_DEFENDED, 1);
}
@@ -549,9 +549,9 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target
if (!banner) // this should never happen
return;
float cords[4] = {banner->GetPositionX(), banner->GetPositionY(), banner->GetPositionZ(), banner->GetOrientation() };
DelObject(nodePoint[i].gameobject_type);
AddObject(nodePoint[i].gameobject_type,nodePoint[i].gameobject_entry,cords[0],cords[1],cords[2],cords[3],0,0,0,0,RESPAWN_ONE_DAY);
@@ -566,7 +566,7 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target
UpdateNodeWorldState(&nodePoint[i]);
// we dont need iterating if we are here
// If the needChange bool was set true, we will handle the rest in the Update Map function.
return;
return;
}
}
}
@@ -611,7 +611,7 @@ uint32 BattlegroundIC::GetNextBanner(ICNodePoint* nodePoint, uint32 team, bool r
// If the actual banner is the grey faction banner, we must return the previous banner
if (nodePoint->gameobject_entry == nodePoint->banners[BANNER_A_CONTESTED] || nodePoint->banners[BANNER_H_CONTESTED])
return nodePoint->last_entry;
// we should never be here...
sLog->outError("Isle Of Conquest: Unexpected return in GetNextBanner function");
return 0;
@@ -633,9 +633,9 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture)
{
if(nodePoint->nodeType != NODE_TYPE_REFINERY && nodePoint->nodeType != NODE_TYPE_QUARRY)
{
if (!AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+nodePoint->nodeType-2,
BG_IC_SpiritGuidePos[nodePoint->nodeType][0], BG_IC_SpiritGuidePos[nodePoint->nodeType][1],
BG_IC_SpiritGuidePos[nodePoint->nodeType][2], BG_IC_SpiritGuidePos[nodePoint->nodeType][3],
if (!AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+nodePoint->nodeType-2,
BG_IC_SpiritGuidePos[nodePoint->nodeType][0], BG_IC_SpiritGuidePos[nodePoint->nodeType][1],
BG_IC_SpiritGuidePos[nodePoint->nodeType][2], BG_IC_SpiritGuidePos[nodePoint->nodeType][3],
(nodePoint->faction == TEAM_ALLIANCE ? ALLIANCE : HORDE)))
sLog->outError("Isle of Conquest: Failed to spawn spirit guide! point: %u, team: %u,", nodePoint->nodeType, nodePoint->faction);
}
@@ -646,7 +646,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture)
// all the players on the stopped transport should be teleported out
if (!gunshipAlliance || !gunshipHorde)
break;
for (uint8 u = 0; u < MAX_HANGAR_TELEPORTERS_SPAWNS; u++)
{
uint8 type = BG_IC_GO_HANGAR_TELEPORTER_1+u;
@@ -707,7 +707,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture)
for (uint8 i = 0; i < MAX_GLAIVE_THROWERS_SPAWNS_PER_FACTION; i++)
{
uint8 type = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_GLAIVE_THROWER_1_A : BG_IC_NPC_GLAIVE_THROWER_1_H)+i;
if (GetBGCreature(type) && GetBGCreature(type)->isAlive())
continue;
@@ -722,7 +722,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture)
for (uint8 i = 0; i < MAX_CATAPULTS_SPAWNS_PER_FACTION; i++)
{
uint8 type = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_CATAPULT_1_A : BG_IC_NPC_CATAPULT_1_H)+i;
if (GetBGCreature(type) && GetBGCreature(type)->isAlive())
continue;
@@ -767,7 +767,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture)
RESPAWN_ONE_DAY))
GetBGCreature(type)->setFaction(BG_IC_Factions[(nodePoint->faction == TEAM_ALLIANCE ? 0 : 1)]);
}
// we check if the opossing siege engine is in use
int8 enemySiege = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_SIEGE_ENGINE_H : BG_IC_NPC_SIEGE_ENGINE_A);
@@ -784,7 +784,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture)
uint8 siegeType = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_SIEGE_ENGINE_A : BG_IC_NPC_SIEGE_ENGINE_H);
if (!GetBGCreature(siegeType) || !GetBGCreature(siegeType)->isAlive())
{
AddCreature((nodePoint->faction == TEAM_ALLIANCE ? NPC_SIEGE_ENGINE_A : NPC_SIEGE_ENGINE_H),siegeType,nodePoint->faction,
AddCreature((nodePoint->faction == TEAM_ALLIANCE ? NPC_SIEGE_ENGINE_A : NPC_SIEGE_ENGINE_H),siegeType,nodePoint->faction,
BG_IC_WorkshopVehicles[4].GetPositionX(),BG_IC_WorkshopVehicles[4].GetPositionY(),
BG_IC_WorkshopVehicles[4].GetPositionZ(),BG_IC_WorkshopVehicles[4].GetOrientation(),
RESPAWN_ONE_DAY);
@@ -830,7 +830,7 @@ void BattlegroundIC::DestroyGate(Player* pl, GameObject* go, uint32 /*destroyedE
DoorOpen((pl->GetTeamId() == TEAM_ALLIANCE ? BG_IC_GO_HORDE_KEEP_PORTCULLIS : BG_IC_GO_DOODAD_PORTCULLISACTIVE02));
uint32 lang_entry = 0;
switch(go->GetEntry())
{
case GO_HORDE_GATE_1:
@@ -855,7 +855,7 @@ void BattlegroundIC::DestroyGate(Player* pl, GameObject* go, uint32 /*destroyedE
void BattlegroundIC::EventPlayerDamagedGO(Player* /*plr*/, GameObject* /*go*/, uint8 /*hitType*/, uint32 /*destroyedEvent*/)
{
}
WorldSafeLocsEntry const* BattlegroundIC::GetClosestGraveYard(Player* player)
@@ -922,7 +922,7 @@ Transport* BattlegroundIC::CreateTransport(uint32 goEntry,uint32 period)
uint32 mapid = t->m_WayPoints[0].mapid;
float x = t->m_WayPoints[0].x;
float x = t->m_WayPoints[0].x;
float y = t->m_WayPoints[0].y;
float z = t->m_WayPoints[0].z;
float o = 1;
@@ -939,6 +939,6 @@ Transport* BattlegroundIC::CreateTransport(uint32 goEntry,uint32 period)
for (uint8 i = 0; i < 5; i++)
t->AddNPCPassenger(0,(goEntry == GO_HORDE_GUNSHIP ? NPC_HORDE_GUNSHIP_CANNON : NPC_ALLIANCE_GUNSHIP_CANNON), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionX() : allianceGunshipPassengers[i].GetPositionX()) , (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionY() : allianceGunshipPassengers[i].GetPositionY()),(goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionZ() : allianceGunshipPassengers[i].GetPositionZ()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetOrientation() : allianceGunshipPassengers[i].GetOrientation()));
return t;
}
src/server/game/Battlegrounds/Zones/BattlegroundIC.h
+65 -65
View File
@@ -205,16 +205,16 @@ struct ICNpc
uint32 entry;
uint32 team;
float x;
float y;
float z;
float o;
float y;
float z;
float o;
};
enum BG_IC_GOs
{
BG_IC_GO_ALLIANCE_BANNER = 0,
BG_IC_GO_ALLIANCE_GATE_1,
BG_IC_GO_ALLIANCE_GATE_1,
BG_IC_GO_ALLIANCE_GATE_2,
BG_IC_GO_ALLIANCE_GATE_3,
@@ -236,12 +236,12 @@ enum BG_IC_GOs
BG_IC_GO_BRAZIER_3,
BG_IC_GO_BRAZIER_4,
BG_IC_GO_CHAIR_1,
BG_IC_GO_CHAIR_1,
BG_IC_GO_CHAIR_2,
BG_IC_GO_CHAIR_3_1,
BG_IC_GO_CHAIR_4,
BG_IC_GO_CHAIR_5,
BG_IC_GO_CHAIR_6_1,
BG_IC_GO_CHAIR_4,
BG_IC_GO_CHAIR_5,
BG_IC_GO_CHAIR_6_1,
BG_IC_GO_CHAIR_7,
BG_IC_GO_CHAIR_3_2,
BG_IC_GO_CHAIR_6_2,
@@ -251,41 +251,41 @@ enum BG_IC_GOs
BG_IC_GO_DOCKS_BANNER,
BG_IC_GO_DOODAD_HU_PORTCULLIS01_1,
BG_IC_GO_DOODAD_HU_PORTCULLIS01_1,
BG_IC_GO_DOODAD_HU_PORTCULLIS01_2,
BG_IC_GO_DOODAD_ND_HUMAN_GATE_CLOSEDFX_DOOR01,
BG_IC_GO_DOODAD_ND_HUMAN_GATE_CLOSEDFX_DOOR01,
BG_IC_GO_DOODAD_PORTCULLISACTIVE01,
BG_IC_GO_DOODAD_PORTCULLISACTIVE02,
BG_IC_GO_DOODAD_VR_PORTCULLIS01_1,
BG_IC_GO_DOODAD_VR_PORTCULLIS01_2,
BG_IC_GO_DOODAD_VR_PORTCULLIS01_2,
BG_IC_GO_FLAGPOLE_1_1,
BG_IC_GO_FLAGPOLE_2_1,
BG_IC_GO_FLAGPOLE_2_1,
BG_IC_GO_FLAGPOLE_2_2,
BG_IC_GO_FLAGPOLE_1_2,
BG_IC_GO_FLAGPOLE_1_3,
BG_IC_GO_FLAGPOLE_1_4,
BG_IC_GO_FLAGPOLE_1_2,
BG_IC_GO_FLAGPOLE_1_3,
BG_IC_GO_FLAGPOLE_1_4,
BG_IC_GO_FLAGPOLE_1_5,
BG_IC_GO_HANGAR_BANNER,
BG_IC_GO_HORDE_BANNER,
BG_IC_GO_HORDE_BANNER,
BG_IC_GO_HORDE_GATE_1,
BG_IC_GO_HORDE_GATE_2,
BG_IC_GO_HORDE_GATE_3,
BG_IC_GO_HORDE_GATE_1,
BG_IC_GO_HORDE_GATE_2,
BG_IC_GO_HORDE_GATE_3,
BG_IC_GO_HORDE_KEEP_PORTCULLIS,
BG_IC_GO_QUARRY_BANNER,
BG_IC_GO_STOVE_1_1,
BG_IC_GO_STOVE_2_1,
BG_IC_GO_STOVE_1_2,
BG_IC_GO_STOVE_1_1,
BG_IC_GO_STOVE_2_1,
BG_IC_GO_STOVE_1_2,
BG_IC_GO_STOVE_2_2,
BG_IC_GO_WORKSHOP_BANNER,
@@ -303,40 +303,40 @@ enum BG_IC_GOs
BG_IC_GO_HUGE_SEAFORIUM_BOMBS_H_4,
BG_IC_GO_DOODAD_ND_WINTERORC_WALL_GATEFX_DOOR01,
BG_IC_GO_SEAFORIUM_BOMBS_1,
BG_IC_GO_SEAFORIUM_BOMBS_1,
BG_IC_GO_SEAFORIUM_BOMBS_2,
BG_IC_GO_HANGAR_TELEPORTER_1,
BG_IC_GO_HANGAR_TELEPORTER_2,
BG_IC_GO_HANGAR_TELEPORTER_3,
BG_IC_GO_TELEPORTER_1_1,
BG_IC_GO_TELEPORTER_1_1,
BG_IC_GO_TELEPORTER_1_2,
BG_IC_GO_TELEPORTER_2_1,
BG_IC_GO_TELEPORTER_3_1,
BG_IC_GO_TELEPORTER_2_2,
BG_IC_GO_TELEPORTER_4_1,
BG_IC_GO_TELEPORTER_2_1,
BG_IC_GO_TELEPORTER_3_1,
BG_IC_GO_TELEPORTER_2_2,
BG_IC_GO_TELEPORTER_4_1,
BG_IC_GO_TELEPORTER_3_2,
BG_IC_GO_TELEPORTER_3_3,
BG_IC_GO_TELEPORTER_3_3,
BG_IC_GO_TELEPORTER_4_2,
BG_IC_GO_TELEPORTER_4_3,
BG_IC_GO_TELEPORTER_1_3,
BG_IC_GO_TELEPORTER_2_3,
BG_IC_GO_TELEPORTER_2_3,
BG_IC_GO_TELEPORTER_EFFECTS_A_1,
BG_IC_GO_TELEPORTER_EFFECTS_A_2,
BG_IC_GO_TELEPORTER_EFFECTS_A_3,
BG_IC_GO_TELEPORTER_EFFECTS_A_2,
BG_IC_GO_TELEPORTER_EFFECTS_A_3,
BG_IC_GO_TELEPORTER_EFFECTS_A_4,
BG_IC_GO_TELEPORTER_EFFECTS_A_5,
BG_IC_GO_TELEPORTER_EFFECTS_A_6,
BG_IC_GO_TELEPORTER_EFFECTS_A_6,
BG_IC_GO_TELEPORTER_EFFECTS_H_1,
BG_IC_GO_TELEPORTER_EFFECTS_H_2,
BG_IC_GO_TELEPORTER_EFFECTS_H_2,
BG_IC_GO_TELEPORTER_EFFECTS_H_3,
BG_IC_GO_TELEPORTER_EFFECTS_H_4,
BG_IC_GO_TELEPORTER_EFFECTS_H_5,
BG_IC_GO_TELEPORTER_EFFECTS_H_6,
BG_IC_GO_TELEPORTER_EFFECTS_H_5,
BG_IC_GO_TELEPORTER_EFFECTS_H_6,
};
enum BG_IC_NPCs
@@ -404,7 +404,7 @@ enum BG_IC_NPCs
BG_IC_NPC_CATAPULT_2_H,
BG_IC_NPC_CATAPULT_3_H,
BG_IC_NPC_CATAPULT_4_H,
BG_IC_NPC_SPIRIT_GUIDE_1,
BG_IC_NPC_SPIRIT_GUIDE_2,
BG_IC_NPC_SPIRIT_GUIDE_3,
@@ -450,7 +450,7 @@ const ICNpc BG_IC_NpcSpawnlocs[MAX_NORMAL_NPCS_SPAWNS]=
{BG_IC_NPC_KOR_KRON_GUARD_1,NPC_KOR_KRON_GUARD,TEAM_HORDE,1296.01f,-773.256f,69.958f,0.292168f}, // 3
{BG_IC_NPC_KOR_KRON_GUARD_2,NPC_KOR_KRON_GUARD,TEAM_HORDE,1295.94f,-757.756f,69.9587f,6.02165f}, // 4
{BG_IC_NPC_KOR_KRON_GUARD_3,NPC_KOR_KRON_GUARD,TEAM_HORDE,1295.09f,-760.927f,69.9587f,5.94311f}, // 5
{BG_IC_NPC_KOR_KRON_GUARD_4,NPC_KOR_KRON_GUARD,TEAM_HORDE,1295.13f,-769.7f,69.95f,0.34f}, // 6
{BG_IC_NPC_KOR_KRON_GUARD_4,NPC_KOR_KRON_GUARD,TEAM_HORDE,1295.13f,-769.7f,69.95f,0.34f}, // 6
{BG_IC_NPC_SEVEN_TH_LEGION_INFANTRY_1,NPC_SEVEN_TH_LEGION_INFANTRY,TEAM_ALLIANCE,223.969f,-822.958f,60.8151f,0.46337f}, // 7
{BG_IC_NPC_SEVEN_TH_LEGION_INFANTRY_2,NPC_SEVEN_TH_LEGION_INFANTRY,TEAM_ALLIANCE,224.211f,-826.952f,60.8188f,6.25961f}, // 8
@@ -459,7 +459,7 @@ const ICNpc BG_IC_NpcSpawnlocs[MAX_NORMAL_NPCS_SPAWNS]=
{BG_IC_NPC_KEEP_CANNON_1,NPC_KEEP_CANNON,TEAM_ALLIANCE,415.825f,-754.634f,87.799f,1.78024f},// 11
{BG_IC_NPC_KEEP_CANNON_2,NPC_KEEP_CANNON,TEAM_ALLIANCE,410.142f,-755.332f,87.7991f,1.78024f},// 12
{BG_IC_NPC_KEEP_CANNON_3,NPC_KEEP_CANNON,TEAM_ALLIANCE,424.33f,-879.352f,88.0446f,0.436332f},// 13
{BG_IC_NPC_KEEP_CANNON_3,NPC_KEEP_CANNON,TEAM_ALLIANCE,424.33f,-879.352f,88.0446f,0.436332f},// 13
{BG_IC_NPC_KEEP_CANNON_4,NPC_KEEP_CANNON,TEAM_ALLIANCE,425.602f,-786.646f,87.7991f,5.74213f},// 14
{BG_IC_NPC_KEEP_CANNON_5,NPC_KEEP_CANNON,TEAM_ALLIANCE,426.743f,-884.939f,87.9613f,0.436332f},// 15
{BG_IC_NPC_KEEP_CANNON_6,NPC_KEEP_CANNON,TEAM_ALLIANCE,404.736f,-755.495f,87.7989f,1.78024f},// 16
@@ -475,9 +475,9 @@ const ICNpc BG_IC_NpcSpawnlocs[MAX_NORMAL_NPCS_SPAWNS]=
{BG_IC_NPC_KEEP_CANNON_15,NPC_KEEP_CANNON,TEAM_HORDE,1163.74f,-663.67f,88.3571f,0.558505f},// 25
{BG_IC_NPC_KEEP_CANNON_16,NPC_KEEP_CANNON,TEAM_HORDE,1135.18f,-683.896f,88.0409f,3.9619f},// 26
{BG_IC_NPC_KEEP_CANNON_17,NPC_KEEP_CANNON,TEAM_HORDE,1138.91f,-836.359f,88.3728f,2.18166f},// 27
{BG_IC_NPC_KEEP_CANNON_18,NPC_KEEP_CANNON,TEAM_HORDE,1162.08f,-863.717f,88.358f,5.48033f},// 28
{BG_IC_NPC_KEEP_CANNON_18,NPC_KEEP_CANNON,TEAM_HORDE,1162.08f,-863.717f,88.358f,5.48033f},// 28
{BG_IC_NPC_KEEP_CANNON_19,NPC_KEEP_CANNON,TEAM_HORDE,1167.13f,-669.212f,87.9682f,0.383972f},// 29
{BG_IC_NPC_KEEP_CANNON_20,NPC_KEEP_CANNON,TEAM_HORDE,1137.72f,-688.517f,88.4023f,3.9619f},// 30
{BG_IC_NPC_KEEP_CANNON_20,NPC_KEEP_CANNON,TEAM_HORDE,1137.72f,-688.517f,88.4023f,3.9619f},// 30
{BG_IC_NPC_KEEP_CANNON_21,NPC_KEEP_CANNON,TEAM_HORDE,1135.29f,-840.878f,88.0252f,2.30383f},// 31
{BG_IC_NPC_KEEP_CANNON_22,NPC_KEEP_CANNON,TEAM_HORDE,1144.33f,-833.309f,87.9268f,2.14675f},// 32
{BG_IC_NPC_KEEP_CANNON_23,NPC_KEEP_CANNON,TEAM_HORDE,1135.29f,-840.878f,88.0252f,2.30383f},// 33
@@ -494,13 +494,13 @@ const Position BG_IC_WorkshopVehicles[5] =
{773.680542f, -884.092041f, 16.8090363f, 1.58824956f} // Siege Engine
};
const Position BG_IC_DocksVehiclesGlaives[2] =
const Position BG_IC_DocksVehiclesGlaives[2] =
{
{ 779.3125f, -342.972229f, 12.2104874f, 4.712389f }, // Glaive Throwers
{ 790.029541f, -342.899323f, 12.2128582f, 4.71238f }, // Glaive Throwers
};
const Position BG_IC_DocksVehiclesCatapults[4] =
const Position BG_IC_DocksVehiclesCatapults[4] =
{
{757.283f, -341.7795f, 12.2113762f, 4.729842f}, // Catapults
{766.947937f, -342.053833f, 12.2009945f, 4.694f}, // Catapults
@@ -508,7 +508,7 @@ const Position BG_IC_DocksVehiclesCatapults[4] =
{810.7257f, -342.083344f, 12.1675768f, 4.6600f}, // Catapults
};
const Position BG_IC_HangarTeleporters[3] =
const Position BG_IC_HangarTeleporters[3] =
{
{827.958f,-994.467f,134.071f,0.0f}, // Gunship Portal
{738.613f,-1106.58f,134.745f,2.54818f}, // Gunship Portal
@@ -520,12 +520,12 @@ struct ICGo
uint32 type;
uint32 entry;
float x;
float y;
float z;
float o;
float y;
float z;
float o;
};
const ICGo BG_IC_Teleporters[MAX_FORTRESS_TELEPORTERS_SPAWNS] =
const ICGo BG_IC_Teleporters[MAX_FORTRESS_TELEPORTERS_SPAWNS] =
{
{BG_IC_GO_TELEPORTER_1_1,GO_TELEPORTER_1,1143.25f,-779.599f,48.629f,1.64061f}, // Teleporter
{BG_IC_GO_TELEPORTER_1_2,GO_TELEPORTER_1,1236.53f,-669.415f,48.2729f,0.104719f}, // Teleporter
@@ -560,7 +560,7 @@ const ICGo BG_IC_ObjSpawnlocs[MAX_NORMAL_GAMEOBJECTS_SPAWNS] =
{BG_IC_GO_ALLIANCE_GATE_1,GO_ALLIANCE_GATE_1,351.615f,-762.75f,48.9162f,-1.5708f}, // Alliance Gate || Left
{BG_IC_GO_ALLIANCE_GATE_2,GO_ALLIANCE_GATE_2,351.024f,-903.326f,48.9247f,1.5708f}, // Alliance Gate || Right
{BG_IC_GO_ALLIANCE_GATE_3,GO_ALLIANCE_GATE_3,413.479f,-833.95f,48.5238f,3.14159f}, // Alliance Gate || Front
{BG_IC_GO_HORDE_GATE_1,GO_HORDE_GATE_1,1150.9f,-762.606f,47.5077f,3.14159f}, // Horde Gate || Front
{BG_IC_GO_HORDE_GATE_2,GO_HORDE_GATE_2,1218.74f,-851.155f,48.2533f,-1.5708f}, // Horde Gate || Left
{BG_IC_GO_HORDE_GATE_3,GO_HORDE_GATE_3,1217.9f,-676.948f,47.6341f,1.5708f}, // Horde Gate || Right
@@ -579,14 +579,14 @@ const ICGo BG_IC_ObjSpawnlocs[MAX_NORMAL_GAMEOBJECTS_SPAWNS] =
{BG_IC_GO_BENCH_3,GO_BENCH_3,817.446f,-470.47f,25.372f,-1.56207f}, // Bench
{BG_IC_GO_BENCH_4,GO_BENCH_4,827.001f,-474.415f,25.372f,1.57952f}, // Bench
{BG_IC_GO_BENCH_5,GO_BENCH_5,819.264f,-461.961f,22.7614f,1.57952f}, // Bench
{BG_IC_GO_BONFIRE_1,GO_BONFIRE_1,1162.91f,-734.578f,48.8948f,-2.9845f}, // Bonfire
{BG_IC_GO_BONFIRE_2,GO_BONFIRE_2,1282.34f,-799.762f,87.1357f,-3.13286f}, // Bonfire
{BG_IC_GO_BONFIRE_3,GO_BONFIRE_3,1358.06f,-732.178f,87.1606f,-3.13284f}, // Bonfire
{BG_IC_GO_BONFIRE_4,GO_BONFIRE_4,1281.76f,-732.844f,87.1574f,-3.13246f}, // Bonfire
{BG_IC_GO_BONFIRE_5,GO_BONFIRE_5,1358.81f,-797.899f,87.2953f,3.13312f}, // Bonfire
{BG_IC_GO_BONFIRE_6,GO_BONFIRE_6,1162.21f,-790.543f,48.9162f,2.27765f}, // Bonfire
{BG_IC_GO_BRAZIER_1,GO_BRAZIER_1,1262.21f,-751.358f,48.8133f,2.26893f}, // Brazier
{BG_IC_GO_BRAZIER_2,GO_BRAZIER_2,1262.58f,-781.861f,48.8132f,2.04203f}, // Brazier
{BG_IC_GO_BRAZIER_3,GO_BRAZIER_3,223.818f,-839.352f,60.7917f,1.09083f}, // Brazier
@@ -630,7 +630,7 @@ const ICGo BG_IC_ObjSpawnlocs[MAX_NORMAL_GAMEOBJECTS_SPAWNS] =
{BG_IC_GO_STOVE_1_1,GO_STOVE_1,903.291f,-457.345f,18.1356f,2.23402f}, // Stove
{BG_IC_GO_STOVE_2_1,GO_STOVE_2,761.462f,-446.684f,22.5602f,0.244344f}, // Stove
{BG_IC_GO_STOVE_1_2,GO_STOVE_1,11068.13f,-336.373f,18.5647f,-2.59181f}, // Stove
{BG_IC_GO_STOVE_2_2,GO_STOVE_2,1118.32f,-363.969f,18.5532f,-3.08918f}, // Stove
{BG_IC_GO_STOVE_2_2,GO_STOVE_2,1118.32f,-363.969f,18.5532f,-3.08918f}, // Stove
{BG_IC_GO_HUGE_SEAFORIUM_BOMBS_A_1,GO_HUGE_SEAFORIUM_BOMB_A,297.3212f,-851.321167f,48.91627f,-0.94247663f},
{BG_IC_GO_HUGE_SEAFORIUM_BOMBS_A_2,GO_HUGE_SEAFORIUM_BOMB_A,298.104156f,-861.026062f,48.916275f,-2.75761318f},
@@ -645,7 +645,7 @@ const ICGo BG_IC_ObjSpawnlocs[MAX_NORMAL_GAMEOBJECTS_SPAWNS] =
{BG_IC_GO_DOODAD_ND_WINTERORC_WALL_GATEFX_DOOR01,GO_DOODAD_ND_WINTERORC_WALL_GATEFX_DOOR01,1150.9f,-762.606f,47.0f,3.14159f} // Doodad_ND_WinterOrc_Wall_GateFX_Door01 -> this was not sniffed because I only had alliance sniffs
};
const Position workshopBombs[2] =
const Position workshopBombs[2] =
{
{750.601f,-864.597f,13.4754f,1.93731f},
{785.509f,-864.715f,13.3993f,2.47837f}
@@ -764,7 +764,7 @@ enum ICNodePointType
// Graveyards
NODE_TYPE_GRAVEYARD_A,
NODE_TYPE_GRAVEYARD_H,
MAX_NODE_TYPES
};
@@ -782,7 +782,7 @@ const uint32 BG_IC_GraveyardIds[MAX_NODE_TYPES+2] = {0, 0, 1480, 1481, 1482, 148
const Position TransportMovementInfo = {7.305609f, -0.095246f, 34.51022f, 0.0f};
const Position TeleportToTransportPosition = {661.0f,-1244.0f,288.0f,0.0f};
const float BG_IC_SpiritGuidePos[MAX_NODE_TYPES+2][4] =
const float BG_IC_SpiritGuidePos[MAX_NODE_TYPES+2][4] =
{
{0.0f, 0.0f, 0.0f, 0.0f}, // no grave
{0.0f, 0.0f, 0.0f, 0.0f}, // no grave
@@ -795,7 +795,7 @@ const float BG_IC_SpiritGuidePos[MAX_NODE_TYPES+2][4] =
{1148.65f, -1250.98f, 16.60f, 1.74f}, // last resort horde
};
const Position hordeGunshipPassengers[5] =
const Position hordeGunshipPassengers[5] =
{
{-21.401f, -31.343f, 34.173f, 4.62057f},
{-12.1064f, -31.9697f, 34.3807f, 4.62057f},
@@ -804,7 +804,7 @@ const Position hordeGunshipPassengers[5] =
{19.4636f, -30.794f, 36.2254f, 4.83106f}
};
const Position allianceGunshipPassengers[5] =
const Position allianceGunshipPassengers[5] =
{
{-41.7122f, 23.1838f, 22.5605f, 1.60659f},
{-31.0354f, 25.1286f, 21.6921f, 1.60659f},
@@ -904,7 +904,7 @@ class BattlegroundIC : public Battleground
uint16 factionReinforcements[2];
BG_IC_GateState GateStatus[6];
ICNodePoint nodePoint[7];
Transport* gunshipAlliance;
Transport* gunshipHorde;
@@ -931,14 +931,14 @@ class BattlegroundIC : public Battleground
uint32 uws = 0;
switch(id)
{
{
case GO_HORDE_GATE_1:
uws = (open ? BG_IC_GATE_FRONT_H_WS_OPEN : BG_IC_GATE_FRONT_H_WS_CLOSED);
break;
case GO_HORDE_GATE_2:
uws = (open ? BG_IC_GATE_WEST_H_WS_OPEN : BG_IC_GATE_WEST_H_WS_CLOSED);
break;
case GO_HORDE_GATE_3:
case GO_HORDE_GATE_3:
uws = (open ? BG_IC_GATE_EAST_H_WS_OPEN : BG_IC_GATE_EAST_H_WS_CLOSED);
break;
case GO_ALLIANCE_GATE_3:
@@ -947,7 +947,7 @@ class BattlegroundIC : public Battleground
case GO_ALLIANCE_GATE_1:
uws = (open ? BG_IC_GATE_WEST_A_WS_OPEN : BG_IC_GATE_WEST_A_WS_CLOSED);
break;
case GO_ALLIANCE_GATE_2:
case GO_ALLIANCE_GATE_2:
uws = (open ? BG_IC_GATE_EAST_A_WS_OPEN : BG_IC_GATE_EAST_A_WS_CLOSED);
break;
}
src/server/game/Conditions/ConditionMgr.cpp
+1 -1
View File
@@ -375,7 +375,7 @@ void ConditionMgr::LoadConditions(bool isReload)
sObjectMgr->LoadGossipMenuItems();
}
QueryResult result = WorldDatabase.Query("SELECT SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference,"
" ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName FROM conditions");
src/server/game/DungeonFinding/LFGGroupData.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "LFGGroupData.h"
LfgGroupData::LfgGroupData():
m_State(LFG_STATE_NONE), m_OldState(LFG_STATE_NONE), m_Dungeon(0),
m_State(LFG_STATE_NONE), m_OldState(LFG_STATE_NONE), m_Dungeon(0),
m_VotesNeeded(0), m_KicksLeft(LFG_GROUP_MAX_KICKS)
{
}
src/server/game/DungeonFinding/LFGMgr.cpp
+4 -4
View File
@@ -216,7 +216,7 @@ void LFGMgr::Update(uint32 diff)
if (Player* plr = sObjectMgr->GetPlayer(guid))
{
plr->GetSession()->SendLfgRoleCheckUpdate(roleCheck);
if (itRoles->first == roleCheck->leader)
plr->GetSession()->SendLfgJoinResult(LfgJoinResultData(LFG_JOIN_FAILED, LFG_ROLECHECK_MISSING_ROLE));
}
@@ -1794,7 +1794,7 @@ void LFGMgr::TeleportPlayer(Player* plr, bool out, bool fromOpcode /*= false*/)
/**
Give completion reward to player
@param[in] dungeonId Id of the dungeon finished
@param[in] dungeonId Id of the dungeon finished
@param[in] plr Player to reward
*/
void LFGMgr::RewardDungeonDoneFor(const uint32 dungeonId, Player* player)
@@ -1808,12 +1808,12 @@ void LFGMgr::RewardDungeonDoneFor(const uint32 dungeonId, Player* player)
uint64 guid = player->GetGUID();
uint64 gguid = player->GetGroup()->GetGUID();
uint32 gDungeonId = GetDungeon(gguid);
uint32 gDungeonId = GetDungeon(gguid);
if (gDungeonId != dungeonId)
{
sLog->outDebug("LFGMgr::RewardDungeonDoneFor: [" UI64FMTD "] Finished dungeon %u but group queued for %u. Ignoring", guid, dungeonId, gDungeonId);
return;
}
}
if (GetState(guid) == LFG_STATE_FINISHED_DUNGEON)
{
src/server/game/DungeonFinding/LFGPlayerData.h
+1 -1
View File
@@ -47,7 +47,7 @@ class LfgPlayerData
uint8 GetRoles() const;
const std::string& GetComment() const;
const LfgDungeonSet& GetSelectedDungeons() const;
private:
// General
LfgState m_State; ///< State if group in LFG
src/server/game/Entities/Creature/CreatureGroups.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ void CreatureGroupManager::LoadCreatureFormations()
{
uint32 oldMSTime = getMSTime();
for (CreatureGroupInfoType::iterator itr = CreatureGroupMap.begin(); itr != CreatureGroupMap.end(); ++itr) // for reload case
for (CreatureGroupInfoType::iterator itr = CreatureGroupMap.begin(); itr != CreatureGroupMap.end(); ++itr) // for reload case
delete itr->second;
CreatureGroupMap.clear();
src/server/game/Entities/Pet/Pet.cpp
+1 -1
View File
@@ -695,7 +695,7 @@ void Pet::GivePetXP(uint32 xp)
if (!isAlive())
return;
uint8 maxlevel = std::min((uint8)sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL), GetOwner()->getLevel());
uint8 petlevel = getLevel();
src/server/game/Entities/Player/Player.cpp
+15 -15
View File
@@ -7699,7 +7699,7 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
}
void Player::_ApplyWeaponDamage(uint8 slot, ItemPrototype const *proto, ScalingStatValuesEntry const *ssv, bool apply)
void Player::_ApplyWeaponDamage(uint8 slot, ItemPrototype const *proto, ScalingStatValuesEntry const *ssv, bool apply)
{
WeaponAttackType attType = BASE_ATTACK;
float damage = 0.0f;
@@ -9300,7 +9300,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
data << uint32(4324) << uint32(1); // 15 BG_IC_GATE_WEST_A_WS_OPEN
data << uint32(4325) << uint32(1); // 16 BG_IC_GATE_EAST_A_WS_OPEN
data << uint32(4317) << uint32(1); // 17 unknown
data << uint32(4301) << uint32(1); // 18 BG_IC_DOCKS_UNCONTROLLED
data << uint32(4296) << uint32(1); // 19 BG_IC_HANGAR_UNCONTROLLED
data << uint32(4306) << uint32(1); // 20 BG_IC_QUARRY_UNCONTROLLED
@@ -11636,7 +11636,7 @@ Item* Player::StoreNewItem(ItemPosCountVec const& dest, uint32 item, bool update
const ItemPrototype *proto = pItem->GetProto();
for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
if (proto->Spells[i].SpellTrigger == ITEM_SPELLTRIGGER_ON_NO_DELAY_USE && proto->Spells[i].SpellId > 0) // On obtain trigger
CastSpell(this, proto->Spells[i].SpellId, true, pItem);
CastSpell(this, proto->Spells[i].SpellId, true, pItem);
if (allowedLooters && pItem->GetProto()->GetMaxStackSize() == 1 && pItem->IsSoulBound())
{
@@ -13651,7 +13651,7 @@ void Player::UpdateSkillEnchantments(uint16 skill_id, uint16 curr_value, uint16
// If we're dealing with a gem inside a prismatic socket we need to check the prismatic socket requirements
// rather than the gem requirements itself. If the socket has no color it is a prismatic socket.
if ((slot == SOCK_ENCHANTMENT_SLOT || slot == SOCK_ENCHANTMENT_SLOT_2 || slot == SOCK_ENCHANTMENT_SLOT_3)
if ((slot == SOCK_ENCHANTMENT_SLOT || slot == SOCK_ENCHANTMENT_SLOT_2 || slot == SOCK_ENCHANTMENT_SLOT_3)
&& !m_items[i]->GetProto()->Socket[slot-SOCK_ENCHANTMENT_SLOT].Color)
{
SpellItemEnchantmentEntry const *pPrismaticEnchant = sSpellItemEnchantmentStore.LookupEntry(m_items[i]->GetEnchantmentId(PRISMATIC_ENCHANTMENT_SLOT));
@@ -15420,7 +15420,7 @@ void Player::ItemAddedQuestCheck(uint32 entry, uint32 count)
{
uint16 additemcount = curitemcount + count <= reqitemcount ? count : reqitemcount - curitemcount;
q_status.m_itemcount[j] += additemcount;
m_QuestStatusSave[questid] = true;
SendQuestUpdateAddItem(qInfo, j, additemcount);
@@ -15464,7 +15464,7 @@ void Player::ItemRemovedQuestCheck(uint32 entry, uint32 count)
{
uint16 remitemcount = curitemcount <= reqitemcount ? count : count + reqitemcount - curitemcount;
q_status.m_itemcount[j] = (curitemcount <= remitemcount) ? 0 : curitemcount - remitemcount;
m_QuestStatusSave[questid] = true;
IncompleteQuest(questid);
@@ -15534,7 +15534,7 @@ void Player::KilledMonsterCredit(uint32 entry, uint64 guid)
if (curkillcount < reqkillcount)
{
q_status.m_creatureOrGOcount[j] = curkillcount + addkillcount;
m_QuestStatusSave[questid] = true;
SendQuestUpdateAddCreatureOrGo(qInfo, guid, j, curkillcount, addkillcount);
@@ -15613,7 +15613,7 @@ void Player::CastedCreatureOrGO(uint32 entry, uint64 guid, uint32 spell_id)
if (curCastCount < reqCastCount)
{
q_status.m_creatureOrGOcount[j] = curCastCount + addCastCount;
m_QuestStatusSave[questid] = true;
SendQuestUpdateAddCreatureOrGo(qInfo, guid, j, curCastCount, addCastCount);
@@ -15670,7 +15670,7 @@ void Player::TalkedToCreature(uint32 entry, uint64 guid)
if (curTalkCount < reqTalkCount)
{
q_status.m_creatureOrGOcount[j] = curTalkCount + addTalkCount;
m_QuestStatusSave[questid] = true;
SendQuestUpdateAddCreatureOrGo(qInfo, guid, j, curTalkCount, addTalkCount);
@@ -16875,7 +16875,7 @@ void Player::_LoadAuras(PreparedQueryResult result, uint32 timediff)
/* 0 1 2 3 4 5 6 7 8 9 10
QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,spell,effect_mask,recalculate_mask,stackcount,amount0,amount1,amount2,base_amount0,base_amount1,base_amount2,
11 12 13
maxduration,remaintime,remaincharges FROM character_aura WHERE guid = '%u'",GetGUIDLow());
maxduration,remaintime,remaincharges FROM character_aura WHERE guid = '%u'",GetGUIDLow());
*/
if (result)
@@ -17339,8 +17339,8 @@ void Player::_LoadQuestStatus(PreparedQueryResult result)
uint16 slot = 0;
//// 0 1 2 3 4 5 6 7 8 9 10
//QueryResult *result = CharacterDatabase.PQuery("SELECT quest, status, explored, timer, mobcount1, mobcount2, mobcount3, mobcount4, itemcount1, itemcount2, itemcount3,
// 11
//QueryResult *result = CharacterDatabase.PQuery("SELECT quest, status, explored, timer, mobcount1, mobcount2, mobcount3, mobcount4, itemcount1, itemcount2, itemcount3,
// 11
// itemcount4 FROM character_queststatus WHERE guid = '%u'", GetGUIDLow());
if (result)
@@ -18251,7 +18251,7 @@ void Player::_SaveAuras(SQLTransaction& trans)
stmt->setUInt64(index++, itr->second->GetCastItemGUID());
stmt->setUInt32(index++, itr->second->GetId());
stmt->setUInt8(index++, effMask);
stmt->setUInt8(index++, recalculateMask);
stmt->setUInt8(index++, recalculateMask);
stmt->setUInt8(index++, itr->second->GetStackAmount());
stmt->setInt32(index++, damage[0]);
stmt->setInt32(index++, damage[1]);
@@ -23912,7 +23912,7 @@ void Player::_SaveEquipmentSets(SQLTransaction& trans)
stmt = CharacterDatabase.GetPreparedStatement(CHAR_ADD_EQUIP_SET);
stmt->setUInt32(j++, GetGUIDLow());
stmt->setUInt64(j++, eqset.Guid);
stmt->setUInt32(j++, index);
stmt->setUInt32(j++, index);
stmt->setString(j++, eqset.Name.c_str());
stmt->setString(j++, eqset.IconName.c_str());
for (uint8 i=0; i<EQUIPMENT_SLOT_END; ++i)
@@ -24506,7 +24506,7 @@ void Player::_LoadInstanceTimeRestrictions(PreparedQueryResult result)
if (!result)
return;
do
do
{
Field* fields = result->Fetch();
_instanceResetTimes.insert(InstanceTimeMap::value_type(fields[0].GetUInt32(), fields[1].GetUInt64()));
src/server/game/Entities/Unit/Unit.cpp
+5 -5
View File
@@ -427,7 +427,7 @@ void Unit::SendMonsterMoveTransport(Unit *vehicleOwner)
data << GetPositionY() - vehicleOwner->GetPositionY();
data << GetPositionZ() - vehicleOwner->GetPositionZ();
data << uint32(getMSTime()); // should be an increasing constant that indicates movement packet count
data << uint8(SPLINETYPE_FACING_ANGLE);
data << uint8(SPLINETYPE_FACING_ANGLE);
data << GetTransOffsetO(); // facing angle?
data << uint32(SPLINEFLAG_TRANSPORT);
data << uint32(GetTransTime()); // move time
@@ -6477,7 +6477,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
}
else if (damage > 0)
triggered_spell_id = 58597;
target = this;
break;
}
@@ -7680,7 +7680,7 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura,
break;
// Discerning Eye of the Beast
case 59915:
{
{
CastSpell(this, 59914, true); // 59914 already has correct basepoints in DBC, no need for custom bp
*handled = true;
break;
@@ -8534,7 +8534,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
// Item - Shaman T10 Enhancement 4P Bonus
if (AuraEffect const* aurEff = GetAuraEffect(70832, 0))
if (Aura const* maelstrom = GetAura(53817))
if ((maelstrom->GetStackAmount() == maelstrom->GetSpellProto()->StackAmount) && roll_chance_i(aurEff->GetAmount()))
if ((maelstrom->GetStackAmount() == maelstrom->GetSpellProto()->StackAmount) && roll_chance_i(aurEff->GetAmount()))
CastSpell(this, 70831, true, castItem, triggeredByAura);
// have rank dependent proc chance, ignore too often cases
@@ -14144,7 +14144,7 @@ void Unit::StopMoving()
//if (fabs(GetPositionZ() - z) < 2.0f)
// Relocate(GetPositionX(), GetPositionY(), z);
//Relocate(GetPositionX(), GetPositionY(),GetPositionZ());
if (!(GetUnitMovementFlags() & MOVEMENTFLAG_ONTRANSPORT))
SendMonsterStop();
}
src/server/game/Entities/Vehicle/Vehicle.h
+1 -1
View File
@@ -124,7 +124,7 @@ class Vehicle
bool HasEmptySeat(int8 seatId) const;
Unit *GetPassenger(int8 seatId) const;
int8 GetNextEmptySeat(int8 seatId, bool next, bool byAura = false) const;
bool AddPassenger(Unit *passenger, int8 seatId = -1, bool byAura = false);
void EjectPassenger(Unit* passenger, Unit* controller);
void RemovePassenger(Unit *passenger);
src/server/game/Globals/ObjectMgr.cpp
+14 -14
View File
@@ -1237,7 +1237,7 @@ void ObjectMgr::LoadLinkedRespawn()
error = true;
break;
}
guid = MAKE_NEW_GUID(guidLow, slave->id, HIGHGUID_UNIT);
linkedGuid = MAKE_NEW_GUID(linkedGuidLow, master->id, HIGHGUID_UNIT);
break;
@@ -1332,8 +1332,8 @@ void ObjectMgr::LoadLinkedRespawn()
sLog->outErrorDb("Couldn't get creature data for GUIDLow %u", linkedGuidLow);
error = true;
break;
}
}
const MapEntry* const map = sMapStore.LookupEntry(master->mapid);
if (!map || !map->Instanceable() || (master->mapid != slave->mapid))
{
@@ -1396,7 +1396,7 @@ bool ObjectMgr::SetCreatureLinkedRespawn(uint32 guidLow, uint32 linkedGuidLow)
sLog->outErrorDb("LinkedRespawn: Creature '%u' linking to '%u' with not corresponding spawnMask", guidLow, linkedGuidLow);
return false;
}
uint64 linkedGuid = MAKE_NEW_GUID(linkedGuidLow, slave->id, HIGHGUID_UNIT);
mLinkedRespawnMap[guid] = linkedGuid;
@@ -1774,7 +1774,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 /*team*/, uint32 mapId, float
void ObjectMgr::LoadGameobjects()
{
uint32 oldMSTime = getMSTime();
uint32 count = 0;
// 0 1 2 3 4 5 6
@@ -2695,7 +2695,7 @@ void ObjectMgr::LoadItemSetNames()
itemSetItems.erase(entry);
++count;
} while (result->NextRow());
if (!itemSetItems.empty())
{
@@ -3969,8 +3969,8 @@ void ObjectMgr::LoadGroups()
CharacterDatabase.Execute(CharacterDatabase.GetPreparedStatement(CHAR_DEL_TINY_GROUPS));
// 0 1 2 3 4 5 6 7 8 9
QueryResult result = CharacterDatabase.PQuery("SELECT leaderGuid, lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6"
// 10 11 12 13 14 15
QueryResult result = CharacterDatabase.PQuery("SELECT leaderGuid, lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6"
// 10 11 12 13 14 15
",icon7, icon8, groupType, difficulty, raiddifficulty, guid FROM groups");
if (!result)
{
@@ -7067,10 +7067,10 @@ uint32 ObjectMgr::GeneratePetNumber()
void ObjectMgr::LoadCorpses()
{
uint32 oldMSTime = getMSTime();
// 0 1 2 3 4 5 6 7 8 9 10 11
QueryResult result = CharacterDatabase.Query("SELECT position_x, position_y, position_z, orientation, map, displayId, itemCache, bytes1, bytes2, guild, flags, dynFlags"
// 12 13 14 15 16 17
// 12 13 14 15 16 17
", time, corpse_type, instance, phaseMask, guid, player FROM corpse WHERE corpse_type <> 0");
if (!result)
@@ -7604,7 +7604,7 @@ void ObjectMgr::SaveCreatureRespawnTime(uint32 loguid, uint32 instance, time_t t
RemoveCreatureRespawnTime(loguid, instance);
return;
}
// This function can be called from various map threads concurrently
{
m_CreatureRespawnTimesMtx.acquire();
@@ -7652,7 +7652,7 @@ void ObjectMgr::SaveGORespawnTime(uint32 loguid, uint32 instance, time_t t)
RemoveGORespawnTime(loguid, instance);
return;
}
// This function can be called from different map threads concurrently
{
m_GORespawnTimesMtx.acquire();
@@ -8179,7 +8179,7 @@ bool ObjectMgr::LoadTrinityStrings(char const* table, int32 min_value, int32 max
}
} while (result->NextRow());
if (min_value == MIN_TRINITY_STRING_ID)
sLog->outString(">> Loaded %u Trinity strings from table %s in %u ms", count, table, GetMSTimeDiffToNow(oldMSTime));
else
@@ -8587,7 +8587,7 @@ void ObjectMgr::LoadTrainerSpell()
}
uint32 count = 0;
do
{
src/server/game/Groups/Group.cpp
+2 -2
View File
@@ -54,9 +54,9 @@ Loot* Roll::getLoot()
return getTarget();
}
Group::Group() : m_leaderGuid(0), m_leaderName(""), m_groupType(GROUPTYPE_NORMAL),
Group::Group() : m_leaderGuid(0), m_leaderName(""), m_groupType(GROUPTYPE_NORMAL),
m_dungeonDifficulty(DUNGEON_DIFFICULTY_NORMAL), m_raidDifficulty(RAID_DIFFICULTY_10MAN_NORMAL),
m_bgGroup(NULL), m_lootMethod(FREE_FOR_ALL), m_lootThreshold(ITEM_QUALITY_UNCOMMON), m_looterGuid(0),
m_bgGroup(NULL), m_lootMethod(FREE_FOR_ALL), m_lootThreshold(ITEM_QUALITY_UNCOMMON), m_looterGuid(0),
m_subGroupsCounts(NULL), m_guid(0), m_counter(0), m_maxEnchantingLevel(0)
{
for (uint8 i = 0; i < TARGETICONCOUNT; ++i)
src/server/game/Instances/InstanceSaveMgr.cpp
+2 -2
View File
@@ -291,7 +291,7 @@ void InstanceSaveManager::CleanupAndPackInstances()
// Finally drop the no longer needed column
CharacterDatabase.DirectExecute("ALTER TABLE instance DROP COLUMN newid");
// Bake some cookies for click
sLog->outString(">> Cleaned up and packed instances in %u ms", GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
@@ -622,7 +622,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b
continue;
if (warn)
{
{
if (now <= resetTime)
timeLeft = 0;
else
src/server/game/Loot/LootMgr.cpp
+2 -2
View File
@@ -1571,7 +1571,7 @@ void LoadLootTemplates_Item()
sLog->outString(">> Loaded %u prospecting loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
sLog->outErrorDb(">> Loaded 0 prospecting loot templates. DB table `item_loot_template` is empty");
sLog->outString();
}
@@ -1709,7 +1709,7 @@ void LoadLootTemplates_Mail()
void LoadLootTemplates_Skinning()
{
sLog->outString("Loading skinning loot templates...");
uint32 oldMSTime = getMSTime();
LootIdSet ids_set, ids_setUsed;
src/server/game/Pools/PoolMgr.cpp
+1 -1
View File
@@ -642,7 +642,7 @@ void PoolMgr::LoadFromDB()
} while (result->NextRow());
sLog->outString(">> Loaded %u creatures in pools in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
src/server/game/Scripting/ScriptMgr.cpp
+1 -1
View File
@@ -182,7 +182,7 @@ void ScriptMgr::Initialize()
LoadDatabase();
sLog->outString("Loading C++ scripts");
FillSpellSummary();
AddScripts();
src/server/game/Scripting/ScriptSystem.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ void SystemMgr::LoadScriptTexts()
{
sLog->outString("TSCR: Loading Script Texts...");
LoadTrinityStrings("script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2));
sLog->outString("TSCR: Loading Script Texts additional data...");
uint32 oldMSTime = getMSTime();
src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+1 -1
View File
@@ -838,7 +838,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recv_data)
uint64 Guid;
recv_data >> Guid;
Player *player = HashMapHolder<Player>::Find(Guid);
Player *player = HashMapHolder<Player>::Find(Guid);
if (!player)
{
WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 3+4+2);
src/server/game/Server/Protocol/Handlers/LFGHandler.cpp
+2 -2
View File
@@ -126,7 +126,7 @@ void WorldSession::HandleLfgSetCommentOpcode(WorldPacket& recv_data)
recv_data >> comment;
uint64 guid = GetPlayer()->GetGUID();
sLog->outDebug("CMSG_SET_LFG_COMMENT [" UI64FMTD "] comment: %s", guid, comment.c_str());
sLFGMgr->SetComment(guid, comment);
}
@@ -256,7 +256,7 @@ void WorldSession::HandleLfgPartyLockInfoRequestOpcode(WorldPacket& /*recv_data
uint32 size = 0;
for (LfgLockPartyMap::const_iterator it = lockMap.begin(); it != lockMap.end(); ++it)
size += 8 + 4 + uint32(it->second.size()) * (4 + 4);
sLog->outDebug("SMSG_LFG_PARTY_INFO [" UI64FMTD "]", guid);
WorldPacket data(SMSG_LFG_PARTY_INFO, 1 + size);
BuildPartyLockDungeonBlock(data, lockMap);
src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+1 -1
View File
@@ -707,7 +707,7 @@ void WorldSession::HandleRequestVehicleExit(WorldPacket &recv_data)
if (seat->CanEnterOrExit())
GetPlayer()->ExitVehicle();
else
sLog->outError("Player %u tried to exit vehicle, but seatflags %u (ID: %u) don't permit that.",
sLog->outError("Player %u tried to exit vehicle, but seatflags %u (ID: %u) don't permit that.",
GetPlayer()->GetGUIDLow(), seat->m_ID, seat->m_flags);
}
}
src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data)
Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM|TYPEMASK_PLAYER);
// no or incorrect quest giver
if (!pObject || (pObject->GetTypeId() != TYPEID_PLAYER && !pObject->hasQuest(quest)) ||
if (!pObject || (pObject->GetTypeId() != TYPEID_PLAYER && !pObject->hasQuest(quest)) ||
(pObject->GetTypeId() == TYPEID_PLAYER && !pObject->ToPlayer()->CanShareQuest(quest)))
{
_player->PlayerTalkClass->CloseGossip();
src/server/game/Server/WorldSession.cpp
+1 -1
View File
@@ -959,7 +959,7 @@ void WorldSession::ProcessQueryCallbacks()
if (m_nameQueryCallbacks.next_readable(lResult, &timeout) != 1)
break;
if (lResult.ready())
if (lResult.ready())
{
lResult.get(result);
SendNameQueryOpcodeFromDBCallBack(result);
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+7 -7
View File
@@ -2398,15 +2398,15 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const
{
Unit *permafrostCaster = NULL;
if (caster->HasAura(66193)) permafrostCaster = caster->GetAura(66193)->GetCaster();
if (caster->HasAura(67855)) permafrostCaster = caster->GetAura(67855)->GetCaster();
if (caster->HasAura(67856)) permafrostCaster = caster->GetAura(67856)->GetCaster();
if (caster->HasAura(67855)) permafrostCaster = caster->GetAura(67855)->GetCaster();
if (caster->HasAura(67856)) permafrostCaster = caster->GetAura(67856)->GetCaster();
if (caster->HasAura(67857)) permafrostCaster = caster->GetAura(67857)->GetCaster();
if (permafrostCaster)
{
if (Creature *permafrostCasterAsCreature = permafrostCaster->ToCreature())
permafrostCasterAsCreature->DespawnOrUnsummon(3000);
caster->CastSpell(caster, 66181, false);
caster->RemoveAllAuras();
if (Creature *casterAsCreature = caster->ToCreature())
@@ -3237,7 +3237,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const * aurApp, uint8 m
{
// Dash
if (AuraEffect * aurEff =target->GetAuraEffect(SPELL_AURA_MOD_INCREASE_SPEED, SPELLFAMILY_DRUID, 0, 0, 0x8))
aurEff->RecalculateAmount();
aurEff->RecalculateAmount();
// Disarm handling
// If druid shifts while being disarmed we need to deal with that since forms aren't affected by disarm
@@ -4267,7 +4267,7 @@ void AuraEffect::HandleAuraControlVehicle(AuraApplication const * aurApp, uint8
return;
if (apply)
{
{
caster->EnterVehicle(target->GetVehicleKit(), m_amount - 1, aurApp);
}
else
@@ -5829,7 +5829,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo
break;
case 63322: // Saronite Vapors
{
int32 mana = int32(GetAmount() * pow(2.0f, GetBase()->GetStackAmount())); // mana restore - bp * 2^stackamount
int32 mana = int32(GetAmount() * pow(2.0f, GetBase()->GetStackAmount())); // mana restore - bp * 2^stackamount
int32 damage = mana * 2; // damage
caster->CastCustomSpell(target, 63337, &mana, NULL, NULL, true);
caster->CastCustomSpell(target, 63338, &damage, NULL, NULL, true);
src/server/game/Spells/Auras/SpellAuras.cpp
+1 -1
View File
@@ -434,7 +434,7 @@ void Aura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * aur
ASSERT(auraApp);
ApplicationMap::iterator itr = m_applications.find(target->GetGUID());
// TODO: Figure out why this happens
if (itr == m_applications.end())
{
src/server/game/Spells/Spell.cpp
+1 -1
View File
@@ -1795,7 +1795,7 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin
// Check if (*next) is a valid chain target. If not, don't add to TagUnitMap, and repeat loop.
// If you want to add any conditions to exclude a target from TagUnitMap, add condition in this while() loop.
while ((m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE
while ((m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE
&& !m_caster->isInFrontInMap(*next, max_range))
|| !m_caster->canSeeOrDetect(*next)
|| !cur->IsWithinLOSInMap(*next)
src/server/game/Spells/SpellEffects.cpp
+1 -1
View File
@@ -1649,7 +1649,7 @@ void Spell::EffectForceCast(SpellEffIndex effIndex)
}
Unit * caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget);
caster->CastSpell(unitTarget, spellInfo, true, NULL, NULL, m_originalCasterGUID);
}
src/server/game/Spells/SpellMgr.cpp
+1 -1
View File
@@ -2339,7 +2339,7 @@ void SpellMgr::LoadPetDefaultSpells()
}
}
sLog->outString(">> Loaded %u summonable creature templates in %u ms", countCreature, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
src/server/game/Tickets/TicketMgr.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ void TicketMgr::LoadGMTickets()
}
uint32 count = 0;
do
{
Field *fields = result->Fetch();
src/server/game/Tools/CharacterDatabaseCleaner.cpp
+2 -2
View File
@@ -38,7 +38,7 @@ void CharacterDatabaseCleaner::CleanDatabase()
return;
uint32 flags = (*result)[0].GetUInt32();
// clean up
if (flags & CLEANING_FLAG_ACHIEVEMENT_PROGRESS)
CleanCharacterAchievementProgress();
@@ -55,7 +55,7 @@ void CharacterDatabaseCleaner::CleanDatabase()
if (flags & CLEANING_FLAG_QUESTSTATUS)
CleanCharacterQuestStatus();
// NOTE: In order to have persistentFlags be set in worldstates for the next cleanup,
// NOTE: In order to have persistentFlags be set in worldstates for the next cleanup,
// you need to define them at least once in worldstates.
flags &= sWorld->getIntConfig(CONFIG_PERSISTENT_CHARACTER_CLEAN_FLAGS);
CharacterDatabase.DirectPExecute("UPDATE worldstates SET value = %u WHERE entry = 20004", flags);
src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
+2 -2
View File
@@ -45,9 +45,9 @@ public:
struct boss_baron_geddonAI : public ScriptedAI
{
boss_baron_geddonAI(Creature *pCreature) : ScriptedAI(pCreature)
boss_baron_geddonAI(Creature *pCreature) : ScriptedAI(pCreature)
{
m_pInstance = pCreature->GetInstanceScript();
m_pInstance = pCreature->GetInstanceScript();
}
InstanceScript* m_pInstance;
src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
+2 -2
View File
@@ -47,9 +47,9 @@ public:
struct boss_garrAI : public ScriptedAI
{
boss_garrAI(Creature *pCreature) : ScriptedAI(pCreature)
boss_garrAI(Creature *pCreature) : ScriptedAI(pCreature)
{
m_pInstance = pCreature->GetInstanceScript();
m_pInstance = pCreature->GetInstanceScript();
}
InstanceScript* m_pInstance;
src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
+2 -2
View File
@@ -42,9 +42,9 @@ public:
struct boss_gehennasAI : public ScriptedAI
{
boss_gehennasAI(Creature *pCreature) : ScriptedAI(pCreature)
boss_gehennasAI(Creature *pCreature) : ScriptedAI(pCreature)
{
m_pInstance = pCreature->GetInstanceScript();
m_pInstance = pCreature->GetInstanceScript();
}
InstanceScript* m_pInstance;
src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
+2 -2
View File
@@ -42,9 +42,9 @@ public:
struct boss_lucifronAI : public ScriptedAI
{
boss_lucifronAI(Creature *pCreature) : ScriptedAI(pCreature)
boss_lucifronAI(Creature *pCreature) : ScriptedAI(pCreature)
{
m_pInstance = pCreature->GetInstanceScript();
m_pInstance = pCreature->GetInstanceScript();
}
InstanceScript* m_pInstance;
src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
+3 -3
View File
@@ -46,9 +46,9 @@ public:
struct boss_magmadarAI : public ScriptedAI
{
boss_magmadarAI(Creature *pCreature) : ScriptedAI(pCreature)
{
m_pInstance = pCreature->GetInstanceScript();
boss_magmadarAI(Creature *pCreature) : ScriptedAI(pCreature)
{
m_pInstance = pCreature->GetInstanceScript();
}
InstanceScript* m_pInstance;
src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
+10 -10
View File
@@ -79,24 +79,24 @@ public:
}
bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 /*uiAction*/)
{
{
//ScriptedInstance* pInstance = pCreature->GetInstanceData();
BossAI* pBossAI = CAST_AI(boss_majordomoAI, pCreature->AI());
if (/*pInstance && */pBossAI)
{
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(boss_majordomoAI, pCreature->AI())->StartRagsEvent();
CAST_AI(boss_majordomoAI, pCreature->AI())->StartRagsEvent();
}
return true;
return true;
}
struct boss_majordomoAI : public BossAI
{
boss_majordomoAI(Creature *pCreature) : BossAI(pCreature, BOSS_MAJORDOMO)
boss_majordomoAI(Creature *pCreature) : BossAI(pCreature, BOSS_MAJORDOMO)
{
m_pInstance = pCreature->GetInstanceScript();
m_pInstance = pCreature->GetInstanceScript();
}
InstanceScript* m_pInstance;
@@ -137,7 +137,7 @@ public:
return;
if (((!me->FindNearestCreature(ENTRY_FLAMEWALKER_HEALER,100.0f)) && (!me->FindNearestCreature(ENTRY_FLAMEWALKER_ELITE,100.0f))) && (!m_pInstance->GetData(DATA_MAJORDOMOISDEAD)))
{
{
me->setFaction(35);
me->AI()->EnterEvadeMode();
DoScriptText(SAY_DEFEAT, me);
@@ -174,8 +174,8 @@ public:
if (Teleport_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1))
DoCast(pTarget, SPELL_TELEPORT);
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1))
DoCast(pTarget, SPELL_TELEPORT);
Teleport_Timer = 20000;
} else Teleport_Timer -= diff;
@@ -199,7 +199,7 @@ public:
if (m_pInstance)
m_pInstance->SetData(DATA_RAGNAROS, true);
Phase = 4;
Phase_Timer = 16000;
Phase_Timer = 16000;
} else Phase_Timer -= diff;
}
if (Phase == 4)
src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
+3 -3
View File
@@ -381,7 +381,7 @@ public:
Intro_Timer = 4000;
Intro = 1;
}
}
};
@@ -400,13 +400,13 @@ public:
struct mob_SonOfFlameAI : public ScriptedAI //didnt work correctly in EAI for me...
{
mob_SonOfFlameAI(Creature *c) : ScriptedAI(c)
mob_SonOfFlameAI(Creature *c) : ScriptedAI(c)
{
pInstance = me->GetInstanceScript();
}
InstanceScript* pInstance;
void JustDied(Unit * /*victim*/)
{
if (pInstance)
src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ public:
{
boss_shazzrahAI(Creature *pCreature) : ScriptedAI(pCreature)
{
m_pInstance = pCreature->GetInstanceScript();
m_pInstance = pCreature->GetInstanceScript();
}
InstanceScript* m_pInstance;
src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
+2 -2
View File
@@ -49,9 +49,9 @@ public:
struct boss_sulfuronAI : public ScriptedAI
{
boss_sulfuronAI(Creature *pCreature) : ScriptedAI(pCreature)
boss_sulfuronAI(Creature *pCreature) : ScriptedAI(pCreature)
{
m_pInstance = pCreature->GetInstanceScript();
m_pInstance = pCreature->GetInstanceScript();
}
InstanceScript* m_pInstance;
src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
+3 -3
View File
@@ -54,7 +54,7 @@ const Position Pos[10] =
{722.408f,-1152.41f,-120.029f,5.33087f},
{718.994f,-1156.36f,-119.805f,5.75738f},
{838.51f,-829.84f,-232.00f,2.00f},
};
};
class instance_molten_core : public InstanceMapScript
{
@@ -313,7 +313,7 @@ public:
if (type == DATA_SHAZZRAH)
IsBossDied[4] = true;
if (type == DATA_GEDDON)
IsBossDied[5] = true;
@@ -354,7 +354,7 @@ public:
if (IsBossDied[i] == false)
return;
}
instance->SummonCreature(ID_DOMO, Pos[0]);
instance->SummonCreature(ID_FLAMEWAKERHEALER, Pos[1]);
instance->SummonCreature(ID_FLAMEWAKERHEALER, Pos[2]);
src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
+1 -1
View File
@@ -20,7 +20,7 @@
#define DEF_MOLTEN_CORE_H
enum eData
{
{
DATA_FLAMEWAKERPRIEST,
DATA_GARRISDEAD,
DATA_GEDDONISDEAD,
src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
+6 -6
View File
@@ -78,7 +78,7 @@ class boss_drakkari_colossus : public CreatureScript
struct boss_drakkari_colossusAI : public BossAI
{
boss_drakkari_colossusAI(Creature* creature) : BossAI(creature, DATA_DRAKKARI_COLOSSUS_EVENT)
boss_drakkari_colossusAI(Creature* creature) : BossAI(creature, DATA_DRAKKARI_COLOSSUS_EVENT)
{
me->SetReactState(REACT_PASSIVE);
introDone = false;
@@ -115,7 +115,7 @@ class boss_drakkari_colossus : public CreatureScript
void EnterCombat(Unit* /*who*/)
{
_EnterCombat();
me->RemoveAura(SPELL_FREEZE_ANIM);
// Note: This should not be called, but before use SetBossState function we should use BossAI
@@ -185,7 +185,7 @@ class boss_drakkari_colossus : public CreatureScript
phase = (phase == COLOSSUS_PHASE_NORMAL ? COLOSSUS_PHASE_FIRST_ELEMENTAL_SUMMON : COLOSSUS_PHASE_SECOND_ELEMENTAL_SUMMON);
DoAction(ACTION_FREEZE_COLOSSUS);
DoAction(ACTION_SUMMON_ELEMENTAL);
}
}
}
@@ -287,7 +287,7 @@ class boss_drakkari_elemental : public CreatureScript
{
if (!UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STAT_CASTING))
@@ -339,7 +339,7 @@ class boss_drakkari_elemental : public CreatureScript
if (me->HasUnitState(UNIT_STAT_CHARGING))
return;
// not sure about this, the idea of this code is to prevent bug the elemental
// not sure about this, the idea of this code is to prevent bug the elemental
// if it is not in a acceptable distance to cast the charge spell.
/*if (me->GetDistance(colossus) > 80.0f)
{
@@ -454,7 +454,7 @@ public:
colossus->GetHomePosition().GetPosition(&colossusHomePosition);
float distance = homePosition.GetExactDist(colossusHomePosition.GetPositionX(),colossusHomePosition.GetPositionY(),colossusHomePosition.GetPositionZ());
if (distance < 12.0f)
{
MoveMojos(colossus);
src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ public:
if (instance->GetBossState(DATA_VAROS_EVENT) != DONE)
DoCast(SPELL_ARCANE_SHIELD);
_Reset();
_Reset();
if (instance->GetData(DATA_UROM_PLATAFORM) == 0)
{
src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+11 -11
View File
@@ -36,7 +36,7 @@ enum Spells
SPELL_CALL_AZURE_RING_CAPTAIN_3 = 51007, //Effect Send Event (18454)
SPELL_CALL_AZURE_RING_CAPTAIN_4 = 51008, //Effect Send Event (18455)*/
SPELL_CALL_AMPLIFY_MAGIC = 51054,
SPELL_ICE_BEAM = 49549,
SPELL_ARCANE_BEAM_PERIODIC = 51019,
SPELL_SUMMON_ARCANE_BEAM = 51017
@@ -62,7 +62,7 @@ public:
struct boss_varosAI : public BossAI
{
boss_varosAI(Creature* creature) : BossAI(creature, DATA_VAROS_EVENT)
boss_varosAI(Creature* creature) : BossAI(creature, DATA_VAROS_EVENT)
{
if (instance->GetBossState(DATA_DRAKOS_EVENT) != DONE)
DoCast(me,SPELL_CENTRIFUGE_SHIELD);
@@ -76,7 +76,7 @@ public:
events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000);
// not sure if this is handled by a timer or hp percentage
events.ScheduleEvent(EVENT_CALL_AZURE, urand(15,30) * IN_MILLISECONDS);
firstCoreEnergize = false;
coreEnergizeOrientation = 0.0f;
}
@@ -134,7 +134,7 @@ public:
break;
case EVENT_CALL_AZURE:
// not sure how blizz handles this, i cant see any pattern between the differnt spells
DoCast(me,SPELL_CALL_AZURE_RING_CAPTAIN);
DoCast(me,SPELL_CALL_AZURE_RING_CAPTAIN);
Talk(SAY_AZURE);
Talk(SAY_AZURE_EMOTE);
events.ScheduleEvent(EVENT_CALL_AZURE, urand(20,25) * IN_MILLISECONDS);
@@ -169,7 +169,7 @@ class npc_azure_ring_captain : public CreatureScript
struct npc_azure_ring_captainAI : public ScriptedAI
{
npc_azure_ring_captainAI(Creature* creature) : ScriptedAI(creature)
{
{
instance = creature->GetInstanceScript();
}
@@ -180,7 +180,7 @@ class npc_azure_ring_captain : public CreatureScript
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING | MOVEMENTFLAG_FLYING);
me->SetReactState(REACT_AGGRESSIVE);
}
void SpellHitTarget(Unit* target, SpellEntry const* spell)
{
if (spell->Id == SPELL_ICE_BEAM)
@@ -194,16 +194,16 @@ class npc_azure_ring_captain : public CreatureScript
{
if (!UpdateVictim())
return;
DoMeleeAttackIfReady();
}
void MovementInform(uint32 type, uint32 id)
{
{
if (type != POINT_MOTION_TYPE ||
id != ACTION_CALL_DRAGON_EVENT)
return;
me->GetMotionMaster()->MoveIdle();
if (Unit* target = ObjectAccessor::GetUnit(*me,targetGUID))
@@ -307,7 +307,7 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader
return;
float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation();
for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();)
{
Position pos;
@@ -354,7 +354,7 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader
return;
float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation();
for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();)
{
Position pos;
src/server/scripts/Northrend/Nexus/Oculus/oculus.h
+1 -1
View File
@@ -45,7 +45,7 @@ enum Bosses
NPC_AZURE_RING_GUARDIAN = 28236,
NPC_CENTRIFUGE_CONSTRUCT = 27641,
};
enum GameObjects
{
GO_DRAGON_CAGE_DOOR = 193995
src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+1 -1
View File
@@ -1333,7 +1333,7 @@ public:
pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, pTarget);
}
}
me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me);
}
src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
+3 -3
View File
@@ -163,7 +163,7 @@ void StartEncounter(InstanceScript* pInstance, Creature* me, Unit* /*target*/)
{
if (pInstance->GetBossState(TYPE_ASSEMBLY) == IN_PROGRESS)
return; // Prevent recursive calls
pInstance->SetBossState(TYPE_ASSEMBLY, IN_PROGRESS);
for (uint8 i = 0; i < 3; ++i)
@@ -173,7 +173,7 @@ void StartEncounter(InstanceScript* pInstance, Creature* me, Unit* /*target*/)
continue;
if (Creature *boss = Unit::GetCreature(*me, guid))
boss->SetInCombatWithZone();
boss->SetInCombatWithZone();
}
}
@@ -554,7 +554,7 @@ public:
{
me->AddAura(SPELL_RUNE_OF_SUMMONING_VIS, me);
summonCount = 0;
summonTimer = 2000;
summonTimer = 2000;
}
uint32 summonCount;
src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
+11 -11
View File
@@ -44,7 +44,7 @@ enum eSpells
SPELL_SARONITE_BARRIER = 63364,
SPELL_SEARING_FLAMES = 62661,
SPELL_SHADOW_CRASH = 62660,
SPELL_SHADOW_CRASH_HIT = 62659,
SPELL_SHADOW_CRASH_HIT = 62659,
SPELL_SURGE_OF_DARKNESS = 62662,
SPELL_SARONITE_VAPORS = 63323,
SPELL_SUMMON_SARONITE_VAPORS = 63081,
@@ -75,7 +75,7 @@ enum eEvents
EVENT_SARONITE_VAPORS = 5,
EVENT_BERSERK = 6,
};
#define ACHIEVEMENT_SMELL_SARONITE RAID_MODE(3181, 3188)
#define ACHIEVEMENT_SHADOWDODGER RAID_MODE(2996, 2997)
@@ -118,7 +118,7 @@ public:
void EnterCombat(Unit * /*pWho*/)
{
_EnterCombat();
DoScriptText(SAY_AGGRO, me);
DoCast(me, SPELL_AURA_OF_DESPAIR);
CheckShamanisticRage();
@@ -157,12 +157,12 @@ public:
break;
case EVENT_MARK_OF_THE_FACELESS:
Unit* pTarget;
/* He will not cast this on players within 15 yards of him.
However, if there are not at least 9 people outside of 15 yards
/* He will not cast this on players within 15 yards of him.
However, if there are not at least 9 people outside of 15 yards
he will start casting it on players inside 15 yards melee and tank included.
*/
if (!(pTarget = CheckPlayersInRange(RAID_MODE(4,9), 15.0f, 50.f)))
pTarget = SelectTarget(SELECT_TARGET_RANDOM);
pTarget = SelectTarget(SELECT_TARGET_RANDOM);
DoCast(pTarget, SPELL_MARK_OF_THE_FACELESS);
events.ScheduleEvent(EVENT_MARK_OF_THE_FACELESS, urand(35000, 45000));
break;
@@ -175,7 +175,7 @@ public:
case EVENT_SARONITE_VAPORS:
DoCast(SPELL_SUMMON_SARONITE_VAPORS);
events.ScheduleEvent(EVENT_SARONITE_VAPORS, urand(30000, 35000));
if (++uiVaporCount == 6 && bSmellSaronite)
{
DoScriptText(SAY_HARDMODE, me);
@@ -212,7 +212,7 @@ public:
void JustDied(Unit * /*pWho*/)
{
_JustDied();
DoScriptText(SAY_DEATH, me);
if (instance)
@@ -337,7 +337,7 @@ public:
{
if (!UpdateVictim())
return;
if (uiProfoundOfDarknessTimer <= uiDiff)
{
DoCastAOE(SPELL_PROFOUND_DARKNESS);
@@ -345,7 +345,7 @@ public:
}
else
uiProfoundOfDarknessTimer -= uiDiff;
DoMeleeAttackIfReady();
}
};
@@ -401,7 +401,7 @@ public:
me->RemoveAllAuras();
DoCast(me, SPELL_SARONITE_VAPORS);
me->DespawnOrUnsummon(30000);
if (Creature * pVezax = me->GetCreature(*me, pInstance ? pInstance->GetData64(TYPE_VEZAX) : 0))
pVezax->AI()->DoAction(ACTION_VAPORS_DIE);
}
src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
+3 -3
View File
@@ -26,9 +26,9 @@
#define SPELL_PETRIFY_BREATH RAID_MODE(62030,63980)
#define SPELL_STONE_GRIP RAID_MODE(62166,63981)
#define SPELL_STONE_GRIP_CANCEL 65594
#define SPELL_STONE_GRIP_CANCEL 65594
#define SPELL_ARM_SWEEP RAID_MODE(63766,63983)
#define SPELL_ARM_VISUAL 64753
#define SPELL_ARM_VISUAL 64753
#define SPELL_BERSERK 47008 // guess
@@ -70,7 +70,7 @@ void EncounterInCombat(Creature* me, InstanceScript* pInstance)
c = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_RIGHT_ARM) : 0);
if (c && c != me && c->isAlive())
c->SetInCombatWithZone();
c = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_LEFT_ARM) : 0);
if (c && c != me && c->isAlive())
c->SetInCombatWithZone();
src/server/scripts/Northrend/storm_peaks.cpp
+4 -4
View File
@@ -540,7 +540,7 @@ public:
enum brunhildar {
NPC_QUEST_GIVER = 29592,
SPELL_ICE_PRISON = 54894,
SPELL_KILL_CREDIT_PRISONER = 55144,
SPELL_KILL_CREDIT_DRAKE = 55143,
@@ -548,7 +548,7 @@ enum brunhildar {
SPELL_ICE_LANCE = 55046
};
class npc_brunnhildar_prisoner : public CreatureScript
class npc_brunnhildar_prisoner : public CreatureScript
{
public:
npc_brunnhildar_prisoner() : CreatureScript("npc_brunnhildar_prisoner") { }
@@ -625,7 +625,7 @@ public:
// drake is empty now, deliver credit for drake and despawn him
if (drake->GetVehicleKit()->HasEmptySeat(1) &&
drake->GetVehicleKit()->HasEmptySeat(2) &&
drake->GetVehicleKit()->HasEmptySeat(2) &&
drake->GetVehicleKit()->HasEmptySeat(3))
{
// not working rider->CastSpell(rider, SPELL_KILL_CREDIT_DRAKE, true);
@@ -645,7 +645,7 @@ public:
if (spell->Id != SPELL_ICE_LANCE)
return;
me->RemoveAura(SPELL_ICE_PRISON);
enter_timer = 500;
src/server/scripts/Spells/spell_dk.cpp
+1 -1
View File
@@ -449,7 +449,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader
int32 remainingHp = int32(GetTarget()->GetHealth() - dmgInfo.GetDamage());
int32 minHp = int32(GetTarget()->CountPctFromMaxHealth(SpellMgr::CalculateSpellEffectAmount(talentProto, EFFECT_0, GetCaster())));
// Damage that would take you below [effect0] health or taken while you are at [effect0]
if (remainingHp < minHp)
absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct);
src/server/scripts/Spells/spell_generic.cpp
+2 -2
View File
@@ -532,7 +532,7 @@ class spell_gen_animal_blood : public SpellScriptLoader
return false;
return true;
}
void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
// Remove all auras with spell id 46221, except the one currently being applied
@@ -690,7 +690,7 @@ class spell_gen_parachute_ic : public SpellScriptLoader
return;
if (target->ToPlayer()->m_movementInfo.fallTime > 2000)
target->CastSpell(target,SPELL_PARACHUTE_IC,true);
target->CastSpell(target,SPELL_PARACHUTE_IC,true);
}
void Register()
src/server/scripts/Spells/spell_item.cpp
+1 -1
View File
@@ -751,7 +751,7 @@ enum AirRifleSpells
class spell_item_red_rider_air_rifle : public SpellScriptLoader
{
public:
spell_item_red_rider_air_rifle() : SpellScriptLoader("spell_item_red_rider_air_rifle") { }
spell_item_red_rider_air_rifle() : SpellScriptLoader("spell_item_red_rider_air_rifle") { }
class spell_item_red_rider_air_rifle_SpellScript : public SpellScript
{
src/server/scripts/Spells/spell_mage.cpp
+3 -3
View File
@@ -227,7 +227,7 @@ public:
bool Validate(SpellEntry const * /*spellEntry*/)
{
return sSpellStore.LookupEntry(SPELL_MAGE_FROST_WARDING_TRIGGERED)
return sSpellStore.LookupEntry(SPELL_MAGE_FROST_WARDING_TRIGGERED)
&& sSpellStore.LookupEntry(SPELL_MAGE_FROST_WARDING_R1);
}
@@ -277,7 +277,7 @@ public:
bool Validate(SpellEntry const * /*spellEntry*/)
{
return sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED)
return sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED)
&& sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_R1);
}
@@ -322,7 +322,7 @@ public:
bool Validate(SpellEntry const * /*spellEntry*/)
{
return sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED)
return sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED)
&& sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_R1);
}
src/server/scripts/World/areatrigger_scripts.cpp
+1 -1
View File
@@ -295,7 +295,7 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript
bool OnTrigger(Player* player, AreaTriggerEntry const* trigger)
{
if (!(player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE ||
if (!(player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE ||
player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE ||
player->GetQuestStatus(QUEST_BREAKING_THROUGH) == QUEST_STATUS_INCOMPLETE ||
player->GetQuestStatus(QUEST_BREAKING_THROUGH) == QUEST_STATUS_COMPLETE))
src/server/worldserver/Master.cpp
+1 -1
View File
@@ -300,7 +300,7 @@ int Master::Run()
///- Clean database before leaving
clearOnlineAccounts();
_StopDB();
_StopDB();
sLog->outString("Halting process...");