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/interface
Files:
8 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/bindings/interface/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# 
    … …  
    5353        Readme.txt 
    5454 
     55 

  • trunk/src/bindings/interface/ScriptMgr.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 
    … …  
    3537// ------------------- 
    3638 
    37 MANGOS_DLL_EXPORT 
     39TRINITY_DLL_EXPORT 
    3840void ScriptsFree() 
    3941{                                                           // Free resources before library unload 
    … …  
    4850} 
    4951 
    50 MANGOS_DLL_EXPORT 
     52TRINITY_DLL_EXPORT 
    5153void ScriptsInit() 
    5254{ 
    … …  
    7779} 
    7880 
    79 MANGOS_DLL_EXPORT 
     81TRINITY_DLL_EXPORT 
    8082bool GossipHello ( Player * player, Creature *_Creature ) 
    8183{ 
    … …  
    8789} 
    8890 
    89 MANGOS_DLL_EXPORT 
     91TRINITY_DLL_EXPORT 
    9092bool GossipSelect( Player *player, Creature *_Creature,uint32 sender, uint32 action ) 
    9193{ 
    … …  
    99101} 
    100102 
    101 MANGOS_DLL_EXPORT 
     103TRINITY_DLL_EXPORT 
    102104bool GossipSelectWithCode( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode ) 
    103105{ 
    … …  
    111113} 
    112114 
    113 MANGOS_DLL_EXPORT 
     115TRINITY_DLL_EXPORT 
    114116bool QuestAccept( Player *player, Creature *_Creature, Quest *_Quest ) 
    115117{ 
    … …  
    121123} 
    122124 
    123 MANGOS_DLL_EXPORT 
     125TRINITY_DLL_EXPORT 
    124126bool QuestSelect( Player *player, Creature *_Creature, Quest *_Quest ) 
    125127{ 
    … …  
    131133} 
    132134 
    133 MANGOS_DLL_EXPORT 
     135TRINITY_DLL_EXPORT 
    134136bool QuestComplete( Player *player, Creature *_Creature, Quest *_Quest ) 
    135137{ 
    … …  
    141143} 
    142144 
    143 MANGOS_DLL_EXPORT 
     145TRINITY_DLL_EXPORT 
    144146bool ChooseReward( Player *player, Creature *_Creature, Quest *_Quest, uint32 opt ) 
    145147{ 
    … …  
    151153} 
    152154 
    153 MANGOS_DLL_EXPORT 
     155TRINITY_DLL_EXPORT 
    154156uint32 NPCDialogStatus( Player *player, Creature *_Creature ) 
    155157{ 
    … …  
    161163} 
    162164 
    163 MANGOS_DLL_EXPORT 
     165TRINITY_DLL_EXPORT 
    164166uint32 GODialogStatus( Player *player, GameObject *_GO ) 
    165167{ 
    … …  
    173175} 
    174176 
    175 MANGOS_DLL_EXPORT 
     177TRINITY_DLL_EXPORT 
    176178bool ItemHello( Player *player, Item *_Item, Quest *_Quest ) 
    177179{ 
    … …  
    185187} 
    186188 
    187 MANGOS_DLL_EXPORT 
     189TRINITY_DLL_EXPORT 
    188190bool ItemQuestAccept( Player *player, Item *_Item, Quest *_Quest ) 
    189191{ 
    … …  
    197199} 
    198200 
    199 MANGOS_DLL_EXPORT 
     201TRINITY_DLL_EXPORT 
    200202bool GOHello( Player *player, GameObject *_GO ) 
    201203{ 
    … …  
    209211} 
    210212 
    211 MANGOS_DLL_EXPORT 
     213TRINITY_DLL_EXPORT 
    212214bool GOQuestAccept( Player *player, GameObject *_GO, Quest *_Quest ) 
    213215{ 
    … …  
    221223} 
    222224 
    223 MANGOS_DLL_EXPORT 
     225TRINITY_DLL_EXPORT 
    224226bool GOChooseReward( Player *player, GameObject *_GO, Quest *_Quest, uint32 opt ) 
    225227{ 
    … …  
    233235} 
    234236 
    235 MANGOS_DLL_EXPORT 
     237TRINITY_DLL_EXPORT 
    236238bool AreaTrigger      ( Player *player, AreaTriggerEntry* atEntry ) 
    237239{ 
    … …  
    244246} 
    245247 
    246 MANGOS_DLL_EXPORT 
     248TRINITY_DLL_EXPORT 
    247249bool ReceiveEmote ( Player *player, Creature *_Creature, uint32 emote ) 
    248250{ 
    … …  
    253255} 
    254256 
    255 MANGOS_DLL_EXPORT 
     257TRINITY_DLL_EXPORT 
    256258bool ItemUse( Player *player, Item* _Item, SpellCastTargets const& targets) 
    257259{ 
    … …  
    264266} 
    265267 
    266 MANGOS_DLL_EXPORT 
     268TRINITY_DLL_EXPORT 
    267269CreatureAI* GetAI(Creature *_Creature ) 
    268270{ 
    … …  
    273275} 
    274276 
    275 MANGOS_DLL_EXPORT 
     277TRINITY_DLL_EXPORT 
    276278InstanceData* CreateInstanceData(Map *map) 
    277279{ 

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

    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 
    … …  
    8789#define VISIBLE_RANGE (50.0f) 
    8890 
    89 struct MANGOS_DLL_DECL ScriptedAI : public CreatureAI 
     91struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI 
    9092{ 
    9193    ScriptedAI(Creature* creature) : m_creature(creature) {} 

  • trunk/src/bindings/interface/Scripts/sc_default.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 

  • trunk/src/bindings/interface/Scripts/sc_defines.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 

  • trunk/src/bindings/interface/Scripts/sc_defines.h

    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 

  • trunk/src/bindings/interface/config.h

    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 
    … …  
    2426#ifdef WIN32 
    2527//#include <windows.h> 
    26 #define MANGOS_DLL_EXPORT extern "C" __declspec(dllexport) 
     28#define TRINITY_DLL_EXPORT extern "C" __declspec(dllexport) 
    2729#elif defined( __GNUC__ ) 
    28 #define MANGOS_DLL_EXPORT extern "C" 
     30#define TRINITY_DLL_EXPORT extern "C" 
    2931#else 
    30 #define MANGOS_DLL_EXPORT extern "C" export 
     32#define TRINITY_DLL_EXPORT extern "C" export 
    3133#endif 

  • trunk/src/bindings/interface/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