Permalink
Browse files

Core/Build: Changed project name-space from Trinity 2 Skyfire.

- Reason for this change, Trinity has shown no interest in
- TBC, they're focus is on what they have now. Therefore we are taken
- over the ownership of it, until interest is shown or otherwise asked.
- this project will still follow in TrinityCore's foot steps as much as is
- feebly possible.

Core/Headers: fixed copyright headers, to display correct GPL version,
- and corrected TC's copyrights.

Signed-off-by: bootz <bootz@projectskyfire.org>
  • Loading branch information...
KillaVulkan authored and Bootz committed Sep 10, 2012
1 parent cc0f310 commit dce2eac35f7fc2f24f5b5316c0dab542103d93bc
Showing with 465 additions and 468 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 src/server/authserver/Main.cpp
  3. +2 −2 src/server/authserver/Server/AuthSocket.cpp
  4. +1 −1 src/server/collision/CMakeLists.txt
  5. +5 −5 src/server/game/AI/CoreAI/TotemAI.cpp
  6. +13 −13 src/server/game/AI/EventAI/CreatureEventAI.cpp
  7. +3 −3 src/server/game/AI/EventAI/CreatureEventAI.h
  8. +1 −1 src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
  9. +10 −10 src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
  10. +8 −8 src/server/game/Battlegrounds/Battleground.cpp
  11. +1 −1 src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
  12. +1 −1 src/server/game/CMakeLists.txt
  13. +4 −4 src/server/game/Chat/Chat.cpp
  14. +2 −2 src/server/game/Chat/Commands/Level1.cpp
  15. +5 −5 src/server/game/Chat/Commands/Level3.cpp
  16. +2 −2 src/server/game/Entities/Corpse/Corpse.cpp
  17. +17 −17 src/server/game/Entities/Creature/Creature.cpp
  18. +2 −2 src/server/game/Entities/Creature/CreatureGroups.cpp
  19. +3 −3 src/server/game/Entities/Creature/GossipDef.cpp
  20. +1 −1 src/server/game/Entities/DynamicObject/DynamicObject.cpp
  21. +12 −12 src/server/game/Entities/GameObject/GameObject.cpp
  22. +47 −47 src/server/game/Entities/Object/Object.cpp
  23. +1 −1 src/server/game/Entities/Object/Object.h
  24. +3 −3 src/server/game/Entities/Pet/Pet.cpp
  25. +22 −22 src/server/game/Entities/Player/Player.cpp
  26. +5 −5 src/server/game/Entities/Unit/Unit.cpp
  27. +1 −1 src/server/game/Entities/Unit/Unit.h
  28. +2 −2 src/server/game/Globals/ObjectAccessor.cpp
  29. +2 −2 src/server/game/Globals/ObjectAccessor.h
  30. +10 −10 src/server/game/Globals/ObjectMgr.cpp
  31. +1 −1 src/server/game/Grids/Grid.h
  32. +1 −1 src/server/game/Grids/GridDefines.h
  33. +2 −2 src/server/game/Grids/Notifiers/GridNotifiers.cpp
  34. +1 −1 src/server/game/Grids/Notifiers/GridNotifiers.h
  35. +28 −28 src/server/game/Grids/Notifiers/GridNotifiersImpl.h
  36. +1 −1 src/server/game/Grids/ObjectGridLoader.cpp
  37. +1 −1 src/server/game/Groups/Group.cpp
  38. +1 −1 src/server/game/Handlers/ItemHandler.cpp
  39. +2 −2 src/server/game/Handlers/MiscHandler.cpp
  40. +2 −2 src/server/game/Handlers/MovementHandler.cpp
  41. +4 −4 src/server/game/Handlers/PetitionsHandler.cpp
  42. +43 −43 src/server/game/Maps/Map.cpp
  43. +5 −5 src/server/game/Maps/Map.h
  44. +1 −1 src/server/game/Maps/MapManager.cpp
  45. +3 −3 src/server/game/Maps/MapManager.h
  46. +1 −1 src/server/game/Miscellaneous/Formulas.h
  47. +2 −2 src/server/game/Miscellaneous/Language.h
  48. +2 −2 src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
  49. +2 −2 src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
  50. +2 −2 src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
  51. +4 −4 src/server/game/Movement/Waypoints/WaypointManager.cpp
  52. +2 −2 src/server/game/OutdoorPvP/OutdoorPvP.cpp
  53. +2 −2 src/server/game/Quests/QuestDef.h
  54. +8 −8 src/server/game/Scripting/MapScripts.cpp
  55. +1 −1 src/server/game/Scripting/ScriptMgr.cpp
  56. +1 −1 src/server/game/Scripting/ScriptMgr.h
  57. +7 −7 src/server/game/Spells/Auras/SpellAuras.cpp
  58. +3 −3 src/server/game/Spells/Auras/SpellAuras.h
  59. +13 −13 src/server/game/Spells/Spell.cpp
  60. +3 −3 src/server/game/Spells/Spell.h
  61. +3 −3 src/server/game/Spells/SpellEffects.cpp
  62. +1 −1 src/server/game/World/World.h
  63. +1 −1 src/server/scripts/CMakeLists.txt
  64. +3 −3 src/server/scripts/Custom/test.cpp
  65. +2 −2 src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
  66. +4 −4 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
  67. +8 −8 src/server/scripts/EasternKingdoms/Zones/stormwind_city.cpp
  68. +5 −5 src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
  69. +12 −12 src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
  70. +4 −4 src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
  71. +1 −1 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
  72. +16 −16 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
  73. +3 −3 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
  74. +4 −4 src/server/scripts/Kalimdor/Zones/dustwallow_marsh.cpp
  75. +1 −1 src/server/scripts/Kalimdor/Zones/the_barrens.cpp
  76. +1 −1 src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
  77. +1 −1 src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
  78. +1 −1 src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
  79. +1 −1 src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
  80. +2 −2 src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
  81. +4 −4 src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
  82. +9 −9 src/server/scripts/Outland/Zones/netherstorm.cpp
  83. +1 −1 src/server/scripts/World/go_scripts.cpp
  84. +1 −1 src/server/shared/CMakeLists.txt
  85. +1 −1 src/server/shared/Common.h
  86. +9 −9 src/server/shared/Database/DatabaseImpl.h
  87. +2 −2 src/server/shared/Database/SqlOperations.cpp
  88. +6 −6 src/server/shared/Database/SqlOperations.h
  89. +3 −3 src/server/shared/Dynamic/TypeContainer.h
  90. +1 −1 src/server/shared/Dynamic/TypeContainerFunctions.h
  91. +1 −1 src/server/shared/Dynamic/TypeContainerFunctionsPtr.h
  92. +3 −3 src/server/shared/Threading/Callback.h
  93. +2 −2 src/server/shared/Utilities/SignalHandler.h
  94. +1 −1 src/server/shared/Utilities/Util.cpp
  95. +1 −1 src/server/shared/Utilities/Util.h
  96. +2 −2 src/server/worldserver/Main.cpp
  97. +1 −1 src/server/worldserver/Master.cpp
  98. +3 −3 src/server/worldserver/RemoteAccess/RARunnable.cpp
  99. +1 −2 src/tools/map_extractor/CMakeLists.txt
  100. +1 −2 src/tools/vmap_assembler/CMakeLists.txt
  101. +1 −2 src/tools/vmap_extractor/CMakeLists.txt
