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

Core: Fix build due to merge resolution errors

Browse Source
This commit is contained in:
DDuarte
2014-01-11 23:29:27 +00:00
parent ced89d7c68
commit b204d71cb4
9 changed files with 17 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Battlefield/BattlefieldMgr.cpp
View File

@@ -134,7 +134,7 @@ ZoneScript* BattlefieldMgr::GetZoneScript(uint32 zoneId)
Battlefield* BattlefieldMgr::GetBattlefieldByGUID(uint64 guid)
{
for (BattlefieldSet::iterator itr = m_BattlefieldSet.begin(); itr != m_BattlefieldSet.end(); ++itr)
for (BattlefieldSet::iterator itr = _battlefieldSet.begin(); itr != _battlefieldSet.end(); ++itr)
if ((*itr)->GetGUID() == guid)
return (*itr);

7
src/server/game/Entities/Vehicle/Vehicle.cpp
View File

@@ -521,13 +521,6 @@ Vehicle* Vehicle::RemovePassenger(Unit* unit)
if (_me->IsInWorld())
unit->m_movementInfo.ResetTransport();
if (!_me->GetTransport())
{
unit->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
unit->m_movementInfo.transport.Reset();
}
else
unit->m_movementInfo.transport = _me->m_movementInfo.transport;
// only for flyable vehicles
if (unit->IsFlying())

8
src/server/game/Handlers/ChatHandler.cpp
View File

@@ -415,7 +415,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData)
sScriptMgr->OnPlayerChat(GetPlayer(), type, lang, msg, group);
WorldPacket data;
ChatHandler::BuildChatPacket(data, type, Language(lang), _player, NULL, msg);
ChatHandler::BuildChatPacket(data, ChatMsg(type), Language(lang), _player, NULL, msg);
group->BroadcastPacket(&data, false);
} break;
case CHAT_MSG_RAID_WARNING:
@@ -445,7 +445,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData)
sScriptMgr->OnPlayerChat(GetPlayer(), type, lang, msg, group);
WorldPacket data;
ChatHandler::BuildChatPacket(data, type, Language(lang), _player, NULL, msg);
ChatHandler::BuildChatPacket(data, ChatMsg(type), Language(lang), _player, NULL, msg);
group->BroadcastPacket(&data, false);
} break;
case CHAT_MSG_CHANNEL:
@@ -614,7 +614,7 @@ void WorldSession::HandleAddonMessagechatOpcode(WorldPacket& recvData)
return;
WorldPacket data;
ChatHandler::BuildChatPacket(data, type, LANG_ADDON, this, this, message, 0, "", DEFAULT_LOCALE, prefix.c_str());
ChatHandler::BuildChatPacket(data, type, LANG_ADDON, sender, NULL, message, 0U, "", DEFAULT_LOCALE, prefix.c_str());
group->BroadcastAddonMessagePacket(&data, prefix, false);
break;
}
@@ -647,7 +647,7 @@ void WorldSession::HandleAddonMessagechatOpcode(WorldPacket& recvData)
break;
WorldPacket data;
ChatHandler::BuildChatPacket(data, type, LANG_ADDON, this, this, message, 0, "", DEFAULT_LOCALE, prefix.c_str());
ChatHandler::BuildChatPacket(data, type, LANG_ADDON, sender, NULL, message, 0U, "", DEFAULT_LOCALE, prefix.c_str());
group->BroadcastAddonMessagePacket(&data, prefix, true, -1, group->GetMemberGroup(sender->GetGUID()));
break;
}

4
src/server/game/Maps/Map.cpp
View File

