Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

[svn] * Merge Temp dev SVN with Assembla.

Browse Source 
* 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
This commit is contained in:
Seline
2008-10-14 11:57:03 -05:00
parent 222cbfd464
commit 2265aef916
463 changed files with 10750 additions and 7723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/bindings/scripts/ScriptMgr.cpp
View File

@@ -633,7 +633,7 @@ void LoadDatabase()
// Load Script Text
outstring_log("TSCR: Loading Script Texts...");
LoadMangosStrings(TScriptDB,"script_texts",TEXT_SOURCE_RANGE,(TEXT_SOURCE_RANGE*2)+1);
LoadTrinityStrings(TScriptDB,"script_texts",TEXT_SOURCE_RANGE,(TEXT_SOURCE_RANGE*2)+1);
// Gather Additional data from Script Texts
result = TScriptDB.PQuery("SELECT entry, sound, type, language FROM script_texts");
@@ -697,7 +697,7 @@ void LoadDatabase()
// Load Custom Text
outstring_log("TSCR: Loading Custom Texts...");
LoadMangosStrings(TScriptDB,"custom_texts",TEXT_SOURCE_RANGE*2,(TEXT_SOURCE_RANGE*3)+1);
LoadTrinityStrings(TScriptDB,"custom_texts",TEXT_SOURCE_RANGE*2,(TEXT_SOURCE_RANGE*3)+1);
// Gather Additional data from Custom Texts
result = TScriptDB.PQuery("SELECT entry, sound, type, language FROM custom_texts");
@@ -1174,7 +1174,7 @@ struct TSpellSummary {
uint8 Effects; // set of enum SelectEffect
}extern *SpellSummary;
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
void ScriptsFree()
{
// Free Spell Summary
@@ -1187,7 +1187,7 @@ void ScriptsFree()
nrscripts = 0;
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
void ScriptsInit()
{
bool CanLoadDB = true;
@@ -1931,7 +1931,7 @@ Script* GetScriptByName(std::string Name)
//********************************
//*** Functions to be Exported ***
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool GossipHello ( Player * player, Creature *_Creature )
{
Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
@@ -1941,7 +1941,7 @@ bool GossipHello ( Player * player, Creature *_Creature )
return tmpscript->pGossipHello(player,_Creature);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool GossipSelect( Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action);
@@ -1953,7 +1953,7 @@ bool GossipSelect( Player *player, Creature *_Creature, uint32 sender, uint32 ac
return tmpscript->pGossipSelect(player,_Creature,sender,action);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool GossipSelectWithCode( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode )
{
debug_log("TSCR: Gossip selection with code, sender: %d, action: %d",sender, action);
@@ -1965,7 +1965,7 @@ bool GossipSelectWithCode( Player *player, Creature *_Creature, uint32 sender, u
return tmpscript->pGossipSelectWithCode(player,_Creature,sender,action,sCode);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool QuestAccept( Player *player, Creature *_Creature, Quest const *_Quest )
{
Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
@@ -1975,7 +1975,7 @@ bool QuestAccept( Player *player, Creature *_Creature, Quest const *_Quest )
return tmpscript->pQuestAccept(player,_Creature,_Quest);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool QuestSelect( Player *player, Creature *_Creature, Quest const *_Quest )
{
Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
@@ -1985,7 +1985,7 @@ bool QuestSelect( Player *player, Creature *_Creature, Quest const *_Quest )
return tmpscript->pQuestSelect(player,_Creature,_Quest);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool QuestComplete( Player *player, Creature *_Creature, Quest const *_Quest )
{
Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
@@ -1995,7 +1995,7 @@ bool QuestComplete( Player *player, Creature *_Creature, Quest const *_Quest )
return tmpscript->pQuestComplete(player,_Creature,_Quest);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool ChooseReward( Player *player, Creature *_Creature, Quest const *_Quest, uint32 opt )
{
Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
@@ -2005,7 +2005,7 @@ bool ChooseReward( Player *player, Creature *_Creature, Quest const *_Quest, uin
return tmpscript->pChooseReward(player,_Creature,_Quest,opt);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
uint32 NPCDialogStatus( Player *player, Creature *_Creature )
{
Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
@@ -2015,7 +2015,7 @@ uint32 NPCDialogStatus( Player *player, Creature *_Creature )
return tmpscript->pNPCDialogStatus(player,_Creature);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
uint32 GODialogStatus( Player *player, GameObject *_GO )
{
Script *tmpscript = GetScriptByName(_GO->GetGOInfo()->ScriptName);
@@ -2025,7 +2025,7 @@ uint32 GODialogStatus( Player *player, GameObject *_GO )
return tmpscript->pGODialogStatus(player,_GO);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool ItemHello( Player *player, Item *_Item, Quest const *_Quest )
{
Script *tmpscript = GetScriptByName(_Item->GetProto()->ScriptName);
@@ -2035,7 +2035,7 @@ bool ItemHello( Player *player, Item *_Item, Quest const *_Quest )
return tmpscript->pItemHello(player,_Item,_Quest);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool ItemQuestAccept( Player *player, Item *_Item, Quest const *_Quest )
{
Script *tmpscript = GetScriptByName(_Item->GetProto()->ScriptName);
@@ -2045,7 +2045,7 @@ bool ItemQuestAccept( Player *player, Item *_Item, Quest const *_Quest )
return tmpscript->pItemQuestAccept(player,_Item,_Quest);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool GOHello( Player *player, GameObject *_GO )
{
Script *tmpscript = GetScriptByName(_GO->GetGOInfo()->ScriptName);
@@ -2055,7 +2055,7 @@ bool GOHello( Player *player, GameObject *_GO )
return tmpscript->pGOHello(player,_GO);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool GOQuestAccept( Player *player, GameObject *_GO, Quest const *_Quest )
{
Script *tmpscript = GetScriptByName(_GO->GetGOInfo()->ScriptName);
@@ -2065,7 +2065,7 @@ bool GOQuestAccept( Player *player, GameObject *_GO, Quest const *_Quest )
return tmpscript->pGOQuestAccept(player,_GO,_Quest);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool GOChooseReward( Player *player, GameObject *_GO, Quest const *_Quest, uint32 opt )
{
Script *tmpscript = GetScriptByName(_GO->GetGOInfo()->ScriptName);
@@ -2075,7 +2075,7 @@ bool GOChooseReward( Player *player, GameObject *_GO, Quest const *_Quest, uint3
return tmpscript->pGOChooseReward(player,_GO,_Quest,opt);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool AreaTrigger( Player *player, AreaTriggerEntry * atEntry)
{
Script *tmpscript = NULL;
@@ -2086,7 +2086,7 @@ bool AreaTrigger( Player *player, AreaTriggerEntry * atEntry)
return tmpscript->pAreaTrigger(player, atEntry);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
CreatureAI* GetAI(Creature *_Creature)
{
Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
@@ -2095,7 +2095,7 @@ CreatureAI* GetAI(Creature *_Creature)
return tmpscript->GetAI(_Creature);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool ItemUse( Player *player, Item* _Item, SpellCastTargets const& targets)
{
Script *tmpscript = GetScriptByName(_Item->GetProto()->ScriptName);
@@ -2104,7 +2104,7 @@ bool ItemUse( Player *player, Item* _Item, SpellCastTargets const& targets)
return tmpscript->pItemUse(player,_Item,targets);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
bool ReceiveEmote( Player *player, Creature *_Creature, uint32 emote )
{
Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
@@ -2113,7 +2113,7 @@ bool ReceiveEmote( Player *player, Creature *_Creature, uint32 emote )
return tmpscript->pReceiveEmote(player, _Creature, emote);
}
MANGOS_DLL_EXPORT
TRINITY_DLL_EXPORT
InstanceData* CreateInstanceData(Map *map)
{
Script *tmpscript = NULL;