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

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • 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{