@@ -566,7 +566,7 @@ bool Map::AddToMap(Transport* obj)
{
if (itr->GetSource()->GetTransport() != obj)
{
UpdateData data;
UpdateData data(i_mapEntry->MapID);
obj->BuildCreateUpdateBlockForPlayer(&data, itr->GetSource());
WorldPacket packet;
data.BuildPacket(&packet);
@@ -826,7 +826,7 @@ void Map::RemoveFromMap(Transport* obj, bool remove)
Map::PlayerList const& players = GetPlayers();
if (!players.isEmpty())
{
UpdateData data;
UpdateData data(i_mapEntry->MapID);
obj->BuildOutOfRangeUpdateBlock(&data);
WorldPacket packet;
data.BuildPacket(&packet);

4
src/server/game/Movement/Spline/MoveSplineInit.cpp
View File

@@ -60,7 +60,7 @@ namespace Movement
{
MoveSpline& move_spline = *unit->movespline;
bool transport = unit->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit->GetTransGUID();
bool transport = unit->GetTransGUID();
Location real_position;
// there is a big chance that current position is unknown if current state is not finalized, need compute it
// this also allows calculate spline position and update map position in much greater intervals
@@ -138,7 +138,7 @@ namespace Movement
if (move_spline.Finalized())
return;
bool transport = unit->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit->GetTransGUID();
bool transport = unit->GetTransGUID();
Location loc;
if (move_spline.onTransport == transport)
loc = move_spline.ComputePosition();

4
src/server/game/Quests/QuestDef.h
View File

@@ -122,10 +122,10 @@ enum QuestGiverStatus
DIALOG_STATUS_AVAILABLE_REP = 0x080,
DIALOG_STATUS_AVAILABLE = 0x100,
DIALOG_STATUS_REWARD2 = 0x200, // no yellow dot on minimap
DIALOG_STATUS_REWARD = 0x400 // yellow dot on minimap
DIALOG_STATUS_REWARD = 0x400, // yellow dot on minimap
// Custom value meaning that script call did not return any valid quest status
DIALOG_STATUS_SCRIPTED_NO_STATUS = 0x1000,
DIALOG_STATUS_SCRIPTED_NO_STATUS = 0x1000
};
enum QuestFlags

10
src/server/game/Server/WorldSession.h
View File

@@ -786,11 +786,11 @@ class WorldSession
void HandleRequestRatedBgStats(WorldPacket& recvData);
// Battlefield
void SendBfInvitePlayerToWar(uint32 battleId, uint32 zoneId, uint32 time);
void SendBfInvitePlayerToQueue(uint32 battleId);
void SendBfQueueInviteResponse(uint32 battleId, uint32 zoneId, bool canQueue = true, bool full = false);
void SendBfEntered(uint32 battleId);
void SendBfLeaveMessage(uint32 battleId, BFLeaveReason reason = BF_LEAVE_REASON_EXITED);
void SendBfInvitePlayerToWar(uint64 guid, uint32 zoneId, uint32 time);
void SendBfInvitePlayerToQueue(uint64 guid);
void SendBfQueueInviteResponse(uint64 guid, uint32 zoneId, bool canQueue = true, bool full = false);
void SendBfEntered(uint64 guid);
void SendBfLeaveMessage(uint64 guid, BFLeaveReason reason = BF_LEAVE_REASON_EXITED);
void HandleBfQueueInviteResponse(WorldPacket& recvData);
void HandleBfEntryInviteResponse(WorldPacket& recvData);
void HandleBfExitRequest(WorldPacket& recvData);

2
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
View File

@@ -59,7 +59,7 @@ class boss_akilzon : public CreatureScript
void KilledUnit(Unit* who) OVERRIDE
{
if (who->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_KILL);
Talk(SAY_PLAYER_KILL);
}
void UpdateAI(uint32 diff) OVERRIDE

16
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
View File

@@ -120,21 +120,6 @@ class instance_zulgurub : public InstanceMapScript
}
}
{
switch (go->GetEntry())
{
case GO_VENOXIS_COIL:
case GO_ARENA_DOOR_1:
case GO_FORCEFIELD:
case GO_ZANZIL_DOOR:
case GO_THE_CACHE_OF_MADNESS_DOOR:
AddDoor(go, false);
break;
default:
break;
}
}
bool SetBossState(uint32 type, EncounterState state) OVERRIDE
{
if (!InstanceScript::SetBossState(type, state))
@@ -152,7 +137,6 @@ class instance_zulgurub : public InstanceMapScript
case DATA_WUSHOOLAY:
case DATA_GRILEK:
break;
default:
}
return true;