View
@@ -1,6 +1,6 @@
# Copyright (C) 2010-2012 Project SkyFire <http://www.projectskyfire.org/>
# Copyright (C) 2010-2012 Oregon <http://www.oregoncore.com/>
-# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2005-2012 MaNGOS <http://www.getmangos.com/>
#
# This file is free software; as a special exception the author gives
@@ -46,7 +46,7 @@ bool stopEvent = false; // Setting it to tru
DatabaseType LoginDatabase; // Accessor to the realm server database
// Handle authserver's termination signals
-class AuthServerSignalHandler : public Trinity::SignalHandler
+class AuthServerSignalHandler : public Skyfire::SignalHandler
{
public:
virtual void HandleSignal(int SigNum)
@@ -660,7 +660,7 @@ bool AuthSocket::_HandleLogonProof()
if (WrongPassBanType)
{
uint32 acc_id = (*loginfail)[0].GetUInt32();
- LoginDatabase.PExecute("INSERT INTO account_banned VALUES ('%u',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','Trinity realmd','Failed login autoban',1)",
+ LoginDatabase.PExecute("INSERT INTO account_banned VALUES ('%u',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','Skyfire realmd','Failed login autoban',1)",
acc_id, WrongPassBanTime);
sLog->outBasic("[AuthChallenge] account %s got banned for '%u' seconds because it failed to authenticate '%u' times",
@@ -670,7 +670,7 @@ bool AuthSocket::_HandleLogonProof()
{
std::string current_ip(socket().getRemoteAddress().c_str());
LoginDatabase.EscapeString(current_ip);
- LoginDatabase.PExecute("INSERT INTO ip_banned VALUES ('%s',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','Trinity realmd','Failed login autoban')",
+ LoginDatabase.PExecute("INSERT INTO ip_banned VALUES ('%s',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','Skyfire realmd','Failed login autoban')",
current_ip.c_str(), WrongPassBanTime);
sLog->outBasic("[AuthChallenge] IP %s got banned for '%u' seconds because account %s failed to authenticate '%u' times", socket().getRemoteAddress().c_str(), WrongPassBanTime, _login.c_str(), failed_logins);
@@ -1,6 +1,6 @@
# Copyright (C) 2010-2012 Project SkyFire <http://www.projectskyfire.org/>
# Copyright (C) 2010-2012 Oregon <http://www.oregoncore.com/>
-# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2005-2012 MaNGOS <http://www.getmangos.com/>
#
# This file is free software; as a special exception the author gives
@@ -82,17 +82,17 @@ TotemAI::UpdateAI(const uint32 /*diff*/)
!victim->isTargetableForAttack() || !i_totem.IsWithinDistInMap(victim, max_range) ||
i_totem.IsFriendlyTo(victim) || !victim->isVisibleForOrDetect(&i_totem, false))
{
- CellPair p(Trinity::ComputeCellPair(i_totem.GetPositionX(), i_totem.GetPositionY()));
+ CellPair p(Skyfire::ComputeCellPair(i_totem.GetPositionX(), i_totem.GetPositionY()));
Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT;
victim = NULL;
- Trinity::NearestAttackableUnitInObjectRangeCheck u_check(&i_totem, &i_totem, max_range);
- Trinity::UnitLastSearcher<Trinity::NearestAttackableUnitInObjectRangeCheck> checker(victim, u_check);
+ Skyfire::NearestAttackableUnitInObjectRangeCheck u_check(&i_totem, &i_totem, max_range);
+ Skyfire::UnitLastSearcher<Skyfire::NearestAttackableUnitInObjectRangeCheck> checker(victim, u_check);
- TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::NearestAttackableUnitInObjectRangeCheck>, GridTypeMapContainer > grid_object_checker(checker);
- TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::NearestAttackableUnitInObjectRangeCheck>, WorldTypeMapContainer > world_object_checker(checker);
+ TypeContainerVisitor<Skyfire::UnitLastSearcher<Skyfire::NearestAttackableUnitInObjectRangeCheck>, GridTypeMapContainer > grid_object_checker(checker);
+ TypeContainerVisitor<Skyfire::UnitLastSearcher<Skyfire::NearestAttackableUnitInObjectRangeCheck>, WorldTypeMapContainer > world_object_checker(checker);
//TODO: Backport mangos-0.12 r638: [7667] Add to CreatureAI field pointing to creature itself
//cell.Visit(p, grid_object_checker, *m_creature.GetMap(), *m_creature, max_range);
@@ -851,7 +851,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
break;
- // TRINITY ONLY
+ // SKYFIRE ONLY
case ACTION_T_MOVE_RANDOM_POINT: //dosen't work in combat
{
float x, y, z;
@@ -1228,48 +1228,48 @@ inline Unit* CreatureEventAI::GetTargetByType(uint32 Target, Unit* pActionInvoke
Unit* CreatureEventAI::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff)
{
- CellPair p(Trinity::ComputeCellPair(me->GetPositionX(), me->GetPositionY()));
+ CellPair p(Skyfire::ComputeCellPair(me->GetPositionX(), me->GetPositionY()));
Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate();
Unit* pUnit = NULL;
- Trinity::MostHPMissingInRange u_check(me, range, MinHPDiff);
- Trinity::UnitLastSearcher<Trinity::MostHPMissingInRange> searcher(pUnit, u_check);
+ Skyfire::MostHPMissingInRange u_check(me, range, MinHPDiff);
+ Skyfire::UnitLastSearcher<Skyfire::MostHPMissingInRange> searcher(pUnit, u_check);
- TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::MostHPMissingInRange>, GridTypeMapContainer > grid_unit_searcher(searcher);
+ TypeContainerVisitor<Skyfire::UnitLastSearcher<Skyfire::MostHPMissingInRange>, GridTypeMapContainer > grid_unit_searcher(searcher);
cell.Visit(p, grid_unit_searcher, *me->GetMap(), *me, range);
return pUnit;
}
void CreatureEventAI::DoFindFriendlyCC(std::list<Creature*>& _list, float range)
{
- CellPair p(Trinity::ComputeCellPair(me->GetPositionX(), me->GetPositionY()));
+ CellPair p(Skyfire::ComputeCellPair(me->GetPositionX(), me->GetPositionY()));
Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate();
- Trinity::FriendlyCCedInRange u_check(me, range);
- Trinity::CreatureListSearcher<Trinity::FriendlyCCedInRange> searcher(_list, u_check);
+ Skyfire::FriendlyCCedInRange u_check(me, range);
+ Skyfire::CreatureListSearcher<Skyfire::FriendlyCCedInRange> searcher(_list, u_check);
- TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::FriendlyCCedInRange>, GridTypeMapContainer > grid_creature_searcher(searcher);
+ TypeContainerVisitor<Skyfire::CreatureListSearcher<Skyfire::FriendlyCCedInRange>, GridTypeMapContainer > grid_creature_searcher(searcher);
cell.Visit(p, grid_creature_searcher, *me->GetMap(), *me, range);
}
void CreatureEventAI::DoFindFriendlyMissingBuff(std::list<Creature*>& _list, float range, uint32 spellid)
{
- CellPair p(Trinity::ComputeCellPair(me->GetPositionX(), me->GetPositionY()));
+ CellPair p(Skyfire::ComputeCellPair(me->GetPositionX(), me->GetPositionY()));
Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate();
- Trinity::FriendlyMissingBuffInRange u_check(me, range, spellid);
- Trinity::CreatureListSearcher<Trinity::FriendlyMissingBuffInRange> searcher(_list, u_check);
+ Skyfire::FriendlyMissingBuffInRange u_check(me, range, spellid);
+ Skyfire::CreatureListSearcher<Skyfire::FriendlyMissingBuffInRange> searcher(_list, u_check);
- TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::FriendlyMissingBuffInRange>, GridTypeMapContainer > grid_creature_searcher(searcher);
+ TypeContainerVisitor<Skyfire::CreatureListSearcher<Skyfire::FriendlyMissingBuffInRange>, GridTypeMapContainer > grid_creature_searcher(searcher);
cell.Visit(p, grid_creature_searcher, *me->GetMap(), *me, range);
}
@@ -65,8 +65,8 @@ enum EventAI_Type
EVENT_T_MISSING_AURA = 27, // Param1 = SpellID, Param2 = Number of time stacked expected, Param3/4 Repeat Min/Max
EVENT_T_TARGET_MISSING_AURA = 28, // Param1 = SpellID, Param2 = Number of time stacked expected, Param3/4 Repeat Min/Max
- // Trinity only
- EVENT_T_RESET = 35, // Is it called after combat, when the creature respawn and spawn. -- TRINITY ONLY
+ // Skyfire only
+ EVENT_T_RESET = 35, // Is it called after combat, when the creature respawn and spawn. -- SKYFIRE ONLY
EVENT_T_END,
};
@@ -118,7 +118,7 @@ enum EventAI_ActionType
ACTION_T_SET_INVINCIBILITY_HP_LEVEL = 42, // MinHpValue, format(0-flat, 1-percent from max health)
ACTION_T_MOUNT_TO_ENTRY_OR_MODEL = 43, // Creature_template entry(param1) OR ModelId (param2) (or 0 for both to unmount)
- // Trinity only
+ // Skyfire only
ACTION_T_SET_PHASE_MASK = 97,
ACTION_T_SET_STAND_STATE = 98,
ACTION_T_MOVE_RANDOM_POINT = 99,
@@ -165,7 +165,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Summons(bool check_entry_use)
temp.orientation = fields[4].GetFloat();
temp.SpawnTimeSecs = fields[5].GetUInt32();
- if (!Trinity::IsValidMapCoord(temp.position_x, temp.position_y, temp.position_z, temp.orientation))
+ if (!Skyfire::IsValidMapCoord(temp.position_x, temp.position_y, temp.position_z, temp.orientation))
{
sLog->outErrorDb("CreatureEventAI: Summon id %u has invalid coordinates (%f, %f, %f, %f), skipping.", i, temp.position_x, temp.position_y, temp.position_z, temp.orientation);
continue;
@@ -476,8 +476,8 @@ void ScriptedAI::DoTeleportAll(float fX, float fY, float fZ, float fO)
Unit* ScriptedAI::DoSelectLowestHpFriendly(float fRange, uint32 uiMinHPDiff)
{
Unit* pUnit = NULL;
- Trinity::MostHPMissingInRange u_check(me, fRange, uiMinHPDiff);
- Trinity::UnitLastSearcher<Trinity::MostHPMissingInRange> searcher(pUnit, u_check);
+ Skyfire::MostHPMissingInRange u_check(me, fRange, uiMinHPDiff);
+ Skyfire::UnitLastSearcher<Skyfire::MostHPMissingInRange> searcher(pUnit, u_check);
me->VisitNearbyObject(fRange, searcher);
return pUnit;
@@ -486,17 +486,17 @@ Unit* ScriptedAI::DoSelectLowestHpFriendly(float fRange, uint32 uiMinHPDiff)
std::list<Creature*> ScriptedAI::DoFindFriendlyCC(float fRange)
{
std::list<Creature*> pList;
- Trinity::FriendlyCCedInRange u_check(me, fRange);
- Trinity::CreatureListSearcher<Trinity::FriendlyCCedInRange> searcher(pList, u_check);
+ Skyfire::FriendlyCCedInRange u_check(me, fRange);
+ Skyfire::CreatureListSearcher<Skyfire::FriendlyCCedInRange> searcher(pList, u_check);
me->VisitNearbyObject(fRange, searcher);
return pList;
}
std::list<Creature*> ScriptedAI::DoFindFriendlyMissingBuff(float fRange, uint32 uiSpellid)
{
std::list<Creature*> pList;
- Trinity::FriendlyMissingBuffInRange u_check(me, fRange, uiSpellid);
- Trinity::CreatureListSearcher<Trinity::FriendlyMissingBuffInRange> searcher(pList, u_check);
+ Skyfire::FriendlyMissingBuffInRange u_check(me, fRange, uiSpellid);
+ Skyfire::CreatureListSearcher<Skyfire::FriendlyMissingBuffInRange> searcher(pList, u_check);
me->VisitNearbyObject(fRange, searcher);
return pList;
}
@@ -505,14 +505,14 @@ Player* ScriptedAI::GetPlayerAtMinimumRange(float fMinimumRange)
{
Player* player = NULL;
- CellPair pair(Trinity::ComputeCellPair(me->GetPositionX(), me->GetPositionY()));
+ CellPair pair(Skyfire::ComputeCellPair(me->GetPositionX(), me->GetPositionY()));
Cell cell(pair);
cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate();
- Trinity::PlayerAtMinimumRangeAway check(me, fMinimumRange);
- Trinity::PlayerSearcher<Trinity::PlayerAtMinimumRangeAway> searcher(player, check);
- TypeContainerVisitor<Trinity::PlayerSearcher<Trinity::PlayerAtMinimumRangeAway>, GridTypeMapContainer> visitor(searcher);
+ Skyfire::PlayerAtMinimumRangeAway check(me, fMinimumRange);
+ Skyfire::PlayerSearcher<Skyfire::PlayerAtMinimumRangeAway> searcher(player, check);
+ TypeContainerVisitor<Skyfire::PlayerSearcher<Skyfire::PlayerAtMinimumRangeAway>, GridTypeMapContainer> visitor(searcher);
cell.Visit(pair, visitor, *(me->GetMap()));
@@ -31,7 +31,7 @@
#include "Util.h"
#include "GridNotifiersImpl.h"
-namespace Trinity
+namespace Skyfire
{
class BattlegroundChatBuilder
{
@@ -111,7 +111,7 @@ namespace Trinity
int32 i_arg1;
int32 i_arg2;
};
-} // namespace Trinity
+} // namespace Skyfire
template<class Do>
void Battleground::BroadcastWorker(Do& _do)
@@ -1696,8 +1696,8 @@ bool Battleground::AddSpiritGuide(uint32 type, float x, float y, float z, float
void Battleground::SendMessageToAll(int32 entry, ChatMsg type, Player const* source)
{
- Trinity::BattlegroundChatBuilder bg_builder(type, entry, source);
- Trinity::LocalizedPacketDo<Trinity::BattlegroundChatBuilder> bg_do(bg_builder);
+ Skyfire::BattlegroundChatBuilder bg_builder(type, entry, source);
+ Skyfire::LocalizedPacketDo<Skyfire::BattlegroundChatBuilder> bg_do(bg_builder);
BroadcastWorker(bg_do);
}
@@ -1706,17 +1706,17 @@ void Battleground::PSendMessageToAll(int32 entry, ChatMsg type, Player const* so
va_list ap;
va_start(ap, source);
- Trinity::BattlegroundChatBuilder bg_builder(type, entry, source, &ap);
- Trinity::LocalizedPacketDo<Trinity::BattlegroundChatBuilder> bg_do(bg_builder);
+ Skyfire::BattlegroundChatBuilder bg_builder(type, entry, source, &ap);
+ Skyfire::LocalizedPacketDo<Skyfire::BattlegroundChatBuilder> bg_do(bg_builder);
BroadcastWorker(bg_do);
va_end(ap);
}
void Battleground::SendMessage2ToAll(int32 entry, ChatMsg type, Player const* source, int32 arg1, int32 arg2)
{
- Trinity::Battleground2ChatBuilder bg_builder(type, entry, source, arg1, arg2);
- Trinity::LocalizedPacketDo<Trinity::Battleground2ChatBuilder> bg_do(bg_builder);
+ Skyfire::Battleground2ChatBuilder bg_builder(type, entry, source, arg1, arg2);
+ Skyfire::LocalizedPacketDo<Skyfire::Battleground2ChatBuilder> bg_do(bg_builder);
BroadcastWorker(bg_do);
}
@@ -47,7 +47,7 @@ BattlegroundAV::~BattlegroundAV()
const uint16 BattlegroundAV::GetBonusHonor(uint8 kills) //TODO: move this function to Battleground.cpp (needs to find a way to get m_MaxLevel)
{
- return Trinity::Honor::hk_honor_at_level(m_MaxLevel, kills);
+ return Skyfire::Honor::hk_honor_at_level(m_MaxLevel, kills);
}
void BattlegroundAV::HandleKillPlayer(Player* player, Player* killer)
@@ -1,6 +1,6 @@
# Copyright (C) 2010-2012 Project SkyFire <http://www.projectskyfire.org/>
# Copyright (C) 2010-2012 Oregon <http://www.oregoncore.com/>
-# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2005-2012 MaNGOS <http://www.getmangos.com/>
#
# This file is free software; as a special exception the author gives
@@ -1750,14 +1750,14 @@ GameObject* ChatHandler::GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid
if (!obj && sObjectMgr->GetGOData(lowguid)) // guid is DB guid of object
{
// search near player then
- CellPair p(Trinity::ComputeCellPair(pl->GetPositionX(), pl->GetPositionY()));
+ CellPair p(Skyfire::ComputeCellPair(pl->GetPositionX(), pl->GetPositionY()));
Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT;
- Trinity::GameObjectWithDbGUIDCheck go_check(*pl, lowguid);
- Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck> checker(obj, go_check);
+ Skyfire::GameObjectWithDbGUIDCheck go_check(*pl, lowguid);
+ Skyfire::GameObjectSearcher<Skyfire::GameObjectWithDbGUIDCheck> checker(obj, go_check);
- TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker);
+ TypeContainerVisitor<Skyfire::GameObjectSearcher<Skyfire::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker);
cell.Visit(p, object_checker, *pl->GetMap());
}
@@ -750,7 +750,7 @@ bool ChatHandler::HandleGPSCommand(const char* args)
return false;
}
}
- CellPair cell_val = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
+ CellPair cell_val = Skyfire::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
Cell cell(cell_val);
uint32 zone_id = obj->GetZoneId();
@@ -769,7 +769,7 @@ bool ChatHandler::HandleGPSCommand(const char* args)
float ground_z = map->GetHeight(obj->GetPositionX(), obj->GetPositionY(), MAX_HEIGHT);
float floor_z = map->GetHeight(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ());
- GridPair p = Trinity::ComputeGridPair(obj->GetPositionX(), obj->GetPositionY());
+ GridPair p = Skyfire::ComputeGridPair(obj->GetPositionX(), obj->GetPositionY());
int gx=63-p.x_coord;
int gy=63-p.y_coord;
@@ -5627,15 +5627,15 @@ bool ChatHandler::HandleRespawnCommand(const char* /*args*/)
return true;
}
- CellPair p(Trinity::ComputeCellPair(pl->GetPositionX(), pl->GetPositionY()));
+ CellPair p(Skyfire::ComputeCellPair(pl->GetPositionX(), pl->GetPositionY()));
Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate();
- Trinity::RespawnDo u_do;
- Trinity::WorldObjectWorker<Trinity::RespawnDo> worker(u_do);
+ Skyfire::RespawnDo u_do;
+ Skyfire::WorldObjectWorker<Skyfire::RespawnDo> worker(u_do);
- TypeContainerVisitor<Trinity::WorldObjectWorker<Trinity::RespawnDo>, GridTypeMapContainer > obj_worker(worker);
+ TypeContainerVisitor<Skyfire::WorldObjectWorker<Skyfire::RespawnDo>, GridTypeMapContainer > obj_worker(worker);
cell.Visit(p, obj_worker, *pl->GetMap());
return true;
@@ -6763,7 +6763,7 @@ bool ChatHandler::HandleModifyGenderCommand(const char *args)
}
/*------------------------------------------
- *-------------Trinity----------------------
+ *-------------Skyfire----------------------
*-------------------------------------*/
bool ChatHandler::HandlePlayAllCommand(const char *args)
@@ -104,7 +104,7 @@ bool Corpse::Create(uint32 guidlow, Player *owner, uint32 mapid, float x, float
SetFloatValue(CORPSE_FIELD_FACING, ang);
SetUInt64Value(CORPSE_FIELD_OWNER, owner->GetGUID());
- m_grid = Trinity::ComputeGridPair(GetPositionX(), GetPositionY());
+ m_grid = Skyfire::ComputeGridPair(GetPositionX(), GetPositionY());
return true;
}
@@ -213,7 +213,7 @@ bool Corpse::LoadFromDB(uint32 guid, Field *fields)
return false;
}
- m_grid = Trinity::ComputeGridPair(GetPositionX(), GetPositionY());
+ m_grid = Skyfire::ComputeGridPair(GetPositionX(), GetPositionY());
return true;
}
Oops, something went wrong.

0 comments on commit dce2eac

Please sign in to comment.