From 2265aef916e3b2d63d87faa68a2b51e7d747c54c Mon Sep 17 00:00:00 2001 From: Seline Date: Tue, 14 Oct 2008 11:57:03 -0500 Subject: [svn] * Merge Temp dev SVN with Assembla. * Changes include: - Implementation of w12x's Outdoor PvP and Game Event Systems. - Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed). - All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql). - Improved Config cleanup. - And many more changes. --HG-- branch : trunk --- src/bindings/scripts/include/sc_creature.cpp | 29 +++++++++++++++------------- src/bindings/scripts/include/sc_creature.h | 11 +++++++---- src/bindings/scripts/include/sc_gossip.h | 5 ++++- src/bindings/scripts/include/sc_instance.h | 2 +- 4 files changed, 28 insertions(+), 19 deletions(-) (limited to 'src/bindings/scripts/include') diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 80271821ade..b18d018c5a9 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -1,4 +1,7 @@ -/* Copyright (C) 2006 - 2008 ScriptDev2 +/* Copyright (C) 2008 Trinity + * + * Thanks to the original authors: ScriptDev2 + * * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ @@ -506,21 +509,21 @@ void ScriptedAI::DoTeleportPlayer(Unit* pUnit, float x, float y, float z, float Unit* ScriptedAI::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff) { - CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); + CellPair p(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); Unit* pUnit = NULL; - MaNGOS::MostHPMissingInRange u_check(m_creature, range, MinHPDiff); - MaNGOS::UnitLastSearcher searcher(pUnit, u_check); + Trinity::MostHPMissingInRange u_check(m_creature, range, MinHPDiff); + Trinity::UnitLastSearcher searcher(pUnit, u_check); /* typedef TYPELIST_4(GameObject, Creature*except pets*, DynamicObject, Corpse*Bones*) AllGridObjectTypes; This means that if we only search grid then we cannot possibly return pets or players so this is safe */ - TypeContainerVisitor, GridTypeMapContainer > grid_unit_searcher(searcher); + TypeContainerVisitor, GridTypeMapContainer > grid_unit_searcher(searcher); CellLock cell_lock(cell, p); cell_lock->Visit(cell_lock, grid_unit_searcher, *(m_creature->GetMap())); @@ -529,17 +532,17 @@ Unit* ScriptedAI::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff) std::list ScriptedAI::DoFindFriendlyCC(float range) { - CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); + CellPair p(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); std::list pList; - MaNGOS::FriendlyCCedInRange u_check(m_creature, range); - MaNGOS::CreatureListSearcher searcher(pList, u_check); + Trinity::FriendlyCCedInRange u_check(m_creature, range); + Trinity::CreatureListSearcher searcher(pList, u_check); - TypeContainerVisitor, GridTypeMapContainer > grid_creature_searcher(searcher); + TypeContainerVisitor, GridTypeMapContainer > grid_creature_searcher(searcher); CellLock cell_lock(cell, p); cell_lock->Visit(cell_lock, grid_creature_searcher, *(m_creature->GetMap())); @@ -549,17 +552,17 @@ std::list ScriptedAI::DoFindFriendlyCC(float range) std::list ScriptedAI::DoFindFriendlyMissingBuff(float range, uint32 spellid) { - CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); + CellPair p(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); std::list pList; - MaNGOS::FriendlyMissingBuffInRange u_check(m_creature, range, spellid); - MaNGOS::CreatureListSearcher searcher(pList, u_check); + Trinity::FriendlyMissingBuffInRange u_check(m_creature, range, spellid); + Trinity::CreatureListSearcher searcher(pList, u_check); - TypeContainerVisitor, GridTypeMapContainer > grid_creature_searcher(searcher); + TypeContainerVisitor, GridTypeMapContainer > grid_creature_searcher(searcher); CellLock cell_lock(cell, p); cell_lock->Visit(cell_lock, grid_creature_searcher, *(m_creature->GetMap())); diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h index 949689bffc7..802c118c1d5 100644 --- a/src/bindings/scripts/include/sc_creature.h +++ b/src/bindings/scripts/include/sc_creature.h @@ -1,4 +1,7 @@ -/* Copyright (C) 2006 - 2008 ScriptDev2 +/* Copyright (C) 2008 Trinity + * + * Thanks to the original authors: ScriptDev2 + * * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ @@ -8,7 +11,7 @@ #include "CreatureAI.h" #include "Creature.h" -struct MANGOS_DLL_DECL ScriptedAI : public CreatureAI +struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI { ScriptedAI(Creature* creature) : m_creature(creature), InCombat(false) {} ~ScriptedAI() {} @@ -26,7 +29,7 @@ struct MANGOS_DLL_DECL ScriptedAI : public CreatureAI //Called at stoping attack by any attacker void EnterEvadeMode(); - //Called at any heal cast/item used (call non implemented in mangos) + //Called at any heal cast/item used (call non implemented in Trinity) void HealBy(Unit *healer, uint32 amount_healed) {} // Called at any Damage to any victim (before damage apply) @@ -153,7 +156,7 @@ struct MANGOS_DLL_DECL ScriptedAI : public CreatureAI bool CanCast(Unit* Target, SpellEntry const *Spell, bool Triggered = false); }; -struct MANGOS_DLL_DECL Scripted_NoMovementAI : public ScriptedAI +struct TRINITY_DLL_DECL Scripted_NoMovementAI : public ScriptedAI { Scripted_NoMovementAI(Creature* creature) : ScriptedAI(creature) {} diff --git a/src/bindings/scripts/include/sc_gossip.h b/src/bindings/scripts/include/sc_gossip.h index 9857661ae9a..ec4ba0ae3f9 100644 --- a/src/bindings/scripts/include/sc_gossip.h +++ b/src/bindings/scripts/include/sc_gossip.h @@ -1,4 +1,7 @@ -/* Copyright (C) 2006 - 2008 ScriptDev2 +/* Copyright (C) 2008 Trinity + * + * Thanks to the original authors: ScriptDev2 + * * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ diff --git a/src/bindings/scripts/include/sc_instance.h b/src/bindings/scripts/include/sc_instance.h index f16590f2a83..8de13c10f72 100644 --- a/src/bindings/scripts/include/sc_instance.h +++ b/src/bindings/scripts/include/sc_instance.h @@ -22,7 +22,7 @@ enum EncounterState #define OUT_LOAD_INST_DATA_COMPLETE debug_log("SD2: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.",instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) #define OUT_LOAD_INST_DATA_FAIL error_log("SD2: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).",instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) -class MANGOS_DLL_DECL ScriptedInstance : public InstanceData +class TRINITY_DLL_DECL ScriptedInstance : public InstanceData { public: -- cgit v1.2.3