Show
Ignore:
Timestamp:
11/19/08 13:27:40 (17 years ago)
Author:
yumileroy
Message:

[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.

Original author: Seline
Date: 2008-10-14 11:57:03-05:00

Location:
trunk/src/bindings/scripts
Files:
10 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/bindings/scripts/Makefile.am

    r43 r44  
    55# This program is free software; you can redistribute it and/or modify 
    66# it under the terms of the GNU General Public License as published by 
    7 # the Free Software Foundation; either version 3 of the License, or 
     7# the Free Software Foundation; either version 2 of the License, or 
    88# (at your option) any later version. 
    99# 
    … …  
    416416 
    417417 
     418 

  • trunk/src/bindings/scripts/ScriptMgr.cpp

    r41 r44  
    634634    // Load Script Text  
    635635    outstring_log("TSCR: Loading Script Texts..."); 
    636     LoadMangosStrings(TScriptDB,"script_texts",TEXT_SOURCE_RANGE,(TEXT_SOURCE_RANGE*2)+1); 
     636    LoadTrinityStrings(TScriptDB,"script_texts",TEXT_SOURCE_RANGE,(TEXT_SOURCE_RANGE*2)+1); 
    637637 
    638638    // Gather Additional data from Script Texts 
    … …  
    698698    // Load Custom Text  
    699699    outstring_log("TSCR: Loading Custom Texts..."); 
    700     LoadMangosStrings(TScriptDB,"custom_texts",TEXT_SOURCE_RANGE*2,(TEXT_SOURCE_RANGE*3)+1); 
     700    LoadTrinityStrings(TScriptDB,"custom_texts",TEXT_SOURCE_RANGE*2,(TEXT_SOURCE_RANGE*3)+1); 
    701701 
    702702    // Gather Additional data from Custom Texts 
    … …  
    11751175}extern *SpellSummary; 
    11761176 
    1177 MANGOS_DLL_EXPORT 
     1177TRINITY_DLL_EXPORT 
    11781178void ScriptsFree() 
    11791179{    
    … …  
    11881188} 
    11891189 
    1190 MANGOS_DLL_EXPORT 
     1190TRINITY_DLL_EXPORT 
    11911191void ScriptsInit() 
    11921192{ 
    … …  
    19321932//*** Functions to be Exported *** 
    19331933 
    1934 MANGOS_DLL_EXPORT 
     1934TRINITY_DLL_EXPORT 
    19351935bool GossipHello ( Player * player, Creature *_Creature ) 
    19361936{ 
    … …  
    19421942} 
    19431943 
    1944 MANGOS_DLL_EXPORT 
     1944TRINITY_DLL_EXPORT 
    19451945bool GossipSelect( Player *player, Creature *_Creature, uint32 sender, uint32 action ) 
    19461946{ 
    … …  
    19541954} 
    19551955 
    1956 MANGOS_DLL_EXPORT 
     1956TRINITY_DLL_EXPORT 
    19571957bool GossipSelectWithCode( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode ) 
    19581958{ 
    … …  
    19661966} 
    19671967 
    1968 MANGOS_DLL_EXPORT 
     1968TRINITY_DLL_EXPORT 
    19691969bool QuestAccept( Player *player, Creature *_Creature, Quest const *_Quest ) 
    19701970{ 
    … …  
    19761976} 
    19771977 
    1978 MANGOS_DLL_EXPORT 
     1978TRINITY_DLL_EXPORT 
    19791979bool QuestSelect( Player *player, Creature *_Creature, Quest const *_Quest ) 
    19801980{ 
    … …  
    19861986} 
    19871987 
    1988 MANGOS_DLL_EXPORT 
     1988TRINITY_DLL_EXPORT 
    19891989bool QuestComplete( Player *player, Creature *_Creature, Quest const *_Quest ) 
    19901990{ 
    … …  
    19961996} 
    19971997 
    1998 MANGOS_DLL_EXPORT 
     1998TRINITY_DLL_EXPORT 
    19991999bool ChooseReward( Player *player, Creature *_Creature, Quest const *_Quest, uint32 opt ) 
    20002000{ 
    … …  
    20062006} 
    20072007 
    2008 MANGOS_DLL_EXPORT 
     2008TRINITY_DLL_EXPORT 
    20092009uint32 NPCDialogStatus( Player *player, Creature *_Creature ) 
    20102010{ 
    … …  
    20162016} 
    20172017 
    2018 MANGOS_DLL_EXPORT 
     2018TRINITY_DLL_EXPORT 
    20192019uint32 GODialogStatus( Player *player, GameObject *_GO ) 
    20202020{ 
    … …  
    20262026} 
    20272027 
    2028 MANGOS_DLL_EXPORT 
     2028TRINITY_DLL_EXPORT 
    20292029bool ItemHello( Player *player, Item *_Item, Quest const *_Quest ) 
    20302030{ 
    … …  
    20362036} 
    20372037 
    2038 MANGOS_DLL_EXPORT 
     2038TRINITY_DLL_EXPORT 
    20392039bool ItemQuestAccept( Player *player, Item *_Item, Quest const *_Quest ) 
    20402040{ 
    … …  
    20462046} 
    20472047 
    2048 MANGOS_DLL_EXPORT 
     2048TRINITY_DLL_EXPORT 
    20492049bool GOHello( Player *player, GameObject *_GO ) 
    20502050{ 
    … …  
    20562056} 
    20572057 
    2058 MANGOS_DLL_EXPORT 
     2058TRINITY_DLL_EXPORT 
    20592059bool GOQuestAccept( Player *player, GameObject *_GO, Quest const *_Quest ) 
    20602060{ 
    … …  
    20662066} 
    20672067 
    2068 MANGOS_DLL_EXPORT 
     2068TRINITY_DLL_EXPORT 
    20692069bool GOChooseReward( Player *player, GameObject *_GO, Quest const *_Quest, uint32 opt ) 
    20702070{ 
    … …  
    20762076} 
    20772077 
    2078 MANGOS_DLL_EXPORT 
     2078TRINITY_DLL_EXPORT 
    20792079bool AreaTrigger( Player *player, AreaTriggerEntry * atEntry) 
    20802080{ 
    … …  
    20872087} 
    20882088 
    2089 MANGOS_DLL_EXPORT 
     2089TRINITY_DLL_EXPORT 
    20902090CreatureAI* GetAI(Creature *_Creature) 
    20912091{ 
    … …  
    20962096} 
    20972097 
    2098 MANGOS_DLL_EXPORT 
     2098TRINITY_DLL_EXPORT 
    20992099bool ItemUse( Player *player, Item* _Item, SpellCastTargets const& targets) 
    21002100{ 
    … …  
    21052105} 
    21062106 
    2107 MANGOS_DLL_EXPORT 
     2107TRINITY_DLL_EXPORT 
    21082108bool ReceiveEmote( Player *player, Creature *_Creature, uint32 emote ) 
    21092109{ 
    … …  
    21142114} 
    21152115 
    2116 MANGOS_DLL_EXPORT 
     2116TRINITY_DLL_EXPORT 
    21172117InstanceData* CreateInstanceData(Map *map) 
    21182118{ 

  • trunk/src/bindings/scripts/ScriptMgr.h

    r37 r44  
    1 /* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> 
     1/* Copyright (C) 2008 Trinity <http://www.trinitycore.org/> 
     2 * 
     3 * Thanks to the original authors: ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> 
     4 * 
    25 * This program is free software licensed under GPL version 2 
    36 * Please see the included DOCS/LICENSE.TXT for more information */ 
    … …  
    7982 
    8083#ifdef WIN32 
    81   #define MANGOS_DLL_EXPORT extern "C" __declspec(dllexport) 
     84  #define TRINITY_DLL_EXPORT extern "C" __declspec(dllexport) 
    8285#elif defined( __GNUC__ ) 
    83   #define MANGOS_DLL_EXPORT extern "C" 
     86  #define TRINITY_DLL_EXPORT extern "C" 
    8487#else 
    85   #define MANGOS_DLL_EXPORT extern "C" export 
     88  #define TRINITY_DLL_EXPORT extern "C" export 
    8689#endif 
    8790 

  • trunk/src/bindings/scripts/include/sc_creature.cpp

    r37 r44  
    1 /* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> 
     1/* Copyright (C) 2008 Trinity <http://www.trinitycore.org/> 
     2 * 
     3 * Thanks to the original authors: ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> 
     4 * 
    25 * This program is free software licensed under GPL version 2 
    36 * Please see the included DOCS/LICENSE.TXT for more information */ 
    … …  
    507510Unit* ScriptedAI::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff) 
    508511{ 
    509     CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); 
     512    CellPair p(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); 
    510513    Cell cell(p); 
    511514    cell.data.Part.reserved = ALL_DISTRICT; 
    … …  
    514517    Unit* pUnit = NULL; 
    515518 
    516     MaNGOS::MostHPMissingInRange u_check(m_creature, range, MinHPDiff); 
    517     MaNGOS::UnitLastSearcher<MaNGOS::MostHPMissingInRange> searcher(pUnit, u_check); 
     519    Trinity::MostHPMissingInRange u_check(m_creature, range, MinHPDiff); 
     520    Trinity::UnitLastSearcher<Trinity::MostHPMissingInRange> searcher(pUnit, u_check); 
    518521 
    519522    /* 
    … …  
    521524    This means that if we only search grid then we cannot possibly return pets or players so this is safe 
    522525    */ 
    523     TypeContainerVisitor<MaNGOS::UnitLastSearcher<MaNGOS::MostHPMissingInRange>, GridTypeMapContainer >  grid_unit_searcher(searcher); 
     526    TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::MostHPMissingInRange>, GridTypeMapContainer >  grid_unit_searcher(searcher); 
    524527 
    525528    CellLock<GridReadGuard> cell_lock(cell, p); 
    … …  
    530533std::list<Creature*> ScriptedAI::DoFindFriendlyCC(float range) 
    531534{ 
    532     CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); 
     535    CellPair p(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); 
    533536    Cell cell(p); 
    534537    cell.data.Part.reserved = ALL_DISTRICT; 
    … …  
    537540    std::list<Creature*> pList; 
    538541 
    539     MaNGOS::FriendlyCCedInRange u_check(m_creature, range); 
    540     MaNGOS::CreatureListSearcher<MaNGOS::FriendlyCCedInRange> searcher(pList, u_check); 
    541  
    542     TypeContainerVisitor<MaNGOS::CreatureListSearcher<MaNGOS::FriendlyCCedInRange>, GridTypeMapContainer >  grid_creature_searcher(searcher); 
     542    Trinity::FriendlyCCedInRange u_check(m_creature, range); 
     543    Trinity::CreatureListSearcher<Trinity::FriendlyCCedInRange> searcher(pList, u_check); 
     544 
     545    TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::FriendlyCCedInRange>, GridTypeMapContainer >  grid_creature_searcher(searcher); 
    543546 
    544547    CellLock<GridReadGuard> cell_lock(cell, p); 
    … …  
    550553std::list<Creature*> ScriptedAI::DoFindFriendlyMissingBuff(float range, uint32 spellid) 
    551554{ 
    552     CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); 
     555    CellPair p(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); 
    553556    Cell cell(p); 
    554557    cell.data.Part.reserved = ALL_DISTRICT; 
    … …  
    557560    std::list<Creature*> pList; 
    558561 
    559     MaNGOS::FriendlyMissingBuffInRange u_check(m_creature, range, spellid); 
    560     MaNGOS::CreatureListSearcher<MaNGOS::FriendlyMissingBuffInRange> searcher(pList, u_check); 
    561  
    562     TypeContainerVisitor<MaNGOS::CreatureListSearcher<MaNGOS::FriendlyMissingBuffInRange>, GridTypeMapContainer >  grid_creature_searcher(searcher); 
     562    Trinity::FriendlyMissingBuffInRange u_check(m_creature, range, spellid); 
     563    Trinity::CreatureListSearcher<Trinity::FriendlyMissingBuffInRange> searcher(pList, u_check); 
     564 
     565    TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::FriendlyMissingBuffInRange>, GridTypeMapContainer >  grid_creature_searcher(searcher); 
    563566 
    564567    CellLock<GridReadGuard> cell_lock(cell, p); 

  • trunk/src/bindings/scripts/include/sc_creature.h

    r14 r44  
    1 /* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> 
     1/* Copyright (C) 2008 Trinity <http://www.trinitycore.org/> 
     2 * 
     3 * Thanks to the original authors: ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> 
     4 * 
    25 * This program is free software licensed under GPL version 2 
    36 * Please see the included DOCS/LICENSE.TXT for more information */ 
    … …  
    912#include "Creature.h" 
    1013 
    11 struct MANGOS_DLL_DECL ScriptedAI : public CreatureAI 
     14struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI 
    1215{ 
    1316    ScriptedAI(Creature* creature) : m_creature(creature), InCombat(false) {} 
    … …  
    2730    void EnterEvadeMode(); 
    2831 
    29     //Called at any heal cast/item used (call non implemented in mangos) 
     32    //Called at any heal cast/item used (call non implemented in Trinity) 
    3033    void HealBy(Unit *healer, uint32 amount_healed) {} 
    3134 
    … …  
    154157}; 
    155158 
    156 struct MANGOS_DLL_DECL Scripted_NoMovementAI : public ScriptedAI 
     159struct TRINITY_DLL_DECL Scripted_NoMovementAI : public ScriptedAI 
    157160{ 
    158161    Scripted_NoMovementAI(Creature* creature) : ScriptedAI(creature) {} 

  • trunk/src/bindings/scripts/include/sc_gossip.h

    r37 r44  
    1 /* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> 
     1/* Copyright (C) 2008 Trinity <http://www.trinitycore.org/> 
     2 * 
     3 * Thanks to the original authors: ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> 
     4 * 
    25 * This program is free software licensed under GPL version 2 
    36 * Please see the included DOCS/LICENSE.TXT for more information */ 

  • trunk/src/bindings/scripts/include/sc_instance.h

    r2 r44  
    2323#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()) 
    2424 
    25 class MANGOS_DLL_DECL ScriptedInstance : public InstanceData 
     25class TRINITY_DLL_DECL ScriptedInstance : public InstanceData 
    2626{ 
    2727    public: 

  • trunk/src/bindings/scripts/sql/Makefile.am

    r23 r44  
    55# This program is free software; you can redistribute it and/or modify 
    66# it under the terms of the GNU General Public License as published by 
    7 # the Free Software Foundation; either version 3 of the License, or 
     7# the Free Software Foundation; either version 2 of the License, or 
    88# (at your option) any later version. 
    99# 

  • trunk/src/bindings/scripts/sql/Makefile.in

    r24 r44  
    2121# This program is free software; you can redistribute it and/or modify 
    2222# it under the terms of the GNU General Public License as published by 
    23 # the Free Software Foundation; either version 3 of the License, or 
     23# the Free Software Foundation; either version 2 of the License, or 
    2424# (at your option) any later version. 
    2525# 

  • trunk/src/bindings/scripts/system.cpp

    r2 r44  
    11/*  
    2  * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> 
     2 * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> 
     3 * 
     4 * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> 
    35 * 
    46 * This program is free software; you can redistribute it and/or modify 
    … …  
    911 * This program is distributed in the hope that it will be useful, 
    1012 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
    1214 * GNU General Public License for more details. 
    1315 * 
    1416 * You should have received a copy of the GNU General Public License 
    1517 * along with this program; if not, write to the Free Software 
    16  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    1719 */ 
    1820