diff options
Diffstat (limited to 'src/game')
113 files changed, 238 insertions, 549 deletions
diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h index 11473653fe7..fca2ec01c89 100644 --- a/src/game/AchievementMgr.h +++ b/src/game/AchievementMgr.h @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __MANGOS_ACHIEVEMENTMGR_H -#define __MANGOS_ACHIEVEMENTMGR_H +#ifndef __TRINITY_ACHIEVEMENTMGR_H +#define __TRINITY_ACHIEVEMENTMGR_H #include <map> #include <string> diff --git a/src/game/BattleGroundAV.h b/src/game/BattleGroundAV.h index efb9e97aa46..cb0201fc677 100644 --- a/src/game/BattleGroundAV.h +++ b/src/game/BattleGroundAV.h @@ -1548,7 +1548,7 @@ class BattleGroundAV : public BattleGround /*general */ Creature* AddAVCreature(uint16 cinfoid, uint16 type); - const uint16 GetBonusHonor(uint8 kills); //TODO remove this when mangos handles this right + const uint16 GetBonusHonor(uint8 kills); //TODO remove this when the core handles this right /*variables */ int32 m_Team_Scores[2]; diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 9ca6d410ce8..f39f36df3d6 100644 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -225,8 +225,6 @@ SET(game_STAT_SRCS ReactorAI.h ReputationMgr.cpp ReputationMgr.h - ScriptCalls.cpp - ScriptCalls.h ScriptedSmartAI.cpp ScriptedSmartAI.h ScriptLoader.cpp diff --git a/src/game/Calendar.h b/src/game/Calendar.h index 7a86afa7db7..2d35a6c23c7 100644 --- a/src/game/Calendar.h +++ b/src/game/Calendar.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOS_CALENDAR_H -#define MANGOS_CALENDAR_H +#ifndef TRINITY_CALENDAR_H +#define TRINITY_CALENDAR_H class Calendar { diff --git a/src/game/Cell.h b/src/game/Cell.h index a558b754b83..78b12f1bf35 100644 --- a/src/game/Cell.h +++ b/src/game/Cell.h @@ -45,7 +45,7 @@ enum District ALL_DISTRICT = (UPPER_DISTRICT | LOWER_DISTRICT | LEFT_DISTRICT | RIGHT_DISTRICT | CENTER_DISTRICT) }; -struct TRINITY_DLL_DECL CellArea +struct CellArea { CellArea() : right_offset(0), left_offset(0), upper_offset(0), lower_offset(0) {} CellArea(int right, int left, int upper, int lower) : right_offset(right), left_offset(left), upper_offset(upper), lower_offset(lower) {} @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL CellArea int lower_offset; }; -struct TRINITY_DLL_DECL Cell +struct Cell { Cell() { data.All = 0; } Cell(const Cell &cell) { data.All = cell.data.All; } diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h index a79d3dc5b57..6f3b7c415ae 100644 --- a/src/game/ChannelMgr.h +++ b/src/game/ChannelMgr.h @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOSSERVER_CHANNELMGR_H -#define MANGOSSERVER_CHANNELMGR_H +#ifndef __TRINITY_CHANNELMGR_H +#define __TRINITY_CHANNELMGR_H #include "Common.h" #include "Channel.h" diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp index 1262550f808..bc2b4d97a4e 100644 --- a/src/game/CharacterHandler.cpp +++ b/src/game/CharacterHandler.cpp @@ -42,7 +42,6 @@ #include "SocialMgr.h" #include "UpdateMask.h" #include "Util.h" -#include "ScriptCalls.h" #include "SpellId.h" #include "ScriptMgr.h" diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 4d68048b8b8..3c595d49124 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -35,7 +35,6 @@ #include "Player.h" #include "UpdateMask.h" #include "SpellMgr.h" -#include "ScriptCalls.h" // Supported shift-links (client generated and server side) // |color|Hachievement:achievement_id:player_guid:0:0:0:0:0:0:0:0|h[name]|h|r @@ -1185,7 +1184,7 @@ valid examples: } else if (reader.get() != '|') { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage sequence aborted unexpectedly"); #endif return false; @@ -1194,7 +1193,7 @@ valid examples: // pipe has always to be followed by at least one char if (reader.peek() == '\0') { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage pipe followed by \\0"); #endif return false; @@ -1219,7 +1218,7 @@ valid examples: } else { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage invalid sequence, expected %c but got %c", *validSequenceIterator, commandChar); #endif return false; @@ -1228,7 +1227,7 @@ valid examples: else if (validSequence != validSequenceIterator) { // no escaped pipes in sequences -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage got escaped pipe in sequence"); #endif return false; @@ -1245,7 +1244,7 @@ valid examples: reader >> c; if (!c) { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage got \\0 while reading color in |c command"); #endif return false; @@ -1263,7 +1262,7 @@ valid examples: color |= 10+c-'a'; continue; } -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage got non hex char '%c' while reading color", c); #endif return false; @@ -1281,7 +1280,7 @@ valid examples: linkedItem= objmgr.GetItemPrototype(atoi(buffer)); if (!linkedItem) { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage got invalid itemID %u in |item command", atoi(buffer)); #endif return false; @@ -1289,7 +1288,7 @@ valid examples: if (color != ItemQualityColors[linkedItem->Quality]) { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage linked item has color %u, but user claims %u", ItemQualityColors[linkedItem->Quality], color); #endif @@ -1501,7 +1500,7 @@ valid examples: } else { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage user sent unsupported link type '%s'", buffer); #endif return false; @@ -1514,7 +1513,7 @@ valid examples: // links start with '[' if (reader.get() != '[') { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage link caption doesn't start with '['"); #endif return false; @@ -1640,7 +1639,7 @@ valid examples: } if (!foundName) { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage linked item name wasn't found in any localization"); #endif return false; @@ -1672,7 +1671,7 @@ valid examples: // no further payload break; default: -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage got invalid command |%c", commandChar); #endif return false; @@ -1680,7 +1679,7 @@ valid examples: } // check if every opened sequence was also closed properly -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG if (validSequence != validSequenceIterator) sLog.outBasic("ChatHandler::isValidChatMessage EOF in active sequence"); #endif diff --git a/src/game/Chat.h b/src/game/Chat.h index 2fe4e245e6e..1f4b1490c58 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -41,7 +41,7 @@ class ChatCommand ChatCommand * ChildCommands; }; -class TRINITY_DLL_SPEC ChatHandler +class ChatHandler { public: explicit ChatHandler(WorldSession* session) : m_session(session) {} diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp index 4d2636afa02..057e73d3bc9 100644 --- a/src/game/ChatHandler.cpp +++ b/src/game/ChatHandler.cpp @@ -36,7 +36,6 @@ #include "Log.h" #include "Opcodes.h" #include "Player.h" -#include "ScriptCalls.h" #include "SpellAuras.h" #include "SpellAuraEffects.h" #include "Util.h" diff --git a/src/game/CombatAI.h b/src/game/CombatAI.h index 07641f4ad30..6ab92e68f38 100644 --- a/src/game/CombatAI.h +++ b/src/game/CombatAI.h @@ -26,7 +26,7 @@ class Creature; -class TRINITY_DLL_DECL AggressorAI : public CreatureAI +class AggressorAI : public CreatureAI { public: explicit AggressorAI(Creature *c) : CreatureAI(c) {} @@ -37,7 +37,7 @@ class TRINITY_DLL_DECL AggressorAI : public CreatureAI typedef std::vector<uint32> SpellVct; -class TRINITY_DLL_SPEC CombatAI : public CreatureAI +class CombatAI : public CreatureAI { public: explicit CombatAI(Creature *c) : CreatureAI(c) {} @@ -53,7 +53,7 @@ class TRINITY_DLL_SPEC CombatAI : public CreatureAI SpellVct spells; }; -class TRINITY_DLL_SPEC CasterAI : public CombatAI +class CasterAI : public CombatAI { public: explicit CasterAI(Creature *c) : CombatAI(c) { m_attackDist = MELEE_RANGE; } @@ -65,7 +65,7 @@ class TRINITY_DLL_SPEC CasterAI : public CombatAI float m_attackDist; }; -struct TRINITY_DLL_SPEC ArchorAI : public CreatureAI +struct ArchorAI : public CreatureAI { public: explicit ArchorAI(Creature *c); @@ -77,7 +77,7 @@ struct TRINITY_DLL_SPEC ArchorAI : public CreatureAI float m_minRange; }; -struct TRINITY_DLL_SPEC TurretAI : public CreatureAI +struct TurretAI : public CreatureAI { public: explicit TurretAI(Creature *c); @@ -90,7 +90,7 @@ struct TRINITY_DLL_SPEC TurretAI : public CreatureAI float m_minRange; }; -struct TRINITY_DLL_SPEC AOEAI : public CreatureAI +struct AOEAI : public CreatureAI { public: explicit AOEAI(Creature *c); diff --git a/src/game/ConfusedMovementGenerator.h b/src/game/ConfusedMovementGenerator.h index 3b6405e3831..e25bb003f88 100644 --- a/src/game/ConfusedMovementGenerator.h +++ b/src/game/ConfusedMovementGenerator.h @@ -28,7 +28,7 @@ #define MAX_CONF_WAYPOINTS 24 template<class T> -class TRINITY_DLL_SPEC ConfusedMovementGenerator +class ConfusedMovementGenerator : public MovementGeneratorMedium< T, ConfusedMovementGenerator<T> > { public: diff --git a/src/game/Creature.h b/src/game/Creature.h index e7ddd64a7bb..3aa88c1b9db 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -168,7 +168,7 @@ struct CreatureInfo #define MAX_CREATURE_BASE_HP 3 // Defines base stats for creatures (used to calculate HP/mana/armor). -struct TRINITY_DLL_SPEC CreatureBaseStats +struct CreatureBaseStats { uint32 Level; uint8 Class; @@ -407,7 +407,7 @@ typedef std::map<uint32,time_t> CreatureSpellCooldowns; #define MAX_VENDOR_ITEMS 150 // Limitation in 3.x.x item count in SMSG_LIST_INVENTORY -class TRINITY_DLL_SPEC Creature : public Unit, public GridObject<Creature> +class Creature : public Unit, public GridObject<Creature> { public: diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index e86fbfc4e96..e9f01098b03 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -34,7 +34,7 @@ void CreatureAI::OnCharmed(bool apply) } AISpellInfoType * UnitAI::AISpellInfo; -TRINITY_DLL_SPEC AISpellInfoType * GetAISpellInfo(uint32 i) { return &CreatureAI::AISpellInfo[i]; } + AISpellInfoType * GetAISpellInfo(uint32 i) { return &CreatureAI::AISpellInfo[i]; } void CreatureAI::DoZoneInCombat(Creature* creature) { diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h index a0c573c90db..57480107e66 100644 --- a/src/game/CreatureAI.h +++ b/src/game/CreatureAI.h @@ -64,7 +64,7 @@ enum SCEquip EQUIP_UNEQUIP = 0 }; -class TRINITY_DLL_SPEC CreatureAI : public UnitAI +class CreatureAI : public UnitAI { protected: Creature * const me; diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h index a07e8a847d7..3aaf9849591 100644 --- a/src/game/CreatureAIImpl.h +++ b/src/game/CreatureAIImpl.h @@ -476,7 +476,7 @@ struct AISpellInfoType float maxRange; }; -TRINITY_DLL_SPEC AISpellInfoType * GetAISpellInfo(uint32 i); + AISpellInfoType * GetAISpellInfo(uint32 i); inline void CreatureAI::SetGazeOn(Unit *target) { diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp index 0794b9c551d..8dd256eca6a 100644 --- a/src/game/CreatureAISelector.cpp +++ b/src/game/CreatureAISelector.cpp @@ -23,7 +23,6 @@ #include "PassiveAI.h" #include "Policies/SingletonImp.h" #include "MovementGenerator.h" -#include "ScriptCalls.h" #include "Pet.h" #include "TemporarySummon.h" #include "CreatureAIFactory.h" diff --git a/src/game/CreatureEventAI.h b/src/game/CreatureEventAI.h index ede597e8710..61ceb7da21b 100644 --- a/src/game/CreatureEventAI.h +++ b/src/game/CreatureEventAI.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOS_CREATURE_EAI_H -#define MANGOS_CREATURE_EAI_H +#ifndef TRINITY_CREATURE_EAI_H +#define TRINITY_CREATURE_EAI_H #include "Common.h" #include "Creature.h" @@ -580,7 +580,7 @@ struct CreatureEventAIHolder bool UpdateRepeatTimer(Creature* creature, uint32 repeatMin, uint32 repeatMax); }; -class TRINITY_DLL_SPEC CreatureEventAI : public CreatureAI +class CreatureEventAI : public CreatureAI { public: diff --git a/src/game/CreatureEventAIMgr.h b/src/game/CreatureEventAIMgr.h index 847b1daa2ac..ef191b22463 100644 --- a/src/game/CreatureEventAIMgr.h +++ b/src/game/CreatureEventAIMgr.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOS_CREATURE_EAI_MGR_H -#define MANGOS_CREATURE_EAI_MGR_H +#ifndef TRINITY_CREATURE_EAI_MGR_H +#define TRINITY_CREATURE_EAI_MGR_H #include "Common.h" #include "CreatureEventAI.h" diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp index 52595dad292..97985a23363 100644 --- a/src/game/DBCStores.cpp +++ b/src/game/DBCStores.cpp @@ -723,12 +723,12 @@ uint32 const* GetTalentTabPages(uint8 cls) } // script support functions -TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry> const* GetSoundEntriesStore() { return &sSoundEntriesStore; } -TRINITY_DLL_SPEC DBCStorage <SpellEntry> const* GetSpellStore() { return &sSpellStore; } -TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry> const* GetSpellRangeStore() { return &sSpellRangeStore; } -TRINITY_DLL_SPEC DBCStorage <FactionEntry> const* GetFactionStore() { return &sFactionStore; } -TRINITY_DLL_SPEC DBCStorage <ItemEntry> const* GetItemDisplayStore() { return &sItemStore; } -TRINITY_DLL_SPEC DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore() { return &sCreatureDisplayInfoStore; } -TRINITY_DLL_SPEC DBCStorage <EmotesEntry> const* GetEmotesStore() { return &sEmotesStore; } -TRINITY_DLL_SPEC DBCStorage <EmotesTextEntry> const* GetEmotesTextStore() { return &sEmotesTextStore; } -TRINITY_DLL_SPEC DBCStorage <AchievementEntry> const* GetAchievementStore() { return &sAchievementStore; } + DBCStorage <SoundEntriesEntry> const* GetSoundEntriesStore() { return &sSoundEntriesStore; } + DBCStorage <SpellEntry> const* GetSpellStore() { return &sSpellStore; } + DBCStorage <SpellRangeEntry> const* GetSpellRangeStore() { return &sSpellRangeStore; } + DBCStorage <FactionEntry> const* GetFactionStore() { return &sFactionStore; } + DBCStorage <ItemEntry> const* GetItemDisplayStore() { return &sItemStore; } + DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore() { return &sCreatureDisplayInfoStore; } + DBCStorage <EmotesEntry> const* GetEmotesStore() { return &sEmotesStore; } + DBCStorage <EmotesTextEntry> const* GetEmotesTextStore() { return &sEmotesTextStore; } + DBCStorage <AchievementEntry> const* GetAchievementStore() { return &sAchievementStore; } diff --git a/src/game/DBCStores.h b/src/game/DBCStores.h index dbe94d941db..8c1fdbb8f63 100644 --- a/src/game/DBCStores.h +++ b/src/game/DBCStores.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOS_DBCSTORES_H -#define MANGOS_DBCSTORES_H +#ifndef TRINITY_DBCSTORES_H +#define TRINITY_DBCSTORES_H #include "Common.h" #include "Database/DBCStore.h" @@ -155,13 +155,13 @@ extern DBCStorage <WorldSafeLocsEntry> sWorldSafeLocsStore; void LoadDBCStores(const std::string& dataPath); // script support functions -TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry> const* GetSoundEntriesStore(); -TRINITY_DLL_SPEC DBCStorage <SpellEntry> const* GetSpellStore(); -TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry> const* GetSpellRangeStore(); -TRINITY_DLL_SPEC DBCStorage <FactionEntry> const* GetFactionStore(); -TRINITY_DLL_SPEC DBCStorage <ItemEntry> const* GetItemDisplayStore(); -TRINITY_DLL_SPEC DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore(); -TRINITY_DLL_SPEC DBCStorage <EmotesEntry> const* GetEmotesStore(); -TRINITY_DLL_SPEC DBCStorage <EmotesTextEntry> const* GetEmotesTextStore(); -TRINITY_DLL_SPEC DBCStorage <AchievementEntry> const* GetAchievementStore(); + DBCStorage <SoundEntriesEntry> const* GetSoundEntriesStore(); + DBCStorage <SpellEntry> const* GetSpellStore(); + DBCStorage <SpellRangeEntry> const* GetSpellRangeStore(); + DBCStorage <FactionEntry> const* GetFactionStore(); + DBCStorage <ItemEntry> const* GetItemDisplayStore(); + DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore(); + DBCStorage <EmotesEntry> const* GetEmotesStore(); + DBCStorage <EmotesTextEntry> const* GetEmotesTextStore(); + DBCStorage <AchievementEntry> const* GetAchievementStore(); #endif diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h index f07aab090ae..91517153929 100644 --- a/src/game/DBCStructure.h +++ b/src/game/DBCStructure.h @@ -18,8 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOS_DBCSTRUCTURE_H -#define MANGOS_DBCSTRUCTURE_H +#ifndef TRINITY_DBCSTRUCTURE_H +#define TRINITY_DBCSTRUCTURE_H #include "DBCEnums.h" #include "Platform/Define.h" diff --git a/src/game/DBCfmt.h b/src/game/DBCfmt.h index 5eb9468e8e3..bac2ff19028 100644 --- a/src/game/DBCfmt.h +++ b/src/game/DBCfmt.h @@ -18,8 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOS_DBCSFRM_H -#define MANGOS_DBCSFRM_H +#ifndef TRINITY_DBCSFRM_H +#define TRINITY_DBCSFRM_H const char Achievementfmt[]="niixssssssssssssssssxxxxxxxxxxxxxxxxxxiixixxxxxxxxxxxxxxxxxxii"; const char AchievementCriteriafmt[]="niiiiiiiixxxxxxxxxxxxxxxxxiixix"; diff --git a/src/game/Debugcmds.cpp b/src/game/Debugcmds.cpp index 96c8155c9de..7def90fe5f4 100644 --- a/src/game/Debugcmds.cpp +++ b/src/game/Debugcmds.cpp @@ -37,7 +37,6 @@ #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "SpellMgr.h" -#include "ScriptCalls.h" #include "ScriptMgr.h" bool ChatHandler::HandleDebugSendSpellFailCommand(const char* args) diff --git a/src/game/DestinationHolder.h b/src/game/DestinationHolder.h index 018d6aa360b..05cbfd0b1a1 100644 --- a/src/game/DestinationHolder.h +++ b/src/game/DestinationHolder.h @@ -30,7 +30,7 @@ class Map; #define TRAVELLER_UPDATE_INTERVAL 300 template<typename TRAVELLER> -class TRINITY_DLL_DECL DestinationHolder +class DestinationHolder { TimeTrackerSmall i_tracker; uint32 i_totalTravelTime; diff --git a/src/game/FleeingMovementGenerator.h b/src/game/FleeingMovementGenerator.h index e070d65d371..0e941160acd 100644 --- a/src/game/FleeingMovementGenerator.h +++ b/src/game/FleeingMovementGenerator.h @@ -26,7 +26,7 @@ #include "Traveller.h" template<class T> -class TRINITY_DLL_SPEC FleeingMovementGenerator +class FleeingMovementGenerator : public MovementGeneratorMedium< T, FleeingMovementGenerator<T> > { public: @@ -62,7 +62,7 @@ class TRINITY_DLL_SPEC FleeingMovementGenerator DestinationHolder< Traveller<T> > i_destinationHolder; }; -class TRINITY_DLL_SPEC TimedFleeingMovementGenerator +class TimedFleeingMovementGenerator : public FleeingMovementGenerator<Creature> { public: diff --git a/src/game/FollowerReference.h b/src/game/FollowerReference.h index f09d1a5ff2a..e468f79f017 100644 --- a/src/game/FollowerReference.h +++ b/src/game/FollowerReference.h @@ -26,7 +26,7 @@ class TargetedMovementGeneratorBase; class Unit; -class TRINITY_DLL_SPEC FollowerReference : public Reference<Unit, TargetedMovementGeneratorBase> +class FollowerReference : public Reference<Unit, TargetedMovementGeneratorBase> { protected: void targetObjectBuildLink(); diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index 8930abaccb8..19c716007ec 100644 --- a/src/game/GameEventMgr.cpp +++ b/src/game/GameEventMgr.cpp @@ -1662,7 +1662,7 @@ void GameEventMgr::SendWorldStateUpdate(Player * plr, uint16 event_id) } } -TRINITY_DLL_SPEC bool IsHolidayActive(HolidayIds id) + bool IsHolidayActive(HolidayIds id) { GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap(); GameEventMgr::ActiveEvents const& ae = gameeventmgr.GetActiveEventList(); @@ -1674,7 +1674,7 @@ TRINITY_DLL_SPEC bool IsHolidayActive(HolidayIds id) return false; } -TRINITY_DLL_SPEC bool IsEventActive(uint16 event_id) + bool IsEventActive(uint16 event_id) { GameEventMgr::ActiveEvents const& ae = gameeventmgr.GetActiveEventList(); return ae.find(event_id) != ae.end(); diff --git a/src/game/GameEventMgr.h b/src/game/GameEventMgr.h index 11d2e0babed..39066308410 100644 --- a/src/game/GameEventMgr.h +++ b/src/game/GameEventMgr.h @@ -172,8 +172,8 @@ class GameEventMgr #define gameeventmgr Trinity::Singleton<GameEventMgr>::Instance() -TRINITY_DLL_SPEC bool IsHolidayActive(HolidayIds id); -TRINITY_DLL_SPEC bool IsEventActive(uint16 event_id); + bool IsHolidayActive(HolidayIds id); + bool IsEventActive(uint16 event_id); #endif diff --git a/src/game/GameObject.h b/src/game/GameObject.h index 104263154db..7f84bb2d3ec 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -581,7 +581,7 @@ class Unit; // 5 sec for bobber catch #define FISHING_BOBBER_READY_TIME 5 -class TRINITY_DLL_SPEC GameObject : public WorldObject, public GridObject<GameObject> +class GameObject : public WorldObject, public GridObject<GameObject> { public: explicit GameObject(); diff --git a/src/game/GossipDef.h b/src/game/GossipDef.h index 65a3332907f..60eacdfffec 100644 --- a/src/game/GossipDef.h +++ b/src/game/GossipDef.h @@ -147,7 +147,7 @@ struct QuestMenuItem typedef std::vector<QuestMenuItem> QuestMenuItemList; -class TRINITY_DLL_SPEC GossipMenu +class GossipMenu { public: GossipMenu(); @@ -228,7 +228,7 @@ class QuestMenu QuestMenuItemList m_qItems; }; -class TRINITY_DLL_SPEC PlayerMenu +class PlayerMenu { private: GossipMenu mGossipMenu; diff --git a/src/game/GridDefines.h b/src/game/GridDefines.h index a9e26b4f7f9..0357d8ca8ae 100644 --- a/src/game/GridDefines.h +++ b/src/game/GridDefines.h @@ -74,7 +74,7 @@ typedef TypeMapContainer<AllGridObjectTypes> GridTypeMapContainer; typedef TypeMapContainer<AllWorldObjectTypes> WorldTypeMapContainer; template<const unsigned int LIMIT> -struct TRINITY_DLL_DECL CoordPair +struct CoordPair { CoordPair(uint32 x=0, uint32 y=0) : x_coord(x), y_coord(y) {} CoordPair(const CoordPair<LIMIT> &obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) {} diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h index 4e4e05186e3..9031794a6ac 100644 --- a/src/game/GridNotifiers.h +++ b/src/game/GridNotifiers.h @@ -38,7 +38,7 @@ class Player; namespace Trinity { - struct TRINITY_DLL_DECL VisibleNotifier + struct VisibleNotifier { bool force; Player &i_player; @@ -57,7 +57,7 @@ namespace Trinity void SendToSelf(void); }; - struct TRINITY_DLL_DECL Player2PlayerNotifier : public VisibleNotifier + struct Player2PlayerNotifier : public VisibleNotifier { Player2PlayerNotifier(Player &player, bool forced = false) : VisibleNotifier(player, forced) {} @@ -67,7 +67,7 @@ namespace Trinity void SendToSelf(void); }; - struct TRINITY_DLL_DECL PlayerRelocationNotifier + struct PlayerRelocationNotifier { Player &i_player; PlayerRelocationNotifier(Player &pl) : i_player(pl) {} @@ -77,7 +77,7 @@ namespace Trinity #endif }; - struct TRINITY_DLL_DECL CreatureRelocationNotifier + struct CreatureRelocationNotifier { Creature &i_creature; CreatureRelocationNotifier(Creature &c) : i_creature(c) {} @@ -88,7 +88,7 @@ namespace Trinity #endif }; - struct TRINITY_DLL_DECL VisibleChangesNotifier + struct VisibleChangesNotifier { WorldObject &i_object; @@ -99,7 +99,7 @@ namespace Trinity void Visit(DynamicObjectMapType &); }; - struct TRINITY_DLL_DECL DelayedUnitRelocation + struct DelayedUnitRelocation { Map &i_map; const Cell& i_cell; @@ -114,7 +114,7 @@ namespace Trinity void Notify(GridRefManager<T> &); }; - struct TRINITY_DLL_DECL ResetNotifier + struct ResetNotifier { uint16 reset_mask; ResetNotifier(uint16 notifies) : reset_mask(notifies) {} @@ -124,7 +124,7 @@ namespace Trinity void Visit(PlayerMapType &m) { resetNotify<Player>(m);} }; - struct TRINITY_DLL_DECL GridUpdater + struct GridUpdater { GridType &i_grid; uint32 i_timeDiff; @@ -143,7 +143,7 @@ namespace Trinity void Visit(CorpseMapType &m) { updateObjects<Corpse>(m); } }; - struct TRINITY_DLL_DECL MessageDistDeliverer + struct MessageDistDeliverer { WorldObject *i_source; WorldPacket *i_message; @@ -170,7 +170,7 @@ namespace Trinity } }; - struct TRINITY_DLL_DECL ObjectUpdater + struct ObjectUpdater { uint32 i_timeDiff; explicit ObjectUpdater(const uint32 &diff) : i_timeDiff(diff) {} @@ -185,7 +185,7 @@ namespace Trinity // WorldObject searchers & workers template<class Check> - struct TRINITY_DLL_DECL WorldObjectSearcher + struct WorldObjectSearcher { uint32 i_phaseMask; WorldObject* &i_object; @@ -204,7 +204,7 @@ namespace Trinity }; template<class Check> - struct TRINITY_DLL_DECL WorldObjectListSearcher + struct WorldObjectListSearcher { uint32 i_phaseMask; std::list<WorldObject*> &i_objects; @@ -223,7 +223,7 @@ namespace Trinity }; template<class Do> - struct TRINITY_DLL_DECL WorldObjectWorker + struct WorldObjectWorker { uint32 i_phaseMask; Do const& i_do; @@ -271,7 +271,7 @@ namespace Trinity // Gameobject searchers template<class Check> - struct TRINITY_DLL_DECL GameObjectSearcher + struct GameObjectSearcher { uint32 i_phaseMask; GameObject* &i_object; @@ -287,7 +287,7 @@ namespace Trinity // Last accepted by Check GO if any (Check can change requirements at each call) template<class Check> - struct TRINITY_DLL_DECL GameObjectLastSearcher + struct GameObjectLastSearcher { uint32 i_phaseMask; GameObject* &i_object; @@ -302,7 +302,7 @@ namespace Trinity }; template<class Check> - struct TRINITY_DLL_DECL GameObjectListSearcher + struct GameObjectListSearcher { uint32 i_phaseMask; std::list<GameObject*> &i_objects; @@ -320,7 +320,7 @@ namespace Trinity // First accepted by Check Unit if any template<class Check> - struct TRINITY_DLL_DECL UnitSearcher + struct UnitSearcher { uint32 i_phaseMask; Unit* &i_object; @@ -337,7 +337,7 @@ namespace Trinity // Last accepted by Check Unit if any (Check can change requirements at each call) template<class Check> - struct TRINITY_DLL_DECL UnitLastSearcher + struct UnitLastSearcher { uint32 i_phaseMask; Unit* &i_object; @@ -354,7 +354,7 @@ namespace Trinity // All accepted by Check units if any template<class Check> - struct TRINITY_DLL_DECL UnitListSearcher + struct UnitListSearcher { uint32 i_phaseMask; std::list<Unit*> &i_objects; @@ -372,7 +372,7 @@ namespace Trinity // Creature searchers template<class Check> - struct TRINITY_DLL_DECL CreatureSearcher + struct CreatureSearcher { uint32 i_phaseMask; Creature* &i_object; @@ -388,7 +388,7 @@ namespace Trinity // Last accepted by Check Creature if any (Check can change requirements at each call) template<class Check> - struct TRINITY_DLL_DECL CreatureLastSearcher + struct CreatureLastSearcher { uint32 i_phaseMask; Creature* &i_object; @@ -403,7 +403,7 @@ namespace Trinity }; template<class Check> - struct TRINITY_DLL_DECL CreatureListSearcher + struct CreatureListSearcher { uint32 i_phaseMask; std::list<Creature*> &i_objects; @@ -418,7 +418,7 @@ namespace Trinity }; template<class Do> - struct TRINITY_DLL_DECL CreatureWorker + struct CreatureWorker { uint32 i_phaseMask; Do& i_do; @@ -439,7 +439,7 @@ namespace Trinity // Player searchers template<class Check> - struct TRINITY_DLL_DECL PlayerSearcher + struct PlayerSearcher { uint32 i_phaseMask; Player* &i_object; @@ -454,7 +454,7 @@ namespace Trinity }; template<class Check> - struct TRINITY_DLL_DECL PlayerListSearcher + struct PlayerListSearcher { uint32 i_phaseMask; std::list<Player*> &i_objects; @@ -469,7 +469,7 @@ namespace Trinity }; template<class Do> - struct TRINITY_DLL_DECL PlayerWorker + struct PlayerWorker { uint32 i_phaseMask; Do& i_do; @@ -488,7 +488,7 @@ namespace Trinity }; template<class Do> - struct TRINITY_DLL_DECL PlayerDistWorker + struct PlayerDistWorker { WorldObject const* i_searcher; float i_dist; diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h index 94f4de0e937..01eae14141b 100644 --- a/src/game/GridNotifiersImpl.h +++ b/src/game/GridNotifiersImpl.h @@ -584,4 +584,4 @@ struct ObjectDistanceOrderReversed : public std::binary_function<const WorldObje } }; -#endif // MANGOS_GRIDNOTIFIERSIMPL_H +#endif // TRINITY_GRIDNOTIFIERSIMPL_H diff --git a/src/game/GridStates.h b/src/game/GridStates.h index a8ac2f1bed0..5bcc041ef5c 100644 --- a/src/game/GridStates.h +++ b/src/game/GridStates.h @@ -24,7 +24,7 @@ #include "Map.h" #include "Object.h" -class TRINITY_DLL_DECL GridState +class GridState { public: #ifdef TRINITY_DEBUG @@ -45,28 +45,28 @@ class TRINITY_DLL_DECL GridState virtual void Update(Map &, NGridType&, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const = 0; }; -class TRINITY_DLL_DECL InvalidState : public GridState +class InvalidState : public GridState { public: void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const; }; -class TRINITY_DLL_DECL ActiveState : public GridState +class ActiveState : public GridState { public: void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const; }; -class TRINITY_DLL_DECL IdleState : public GridState +class IdleState : public GridState { public: void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const; }; -class TRINITY_DLL_DECL RemovalState : public GridState +class RemovalState : public GridState { public: diff --git a/src/game/Group.h b/src/game/Group.h index 61d31ce969a..5cc09927dcd 100644 --- a/src/game/Group.h +++ b/src/game/Group.h @@ -140,7 +140,7 @@ struct InstanceGroupBind /** request member stats checken **/ /** todo: uninvite people that not accepted invite **/ -class TRINITY_DLL_SPEC Group +class Group { public: struct MemberSlot diff --git a/src/game/GroupReference.h b/src/game/GroupReference.h index 033620b4d07..76f54c5230f 100644 --- a/src/game/GroupReference.h +++ b/src/game/GroupReference.h @@ -26,7 +26,7 @@ class Group; class Player; -class TRINITY_DLL_SPEC GroupReference : public Reference<Group, Player> +class GroupReference : public Reference<Group, Player> { protected: uint8 iSubGroup; diff --git a/src/game/GuardAI.h b/src/game/GuardAI.h index 37bca972c27..73e3692a770 100644 --- a/src/game/GuardAI.h +++ b/src/game/GuardAI.h @@ -26,7 +26,7 @@ class Creature; -class TRINITY_DLL_DECL GuardAI : public CreatureAI +class GuardAI : public CreatureAI { enum GuardState { diff --git a/src/game/HomeMovementGenerator.h b/src/game/HomeMovementGenerator.h index b6bad713e46..a70a404cbf8 100644 --- a/src/game/HomeMovementGenerator.h +++ b/src/game/HomeMovementGenerator.h @@ -28,10 +28,10 @@ class Creature; template < class T > -class TRINITY_DLL_SPEC HomeMovementGenerator; +class HomeMovementGenerator; template <> -class TRINITY_DLL_SPEC HomeMovementGenerator<Creature> +class HomeMovementGenerator<Creature> : public MovementGeneratorMedium< Creature, HomeMovementGenerator<Creature> > { public: diff --git a/src/game/IdleMovementGenerator.h b/src/game/IdleMovementGenerator.h index 054d9712459..62f98635fc9 100644 --- a/src/game/IdleMovementGenerator.h +++ b/src/game/IdleMovementGenerator.h @@ -23,7 +23,7 @@ #include "MovementGenerator.h" -class TRINITY_DLL_SPEC IdleMovementGenerator : public MovementGenerator +class IdleMovementGenerator : public MovementGenerator { public: @@ -36,7 +36,7 @@ class TRINITY_DLL_SPEC IdleMovementGenerator : public MovementGenerator extern IdleMovementGenerator si_idleMovement; -class TRINITY_DLL_SPEC RotateMovementGenerator : public MovementGenerator +class RotateMovementGenerator : public MovementGenerator { public: explicit RotateMovementGenerator(uint32 time, RotateDirection direction) : m_duration(time), m_maxDuration(time), m_direction(direction) {} @@ -52,7 +52,7 @@ class TRINITY_DLL_SPEC RotateMovementGenerator : public MovementGenerator RotateDirection m_direction; }; -class TRINITY_DLL_SPEC DistractMovementGenerator : public MovementGenerator +class DistractMovementGenerator : public MovementGenerator { public: explicit DistractMovementGenerator(uint32 timer) : m_timer(timer) {} @@ -67,7 +67,7 @@ class TRINITY_DLL_SPEC DistractMovementGenerator : public MovementGenerator uint32 m_timer; }; -class TRINITY_DLL_SPEC AssistanceDistractMovementGenerator : public DistractMovementGenerator +class AssistanceDistractMovementGenerator : public DistractMovementGenerator { public: AssistanceDistractMovementGenerator(uint32 timer) : diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h index 8e7afe2d6a4..e6fcb25b355 100644 --- a/src/game/InstanceData.h +++ b/src/game/InstanceData.h @@ -109,7 +109,7 @@ struct MinionInfo typedef std::multimap<uint32 /*entry*/, DoorInfo> DoorInfoMap; typedef std::map<uint32 /*entry*/, MinionInfo> MinionInfoMap; -class TRINITY_DLL_SPEC InstanceData : public ZoneScript +class InstanceData : public ZoneScript { public: diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h index 317ff1309b1..91cd3d9ebe6 100644 --- a/src/game/InstanceSaveMgr.h +++ b/src/game/InstanceSaveMgr.h @@ -117,7 +117,7 @@ class InstanceSave typedef UNORDERED_MAP<uint32 /*PAIR32(map,difficulty)*/,time_t /*resetTime*/> ResetTimeByMapDifficultyMap; -class TRINITY_DLL_DECL InstanceSaveManager : public Trinity::Singleton<InstanceSaveManager, Trinity::ClassLevelLockable<InstanceSaveManager, ACE_Thread_Mutex> > +class InstanceSaveManager : public Trinity::Singleton<InstanceSaveManager, Trinity::ClassLevelLockable<InstanceSaveManager, ACE_Thread_Mutex> > { friend class InstanceSave; public: diff --git a/src/game/Item.cpp b/src/game/Item.cpp index 61c86d389b7..d1a5612b95c 100644 --- a/src/game/Item.cpp +++ b/src/game/Item.cpp @@ -25,7 +25,6 @@ #include "Database/DatabaseEnv.h" #include "ItemEnchantmentMgr.h" #include "SpellMgr.h" -#include "ScriptCalls.h" #include "ScriptMgr.h" void AddItemsSetItem(Player*player,Item *item) diff --git a/src/game/Item.h b/src/game/Item.h index 1087099b54c..37d7b7c2dfd 100644 --- a/src/game/Item.h +++ b/src/game/Item.h @@ -218,7 +218,7 @@ struct ItemRequiredTarget bool ItemCanGoIntoBag(ItemPrototype const *proto, ItemPrototype const *pBagProto); -class TRINITY_DLL_SPEC Item : public Object +class Item : public Object { public: static Item* CreateItem( uint32 item, uint32 count, Player const* player = NULL ); diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index 4abc778e485..b1853c93d77 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -109,7 +109,6 @@ bool ChatHandler::HandleServerInfoCommand(const char* /*args*/) // full = _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_ID); //SendSysMessage(full); - //PSendSysMessage(LANG_USING_SCRIPT_LIB,sWorld.GetScriptsVersion()); //PSendSysMessage(LANG_USING_WORLD_DB,sWorld.GetDBVersion()); //PSendSysMessage(LANG_USING_EVENT_AI,sWorld.GetCreatureEventAIVersion()); PSendSysMessage(LANG_CONNECTED_PLAYERS, PlayersNum, MaxPlayersNum); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 5e3b0c57b97..864f827df7d 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -36,7 +36,6 @@ #include "Guild.h" #include "ObjectAccessor.h" #include "MapManager.h" -#include "ScriptCalls.h" #include "Language.h" #include "GridNotifiersImpl.h" #include "CellImpl.h" diff --git a/src/game/LootMgr.h b/src/game/LootMgr.h index f03d0b9056f..00e0bb8d1b5 100644 --- a/src/game/LootMgr.h +++ b/src/game/LootMgr.h @@ -180,7 +180,7 @@ class LootStore class LootTemplate { - class LootGroup; // A set of loot definitions for items (refs are not allowed inside) + class LootGroup; // A set of loot definitions for items (refs are not allowed inside) typedef std::vector<LootGroup> LootGroups; public: diff --git a/src/game/Map.cpp b/src/game/Map.cpp index d73833e30e2..0d65f26127b 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -33,7 +33,6 @@ #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "World.h" -#include "ScriptCalls.h" #include "Group.h" #include "MapRefManager.h" #include "Vehicle.h" diff --git a/src/game/Map.h b/src/game/Map.h index 52bf64cdbe2..8bef03bf8ea 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -237,7 +237,7 @@ typedef UNORDERED_MAP<Creature*, CreatureMover> CreatureMoveList; typedef std::map<uint32/*leaderDBGUID*/, CreatureGroup*> CreatureGroupHolderType; -class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::ObjectLevelLockable<Map, ACE_Thread_Mutex> +class Map : public GridRefManager<NGridType>, public Trinity::ObjectLevelLockable<Map, ACE_Thread_Mutex> { friend class MapReference; public: @@ -568,7 +568,7 @@ enum InstanceResetMethod INSTANCE_RESET_RESPAWN_DELAY }; -class TRINITY_DLL_SPEC InstanceMap : public Map +class InstanceMap : public Map { public: InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent); @@ -601,7 +601,7 @@ class TRINITY_DLL_SPEC InstanceMap : public Map uint32 i_script_id; }; -class TRINITY_DLL_SPEC BattleGroundMap : public Map +class BattleGroundMap : public Map { public: BattleGroundMap(uint32 id, time_t, uint32 InstanceId, Map* _parent, uint8 spawnMode); diff --git a/src/game/MapInstanced.h b/src/game/MapInstanced.h index c95450e9568..536257da011 100644 --- a/src/game/MapInstanced.h +++ b/src/game/MapInstanced.h @@ -25,7 +25,7 @@ #include "InstanceSaveMgr.h" #include "DBCEnums.h" -class TRINITY_DLL_DECL MapInstanced : public Map +class MapInstanced : public Map { friend class MapManager; public: diff --git a/src/game/MapManager.h b/src/game/MapManager.h index 2a8853c4225..60e2255f8af 100644 --- a/src/game/MapManager.h +++ b/src/game/MapManager.h @@ -33,7 +33,7 @@ class Transport; #define DEFAULT_VISIBILITY_NOTIFY_PERIOD 1100 -class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinity::ClassLevelLockable<MapManager, ACE_Thread_Mutex> > +class MapManager : public Trinity::Singleton<MapManager, Trinity::ClassLevelLockable<MapManager, ACE_Thread_Mutex> > { friend class Trinity::OperatorNew<MapManager>; diff --git a/src/game/MapReference.h b/src/game/MapReference.h index ae485af7487..3cdd29c3cda 100644 --- a/src/game/MapReference.h +++ b/src/game/MapReference.h @@ -22,7 +22,7 @@ #include "Utilities/LinkedReference/Reference.h" #include "Map.h" -class TRINITY_DLL_SPEC MapReference : public Reference<Map, Player> +class MapReference : public Reference<Map, Player> { protected: void targetObjectBuildLink() diff --git a/src/game/MapUpdater.cpp b/src/game/MapUpdater.cpp index 501843f8869..11af01d95e0 100644 --- a/src/game/MapUpdater.cpp +++ b/src/game/MapUpdater.cpp @@ -9,7 +9,7 @@ //the reason this things are here is that i want to make //the netcode patch and the multithreaded maps independant //once they are merged 1 class should be used -class WDBThreadStartReq1 : public ACE_Method_Request +class WDBThreadStartReq1 : public ACE_Method_Request { public: WDBThreadStartReq1(){} @@ -24,7 +24,7 @@ class WDBThreadStartReq1 : public ACE_Method_Request } }; -class WDBThreadEndReq1 : public ACE_Method_Request +class WDBThreadEndReq1 : public ACE_Method_Request { public: WDBThreadEndReq1(){} diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index e1cf4165005..b366c37c40b 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -35,7 +35,6 @@ #include "UpdateData.h" #include "LootMgr.h" #include "Chat.h" -#include "ScriptCalls.h" #include <zlib/zlib.h> #include "ObjectAccessor.h" #include "Object.h" @@ -207,7 +206,7 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data ) wstrToLower(wplayer_name); wstrToLower(wguild_name); - // client send in case not set max level value 100 but mangos support 255 max level, + // client send in case not set max level value 100 but Trinity supports 255 max level, // update it to show GMs with characters after 100 level if (level_max >= MAX_LEVEL) level_max = STRONG_MAX_LEVEL; @@ -359,7 +358,7 @@ void WorldSession::HandleLogoutRequestOpcode( WorldPacket & /*recv_data*/ ) return; } - //instant logout in taverns/cities or on taxi or for admins, gm's, mod's if its enabled in mangosd.conf + //instant logout in taverns/cities or on taxi or for admins, gm's, mod's if its enabled in TrinityCore.conf if (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) || GetPlayer()->isInFlight() || GetSecurity() >= sWorld.getConfig(CONFIG_INSTANT_LOGOUT)) { diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h index ad6f3a3615f..9133da7d7b5 100644 --- a/src/game/MotionMaster.h +++ b/src/game/MotionMaster.h @@ -78,7 +78,7 @@ enum RotateDirection // assume it is 25 yard per 0.6 second #define SPEED_CHARGE 42.0f -class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *> +class MotionMaster //: private std::stack<MovementGenerator *> { private: //typedef std::stack<MovementGenerator *> Impl; diff --git a/src/game/MovementGenerator.h b/src/game/MovementGenerator.h index 9aa9bb1f08d..679c08626e1 100644 --- a/src/game/MovementGenerator.h +++ b/src/game/MovementGenerator.h @@ -30,7 +30,7 @@ class Unit; -class TRINITY_DLL_SPEC MovementGenerator +class MovementGenerator { public: virtual ~MovementGenerator(); @@ -50,7 +50,7 @@ class TRINITY_DLL_SPEC MovementGenerator }; template<class T, class D> -class TRINITY_DLL_SPEC MovementGeneratorMedium : public MovementGenerator +class MovementGeneratorMedium : public MovementGenerator { public: void Initialize(Unit &u) diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp index c7e5619bdf9..fc2c590745a 100644 --- a/src/game/NPCHandler.cpp +++ b/src/game/NPCHandler.cpp @@ -30,7 +30,6 @@ #include "Player.h" #include "GossipDef.h" #include "UpdateMask.h" -#include "ScriptCalls.h" #include "ObjectAccessor.h" #include "Creature.h" #include "Pet.h" diff --git a/src/game/Object.h b/src/game/Object.h index 86de6c86e09..bb67920f68b 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -119,7 +119,7 @@ class Unit; typedef UNORDERED_MAP<Player*, UpdateData> UpdateDataMapType; -class TRINITY_DLL_SPEC Object +class Object { public: virtual ~Object ( ); @@ -361,7 +361,7 @@ class TRINITY_DLL_SPEC Object Object& operator=(Object const&); // prevent generation assigment operator }; -struct TRINITY_DLL_SPEC Position +struct Position { float m_positionX; float m_positionY; @@ -457,7 +457,7 @@ class GridObject GridReference<T> m_gridRef; }; -class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation +class WorldObject : public Object, public WorldLocation { public: virtual ~WorldObject(); diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h index 722e40a33dd..9667686bb40 100644 --- a/src/game/ObjectAccessor.h +++ b/src/game/ObjectAccessor.h @@ -83,7 +83,7 @@ class HashMapHolder static MapType m_objectMap; }; -class TRINITY_DLL_DECL ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> > +class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> > { friend class Trinity::OperatorNew<ObjectAccessor>; diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp index c760d285c64..afe5eeb6705 100644 --- a/src/game/ObjectGridLoader.cpp +++ b/src/game/ObjectGridLoader.cpp @@ -30,7 +30,7 @@ #include "CellImpl.h" #include "CreatureAI.h" -class TRINITY_DLL_DECL ObjectGridRespawnMover +class ObjectGridRespawnMover { public: ObjectGridRespawnMover() {} diff --git a/src/game/ObjectGridLoader.h b/src/game/ObjectGridLoader.h index 0919e998cf6..e890bf8d482 100644 --- a/src/game/ObjectGridLoader.h +++ b/src/game/ObjectGridLoader.h @@ -29,7 +29,7 @@ class ObjectWorldLoader; -class TRINITY_DLL_DECL ObjectGridLoader +class ObjectGridLoader { friend class ObjectWorldLoader; @@ -56,7 +56,7 @@ class TRINITY_DLL_DECL ObjectGridLoader uint32 i_corpses; }; -class TRINITY_DLL_DECL ObjectGridUnloader +class ObjectGridUnloader { public: ObjectGridUnloader(NGridType &grid) : i_grid(grid) {} @@ -80,7 +80,7 @@ class TRINITY_DLL_DECL ObjectGridUnloader NGridType &i_grid; }; -class TRINITY_DLL_DECL ObjectGridStoper +class ObjectGridStoper { public: ObjectGridStoper(NGridType &grid) : i_grid(grid) {} @@ -105,7 +105,7 @@ class TRINITY_DLL_DECL ObjectGridStoper NGridType &i_grid; }; -class TRINITY_DLL_DECL ObjectGridCleaner +class ObjectGridCleaner { public: ObjectGridCleaner(NGridType &grid) : i_grid(grid) {} diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 0fd304b9c3c..b9265081cf5 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -3061,7 +3061,7 @@ void ObjectMgr::LoadPlayerInfo() sLog.outErrorDb("Wrong (> %u) level %u in `player_xp_for_level` table, ignoring.", STRONG_MAX_LEVEL,current_level); else { - sLog.outDetail("Unused (> MaxPlayerLevel in mangosd.conf) level %u in `player_xp_for_levels` table, ignoring.",current_level); + sLog.outDetail("Unused (> MaxPlayerLevel in TrinityCore.conf) level %u in `player_xp_for_levels` table, ignoring.",current_level); ++count; // make result loading percent "expected" correct in case disabled detail mode for example. } continue; @@ -8570,14 +8570,14 @@ bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value, i // start/end reversed for negative values if (start_value > MAX_DB_SCRIPT_STRING_ID || end_value >= start_value) { - sLog.outErrorDb("Table '%s' attempt loaded with reserved by mangos range (%d - %d), strings not loaded.",table,start_value,end_value+1); + sLog.outErrorDb("Table '%s' load attempted with range (%d - %d) reserved by Trinity, strings not loaded.",table,start_value,end_value+1); return false; } return objmgr.LoadTrinityStrings(db,table,start_value,end_value); } -uint32 TRINITY_DLL_SPEC GetScriptId(const char *name) +uint32 GetScriptId(const char *name) { return objmgr.GetScriptId(name); } diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index 6383e4d52cc..bfbaea67a87 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -140,8 +140,8 @@ typedef UNORDERED_MAP<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapOb typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes; -// mangos string ranges -#define MIN_TRINITY_STRING_ID 1 // 'mangos_string' +// Trinity string ranges +#define MIN_TRINITY_STRING_ID 1 // 'trinity_string' #define MAX_TRINITY_STRING_ID 2000000000 #define MIN_DB_SCRIPT_STRING_ID MAX_TRINITY_STRING_ID // 'db_script_string' #define MAX_DB_SCRIPT_STRING_ID 2000010000 @@ -348,7 +348,7 @@ SkillRangeType GetSkillRangeType(SkillLineEntry const *pSkill, bool racial); bool normalizePlayerName(std::string& name); -struct TRINITY_DLL_SPEC LanguageDesc +struct LanguageDesc { Language lang_id; uint32 spell_id; @@ -356,7 +356,7 @@ struct TRINITY_DLL_SPEC LanguageDesc }; extern LanguageDesc lang_description[LANGUAGES_COUNT]; -TRINITY_DLL_SPEC LanguageDesc const* GetLanguageDescByID(uint32 lang); + LanguageDesc const* GetLanguageDescByID(uint32 lang); class PlayerDumpReader; @@ -1075,13 +1075,13 @@ class ObjectMgr #define objmgr Trinity::Singleton<ObjectMgr>::Instance() // scripting access functions -TRINITY_DLL_SPEC bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min()); -TRINITY_DLL_SPEC uint32 GetAreaTriggerScriptId(uint32 trigger_id); -TRINITY_DLL_SPEC uint32 GetScriptId(const char *name); -TRINITY_DLL_SPEC ObjectMgr::ScriptNameMap& GetScriptNames(); -TRINITY_DLL_SPEC GameObjectInfo const *GetGameObjectInfo(uint32 id); -TRINITY_DLL_SPEC CreatureInfo const *GetCreatureInfo(uint32 id); -TRINITY_DLL_SPEC CreatureInfo const* GetCreatureTemplateStore(uint32 entry); -TRINITY_DLL_SPEC Quest const* GetQuestTemplateStore(uint32 entry); + bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min()); + uint32 GetAreaTriggerScriptId(uint32 trigger_id); + uint32 GetScriptId(const char *name); + ObjectMgr::ScriptNameMap& GetScriptNames(); + GameObjectInfo const *GetGameObjectInfo(uint32 id); + CreatureInfo const *GetCreatureInfo(uint32 id); + CreatureInfo const* GetCreatureTemplateStore(uint32 entry); + Quest const* GetQuestTemplateStore(uint32 entry); #endif diff --git a/src/game/PassiveAI.h b/src/game/PassiveAI.h index c7b183f754d..ca89c808212 100644 --- a/src/game/PassiveAI.h +++ b/src/game/PassiveAI.h @@ -24,7 +24,7 @@ #include "CreatureAI.h" //#include "CreatureAIImpl.h" -class TRINITY_DLL_SPEC PassiveAI : public CreatureAI +class PassiveAI : public CreatureAI { public: explicit PassiveAI(Creature *c); @@ -36,7 +36,7 @@ class TRINITY_DLL_SPEC PassiveAI : public CreatureAI static int Permissible(const Creature *) { return PERMIT_BASE_IDLE; } }; -class TRINITY_DLL_DECL PossessedAI : public CreatureAI +class PossessedAI : public CreatureAI { public: explicit PossessedAI(Creature *c); @@ -52,7 +52,7 @@ class TRINITY_DLL_DECL PossessedAI : public CreatureAI static int Permissible(const Creature *) { return PERMIT_BASE_IDLE; } }; -class TRINITY_DLL_SPEC NullCreatureAI : public CreatureAI +class NullCreatureAI : public CreatureAI { public: explicit NullCreatureAI(Creature *c); @@ -66,7 +66,7 @@ class TRINITY_DLL_SPEC NullCreatureAI : public CreatureAI static int Permissible(const Creature *) { return PERMIT_BASE_IDLE; } }; -class TRINITY_DLL_DECL CritterAI : public PassiveAI +class CritterAI : public PassiveAI { public: explicit CritterAI(Creature *c) : PassiveAI(c) {} @@ -75,7 +75,7 @@ class TRINITY_DLL_DECL CritterAI : public PassiveAI void EnterEvadeMode(); }; -class TRINITY_DLL_SPEC TriggerAI : public NullCreatureAI +class TriggerAI : public NullCreatureAI { public: explicit TriggerAI(Creature *c) : NullCreatureAI(c) {} diff --git a/src/game/PetAI.h b/src/game/PetAI.h index 3eb50604b46..9712ce55145 100644 --- a/src/game/PetAI.h +++ b/src/game/PetAI.h @@ -27,7 +27,7 @@ class Creature; class Spell; -class TRINITY_DLL_DECL PetAI : public CreatureAI +class PetAI : public CreatureAI { public: diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 15d12e2cc5f..606997908b8 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -18499,7 +18499,7 @@ void Player::HandleStealthedUnitsDetection() (*i)->SendUpdateToPlayer(this); m_clientGUIDs.insert((*i)->GetGUID()); - #ifdef MANGOS_DEBUG + #ifdef TRINITY_DEBUG if((sLog.getLogFilter() & LOG_FILTER_VISIBILITY_CHANGES)==0) sLog.outDebug("Object %u (Type: %u) is detected in stealth by player %u. Distance = %f",(*i)->GetGUIDLow(),(*i)->GetTypeId(),GetGUIDLow(),GetDistance(*i)); #endif diff --git a/src/game/Player.h b/src/game/Player.h index 525d81a59bd..9d456bf5254 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -66,7 +66,7 @@ enum SpellModType SPELLMOD_PCT = 108 // SPELL_AURA_ADD_PCT_MODIFIER }; -// 2^n values, Player::m_isunderwater is a bitmask. These are mangos internal values, they are never send to any client +// 2^n values, Player::m_isunderwater is a bitmask. These are Trinity internal values, they are never send to any client enum PlayerUnderwaterState { UNDERWATER_NONE = 0x00, @@ -881,7 +881,7 @@ struct AccessRequirement std::string heroicQuestFailedText; }; -class TRINITY_DLL_SPEC PlayerTaxi +class PlayerTaxi { public: PlayerTaxi(); @@ -961,7 +961,7 @@ struct BGData bool HasTaxiPath() const { return taxiPath[0] && taxiPath[1]; } }; -class TRINITY_DLL_SPEC Player : public Unit, public GridObject<Player> +class Player : public Unit, public GridObject<Player> { friend class WorldSession; friend void Item::AddToUpdateQueueOf(Player *player); diff --git a/src/game/PointMovementGenerator.h b/src/game/PointMovementGenerator.h index da7edb0abb0..474ce8cc9ce 100644 --- a/src/game/PointMovementGenerator.h +++ b/src/game/PointMovementGenerator.h @@ -27,7 +27,7 @@ #include "FollowerReference.h" template<class T> -class TRINITY_DLL_SPEC PointMovementGenerator +class PointMovementGenerator : public MovementGeneratorMedium< T, PointMovementGenerator<T> > { public: @@ -52,7 +52,7 @@ class TRINITY_DLL_SPEC PointMovementGenerator bool arrived; }; -class TRINITY_DLL_SPEC AssistanceMovementGenerator +class AssistanceMovementGenerator : public PointMovementGenerator<Creature> { public: diff --git a/src/game/PoolHandler.h b/src/game/PoolHandler.h index 181da09237c..cfc9c989e0a 100644 --- a/src/game/PoolHandler.h +++ b/src/game/PoolHandler.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOS_POOLHANDLER_H -#define MANGOS_POOLHANDLER_H +#ifndef TRINITY_POOLHANDLER_H +#define TRINITY_POOLHANDLER_H #include "Platform/Define.h" #include "Policies/Singleton.h" diff --git a/src/game/QuestDef.h b/src/game/QuestDef.h index a90d774ed42..d230514b818 100644 --- a/src/game/QuestDef.h +++ b/src/game/QuestDef.h @@ -139,7 +139,7 @@ enum __QuestFlags // Trinity flags for set SpecialFlags in DB if required but used only at server QUEST_TRINITY_FLAGS_REPEATABLE = 0x010000, // Set by 1 in SpecialFlags from DB - QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT = 0x020000, // Set by 2 in SpecialFlags from DB (if reequired area explore, spell SPELL_EFFECT_QUEST_COMPLETE casting, table `*_script` command SCRIPT_COMMAND_QUEST_EXPLORED use, set from script DLL) + QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT = 0x020000, // Set by 2 in SpecialFlags from DB (if reequired area explore, spell SPELL_EFFECT_QUEST_COMPLETE casting, table `*_script` command SCRIPT_COMMAND_QUEST_EXPLORED use, set from script) QUEST_TRINITY_FLAGS_DB_ALLOWED = 0xFFFF | QUEST_TRINITY_FLAGS_REPEATABLE | QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT, // Trinity flags for internal use only diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index 4df3508bfab..4b9f3eddd04 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -29,7 +29,6 @@ #include "GossipDef.h" #include "QuestDef.h" #include "ObjectAccessor.h" -#include "ScriptCalls.h" #include "Group.h" #include "BattleGround.h" #include "BattleGroundAV.h" diff --git a/src/game/RandomMovementGenerator.h b/src/game/RandomMovementGenerator.h index 238f87a26fc..8fa738d1928 100644 --- a/src/game/RandomMovementGenerator.h +++ b/src/game/RandomMovementGenerator.h @@ -26,7 +26,7 @@ #include "Traveller.h" template<class T> -class TRINITY_DLL_SPEC RandomMovementGenerator +class RandomMovementGenerator : public MovementGeneratorMedium< T, RandomMovementGenerator<T> > { public: diff --git a/src/game/ReactorAI.h b/src/game/ReactorAI.h index 81f23c0fcab..ae4e6403962 100644 --- a/src/game/ReactorAI.h +++ b/src/game/ReactorAI.h @@ -25,7 +25,7 @@ class Unit; -class TRINITY_DLL_DECL ReactorAI : public CreatureAI +class ReactorAI : public CreatureAI { public: diff --git a/src/game/ReputationMgr.h b/src/game/ReputationMgr.h index bb997e5ea11..604c40059aa 100644 --- a/src/game/ReputationMgr.h +++ b/src/game/ReputationMgr.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __MANGOS_REPUTATION_MGR_H -#define __MANGOS_REPUTATION_MGR_H +#ifndef __TRINITY_REPUTATION_MGR_H +#define __TRINITY_REPUTATION_MGR_H #include "Common.h" #include "SharedDefines.h" diff --git a/src/game/ScriptCalls.cpp b/src/game/ScriptCalls.cpp deleted file mode 100644 index cc2744f5c71..00000000000 --- a/src/game/ScriptCalls.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> - * - * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef WIN32 -#include <dlfcn.h> -#endif - -#include "Common.h" -#include "Platform/Define.h" -#include "ScriptCalls.h" -#include "World.h" -#include "Config/ConfigEnv.h" -#include "ScriptMgr.h" - -void LoadScriptingModule() -{ - sScriptMgr.ScriptsInit(); - sWorld.SetScriptsVersion(sScriptMgr.ScriptsVersion()); -} - diff --git a/src/game/ScriptCalls.h b/src/game/ScriptCalls.h deleted file mode 100644 index 4aaae619cb4..00000000000 --- a/src/game/ScriptCalls.h +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> - * - * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __SCRIPT_CALLS_H -#define __SCRIPT_CALLS_H - -#include "Common.h" -#include "ObjectMgr.h" - -class Creature; -class CreatureAI; -class GameObject; -class Item; -class Player; -class Quest; -class SpellCastTargets; -class Map; -class InstanceData; - -void LoadScriptingModule(); - -//On Event Handlers -typedef void(TRINITY_IMPORT * scriptCallOnLogin) (Player *pPlayer); -typedef void(TRINITY_IMPORT * scriptCallOnLogout) (Player *pPlayer); -typedef void(TRINITY_IMPORT * scriptCallOnPVPKill) (Player *killer, Player *killed); -typedef bool(TRINITY_IMPORT * scriptCallOnSpellCast)(Unit *pUnitTarget, Item *pItemTarget, GameObject *pGoTarget, uint32 i, SpellEntry const *spell); -typedef uint32(TRINITY_IMPORT * scriptCallOnGetXP) (Player *pPlayer, uint32 amount); -typedef int32(TRINITY_IMPORT * scriptCallOnGetMoney) (Player *pPlayer, int32 amount); -typedef bool(TRINITY_IMPORT * scriptCallOnPlayerChat) (Player *pPlayer, const char *text); -typedef void(TRINITY_IMPORT * scriptCallOnServerStartup) (); -typedef void(TRINITY_IMPORT * scriptCallOnServerShutdown) (); -typedef void(TRINITY_IMPORT * scriptCallOnAreaChange) (Player *pPlayer, AreaTableEntry const *pArea); -typedef bool(TRINITY_IMPORT * scriptCallOnItemClick) (Player *pPlayer, Item *pItem); -typedef bool(TRINITY_IMPORT * scriptCallOnItemOpen) (Player *pPlayer, Item *pItem); -typedef bool(TRINITY_IMPORT * scriptCallOnGoClick) (Player *pPlayer, GameObject *pGameObject); -typedef void(TRINITY_IMPORT * scriptCallOnCreatureKill) (Player *pPlayer, Creature *pCreature); - -typedef bool(TRINITY_IMPORT * scriptCallGossipHello) (Player *player, Creature *_Creature ); -typedef bool(TRINITY_IMPORT * scriptCallQuestAccept) (Player *player, Creature *_Creature, Quest const *); -typedef bool(TRINITY_IMPORT * scriptCallGossipSelect)(Player *player, Creature *_Creature, uint32 sender, uint32 action); -typedef bool(TRINITY_IMPORT * scriptCallGossipSelectWithCode)( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode ); -typedef bool(TRINITY_IMPORT * scriptCallGOSelect)(Player *player, GameObject *_GO, uint32 sender, uint32 action); -typedef bool(TRINITY_IMPORT * scriptCallGOSelectWithCode)( Player *player, GameObject *_GO, uint32 sender, uint32 action, const char* sCode ); -typedef bool(TRINITY_IMPORT * scriptCallQuestSelect)( Player *player, Creature *_Creature, Quest const* ); -typedef bool(TRINITY_IMPORT * scriptCallQuestComplete)(Player *player, Creature *_Creature, Quest const*); -typedef uint32(TRINITY_IMPORT * scriptCallNPCDialogStatus)( Player *player, Creature *_Creature); -typedef uint32(TRINITY_IMPORT * scriptCallGODialogStatus)( Player *player, GameObject * _GO); -typedef bool(TRINITY_IMPORT * scriptCallChooseReward)( Player *player, Creature *_Creature, Quest const*, uint32 opt ); -typedef bool(TRINITY_IMPORT * scriptCallItemHello)( Player *player, Item *, Quest const*); -typedef bool(TRINITY_IMPORT * scriptCallGOHello)( Player *player, GameObject * ); -typedef bool(TRINITY_IMPORT * scriptCallAreaTrigger)( Player *player, AreaTriggerEntry const* ); -typedef bool(TRINITY_IMPORT * scriptCallItemQuestAccept)(Player *player, Item *, Quest const*); -typedef bool(TRINITY_IMPORT * scriptCallGOQuestAccept)(Player *player, GameObject *, Quest const*); -typedef bool(TRINITY_IMPORT * scriptCallGOChooseReward)(Player *player, GameObject *, Quest const*, uint32 opt ); -typedef bool(TRINITY_IMPORT * scriptCallItemUse) (Player *player, Item *_Item, SpellCastTargets const& targets); -typedef bool(TRINITY_IMPORT * scriptCallItemExpire) (Player *player, ItemPrototype const *_ItemProto); -typedef bool(TRINITY_IMPORT * scriptCallEffectDummyGameObj) (Unit *caster, uint32 spellId, uint32 effIndex, GameObject *gameObjTarget); -typedef bool(TRINITY_IMPORT * scriptCallEffectDummyCreature) (Unit *caster, uint32 spellId, uint32 effIndex, Creature *crTarget); -typedef bool(TRINITY_IMPORT * scriptCallEffectDummyItem) (Unit *caster, uint32 spellId, uint32 effIndex, Item *itemTarget); -typedef CreatureAI* (TRINITY_IMPORT * scriptCallGetAI) ( Creature *_Creature ); -typedef InstanceData* (TRINITY_IMPORT * scriptCallCreateInstanceData) (Map *map); - -typedef struct -{ - scriptCallOnLogin OnLogin; - scriptCallOnLogout OnLogout; - scriptCallOnPVPKill OnPVPKill; - scriptCallOnSpellCast OnSpellCast; - scriptCallOnGetXP OnGetXP; - scriptCallOnGetMoney OnGetMoney; - scriptCallOnPlayerChat OnPlayerChat; - scriptCallOnServerStartup OnServerStartup; - scriptCallOnServerShutdown OnServerShutdown; - scriptCallOnAreaChange OnAreaChange; - scriptCallOnItemClick OnItemClick; - scriptCallOnItemOpen OnItemOpen; - scriptCallOnGoClick OnGoClick; - scriptCallOnCreatureKill OnCreatureKill; - scriptCallGossipHello GossipHello; - scriptCallGOChooseReward GOChooseReward; - scriptCallQuestAccept QuestAccept; - scriptCallGossipSelect GossipSelect; - scriptCallGossipSelectWithCode GossipSelectWithCode; - scriptCallGOSelect GOSelect; - scriptCallGOSelectWithCode GOSelectWithCode; - scriptCallQuestSelect QuestSelect; - scriptCallQuestComplete QuestComplete; - scriptCallNPCDialogStatus NPCDialogStatus; - scriptCallGODialogStatus GODialogStatus; - scriptCallChooseReward ChooseReward; - scriptCallItemHello ItemHello; - scriptCallGOHello GOHello; - scriptCallAreaTrigger scriptAreaTrigger; - scriptCallItemQuestAccept ItemQuestAccept; - scriptCallGOQuestAccept GOQuestAccept; - scriptCallItemUse ItemUse; - scriptCallItemExpire ItemExpire; - scriptCallEffectDummyGameObj EffectDummyGameObj; - scriptCallEffectDummyCreature EffectDummyCreature; - scriptCallEffectDummyItem EffectDummyItem; - scriptCallGetAI GetAI; - scriptCallCreateInstanceData CreateInstanceData; - - TRINITY_LIBRARY_HANDLE hScriptsLib; -}_ScriptSet,*ScriptsSet; -#endif - diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp index d55182009d8..0f2836c161e 100644 --- a/src/game/ScriptMgr.cpp +++ b/src/game/ScriptMgr.cpp @@ -12,48 +12,20 @@ #include "ScriptSystem.h" #include "Policies/SingletonImp.h" -#define _FULLVERSION "TrinityScript" - INSTANTIATE_SINGLETON_1(ScriptMgr); int num_sc_scripts; Script *m_scripts[MAX_SCRIPTS]; -Config TScriptConfig; - void FillSpellSummary(); void LoadOverridenSQLData(); void ScriptMgr::LoadDatabase() { - //Get db string from file - std::string dbstring = TScriptConfig.GetStringDefault("WorldDatabaseInfo", ""); - - if (dbstring.empty()) - { - error_log("TSCR: Missing world database info from configuration file. Load database aborted."); - return; - } - - //Initialize connection to DB - if (!dbstring.empty() && TScriptDB.Initialize(dbstring.c_str())) - { - outstring_log("TSCR: TrinityScript database initialized successfully."); - outstring_log(""); - - pSystemMgr.LoadVersion(); - pSystemMgr.LoadScriptTexts(); - pSystemMgr.LoadScriptTextsCustom(); - pSystemMgr.LoadScriptWaypoints(); - } - else - { - error_log("TSCR: Unable to connect to database at %s. Load database aborted.", dbstring.c_str()); - return; - } - - TScriptDB.HaltDelayThread(); - + pSystemMgr.LoadVersion(); + pSystemMgr.LoadScriptTexts(); + pSystemMgr.LoadScriptTextsCustom(); + pSystemMgr.LoadScriptWaypoints(); } struct TSpellSummary { @@ -70,7 +42,7 @@ ScriptMgr::~ScriptMgr() } -void ScriptMgr::ScriptsInit(char const* cfg_file) +void ScriptMgr::ScriptsInit() { //Trinity Script startup outstring_log(" _____ _ _ _ ____ _ _"); @@ -79,15 +51,7 @@ void ScriptMgr::ScriptsInit(char const* cfg_file) outstring_log(" | || | | | | | | | |_| |_| |___) | (__| | | | |_) | |_ "); outstring_log(" |_||_| |_|_| |_|_|\\__|\\__, |____/ \\___|_| |_| .__/ \\__|"); outstring_log(" |___/ |_| "); - outstring_log("Trinity Script initializing %s", _FULLVERSION); outstring_log(""); - - //Get configuration file - if (!TScriptConfig.SetSource(cfg_file)) - error_log("TSCR: Unable to open configuration file. Database will be unaccessible. Configuration values will use default."); - else - outstring_log("TSCR: Using configuration file %s",cfg_file); - outstring_log(""); //Load database (must be called after SD2Config.SetSource). @@ -114,35 +78,6 @@ void ScriptMgr::ScriptsInit(char const* cfg_file) //********************************* //*** Functions used globally *** -std::string ScriptMgr:: GetConfigValueStr(char const* option) -{ - //Get db string from file - std::string dbstring = TScriptConfig.GetStringDefault(option, ""); - - if (dbstring.empty()) - { - error_log("TSCR: %s is not a valid option.", option); - return "error"; - } - return dbstring; -} - -int32 ScriptMgr::GetConfigValueInt32(char const* option) -{ - //Get db int from file - int32 dbint = TScriptConfig.GetIntDefault(option, 0); - - return dbint; -} - -float ScriptMgr::GetConfigValueFloat(char const* option) -{ - //Get db int from file - float dbfloat = TScriptConfig.GetFloatDefault(option, 0); - - return dbfloat; -} - void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget) { if (!pSource) diff --git a/src/game/ScriptMgr.h b/src/game/ScriptMgr.h index f9058ae8996..056dd712fdb 100644 --- a/src/game/ScriptMgr.h +++ b/src/game/ScriptMgr.h @@ -13,10 +13,6 @@ #include "DBCStructure.h" #include "Config/ConfigEnv.h" -#ifndef _TRINITY_SCRIPT_CONFIG -# define _TRINITY_SCRIPT_CONFIG sConfig.GetFilename().c_str() -#endif _TRINITY_SCRIPT_CONFIG - class Player; class Creature; class CreatureAI; @@ -101,14 +97,10 @@ class ScriptMgr ScriptMgr(); ~ScriptMgr(); - void ScriptsInit(char const* cfg_file = _TRINITY_SCRIPT_CONFIG); + void ScriptsInit(); void LoadDatabase(); char const* ScriptsVersion(); - std::string GetConfigValueStr(char const* option); - int32 GetConfigValueInt32(char const* option); - float GetConfigValueFloat(char const* option); - //event handlers void OnLogin(Player *pPlayer); void OnLogout(Player *pPlayer); @@ -163,15 +155,7 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit *pTarget = NULL); #else #define FUNC_PTR(name, callconvention, returntype, parameters) typedef returntype(callconvention *name)parameters; #endif -/* -#ifdef WIN32 - #define TRINITY_DLL_EXPORT extern "C" __declspec(dllexport) -#elif defined( __GNUC__ ) -#define TRINITY_DLL_EXPORT extern "C" -#else -#define TRINITY_DLL_EXPORT extern "C" export -#endif -*/ + #define sScriptMgr Trinity::Singleton<ScriptMgr>::Instance() #endif diff --git a/src/game/ScriptSystem.cpp b/src/game/ScriptSystem.cpp index 261852b27de..ffa2c6dd404 100644 --- a/src/game/ScriptSystem.cpp +++ b/src/game/ScriptSystem.cpp @@ -24,8 +24,6 @@ #include "ObjectMgr.h" #include "Database/DatabaseEnv.h" -DatabaseType TScriptDB; - SystemMgr::SystemMgr() { } @@ -39,7 +37,7 @@ SystemMgr& SystemMgr::Instance() void SystemMgr::LoadVersion() { //Get Version information - QueryResult_AutoPtr Result = TScriptDB.PQuery("SELECT script_version FROM version LIMIT 1"); + QueryResult_AutoPtr Result = WorldDatabase.PQuery("SELECT script_version FROM version LIMIT 1"); if (Result) { @@ -58,9 +56,9 @@ void SystemMgr::LoadVersion() void SystemMgr::LoadScriptTexts() { outstring_log("TSCR: Loading Script Texts..."); - LoadTrinityStrings(TScriptDB,"script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2)); + LoadTrinityStrings(WorldDatabase,"script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2)); - QueryResult_AutoPtr Result = TScriptDB.PQuery("SELECT entry, sound, type, language, emote FROM script_texts"); + QueryResult_AutoPtr Result = WorldDatabase.PQuery("SELECT entry, sound, type, language, emote FROM script_texts"); outstring_log("TSCR: Loading Script Texts additional data..."); @@ -124,9 +122,9 @@ void SystemMgr::LoadScriptTexts() void SystemMgr::LoadScriptTextsCustom() { outstring_log("TSCR: Loading Custom Texts..."); - LoadTrinityStrings(TScriptDB,"custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3)); + LoadTrinityStrings(WorldDatabase,"custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3)); - QueryResult_AutoPtr Result = TScriptDB.PQuery("SELECT entry, sound, type, language, emote FROM custom_texts"); + QueryResult_AutoPtr Result = WorldDatabase.PQuery("SELECT entry, sound, type, language, emote FROM custom_texts"); outstring_log("TSCR: Loading Custom Texts additional data..."); @@ -195,13 +193,13 @@ void SystemMgr::LoadScriptWaypoints() uint64 uiCreatureCount = 0; // Load Waypoints - QueryResult_AutoPtr Result = TScriptDB.PQuery("SELECT COUNT(entry) FROM script_waypoint GROUP BY entry"); + QueryResult_AutoPtr Result = WorldDatabase.PQuery("SELECT COUNT(entry) FROM script_waypoint GROUP BY entry"); if (Result) uiCreatureCount = Result->GetRowCount(); outstring_log("TSCR: Loading Script Waypoints for %u creature(s)...", uiCreatureCount); - Result = TScriptDB.PQuery("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid"); + Result = WorldDatabase.PQuery("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid"); if (Result) { diff --git a/src/game/ScriptSystem.h b/src/game/ScriptSystem.h index 479f856514a..f78cd2e64fa 100644 --- a/src/game/ScriptSystem.h +++ b/src/game/ScriptSystem.h @@ -5,8 +5,6 @@ #ifndef SC_SYSTEM_H #define SC_SYSTEM_H -extern DatabaseType TScriptDB; - #define TEXT_SOURCE_RANGE -1000000 //the amount of entries each text source has available //TODO: find better namings and definitions. diff --git a/src/game/ScriptedCreature.cpp b/src/game/ScriptedCreature.cpp index 103a8364026..8078d543cb9 100644 --- a/src/game/ScriptedCreature.cpp +++ b/src/game/ScriptedCreature.cpp @@ -540,7 +540,7 @@ enum eNPCs }; // Hacklike storage used for misc creatures that are expected to evade of outside of a certain area. -// It is assumed the information is found elswehere and can be handled by mangos. So far no luck finding such information/way to extract it. +// It is assumed the information is found elswehere and can be handled by the core. So far no luck finding such information/way to extract it. bool ScriptedAI::EnterEvadeIfOutOfCombatArea(const uint32 uiDiff) { if (m_uiEvadeCheckCooldown <= uiDiff) diff --git a/src/game/ScriptedCreature.h b/src/game/ScriptedCreature.h index 78aa132474e..9174db84435 100644 --- a/src/game/ScriptedCreature.h +++ b/src/game/ScriptedCreature.h @@ -40,7 +40,7 @@ class SummonList : public std::list<uint64> Creature *m_creature; }; -struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI +struct ScriptedAI : public CreatureAI { explicit ScriptedAI(Creature* pCreature); virtual ~ScriptedAI() {} @@ -233,7 +233,7 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI Difficulty m_difficulty; }; -struct TRINITY_DLL_DECL Scripted_NoMovementAI : public ScriptedAI +struct Scripted_NoMovementAI : public ScriptedAI { Scripted_NoMovementAI(Creature* creature) : ScriptedAI(creature) {} virtual ~Scripted_NoMovementAI() {} @@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL Scripted_NoMovementAI : public ScriptedAI void AttackStart(Unit* who); }; -struct TRINITY_DLL_DECL BossAI : public ScriptedAI +struct BossAI : public ScriptedAI { BossAI(Creature *c, uint32 id); virtual ~BossAI() {} diff --git a/src/game/ScriptedEscortAI.h b/src/game/ScriptedEscortAI.h index bdb3a5ac011..8901d4da40c 100644 --- a/src/game/ScriptedEscortAI.h +++ b/src/game/ScriptedEscortAI.h @@ -35,7 +35,7 @@ enum eEscortState STATE_ESCORT_PAUSED = 0x004 //will not proceed with waypoints before state is removed }; -struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI +struct npc_escortAI : public ScriptedAI { public: explicit npc_escortAI(Creature* pCreature); diff --git a/src/game/ScriptedFollowerAI.h b/src/game/ScriptedFollowerAI.h index 3ec47ee663a..d352141e3e9 100644 --- a/src/game/ScriptedFollowerAI.h +++ b/src/game/ScriptedFollowerAI.h @@ -18,7 +18,7 @@ enum eFollowState STATE_FOLLOW_POSTEVENT = 0x020 //can be set at complete and allow post event to run }; -class TRINITY_DLL_DECL FollowerAI : public ScriptedAI +class FollowerAI : public ScriptedAI { public: explicit FollowerAI(Creature* pCreature); diff --git a/src/game/ScriptedGuardAI.h b/src/game/ScriptedGuardAI.h index a7fff32e3ab..3bb43871a42 100644 --- a/src/game/ScriptedGuardAI.h +++ b/src/game/ScriptedGuardAI.h @@ -7,7 +7,7 @@ #define GENERIC_CREATURE_COOLDOWN 5000 -struct TRINITY_DLL_DECL guardAI : public ScriptedAI +struct guardAI : public ScriptedAI { public: explicit guardAI(Creature* pCreature); @@ -28,14 +28,14 @@ struct TRINITY_DLL_DECL guardAI : public ScriptedAI void DoReplyToTextEmote(uint32 em); }; -struct TRINITY_DLL_DECL guardAI_orgrimmar : public guardAI +struct guardAI_orgrimmar : public guardAI { guardAI_orgrimmar(Creature *c) : guardAI(c) {} void ReceiveEmote(Player *player, uint32 text_emote); }; -struct TRINITY_DLL_DECL guardAI_stormwind : public guardAI +struct guardAI_stormwind : public guardAI { guardAI_stormwind(Creature *c) : guardAI(c) {} diff --git a/src/game/ScriptedPch.h b/src/game/ScriptedPch.h index 8a5e4bff428..50e5b939034 100644 --- a/src/game/ScriptedPch.h +++ b/src/game/ScriptedPch.h @@ -25,13 +25,7 @@ #ifdef WIN32 #include <windows.h> -/*BOOL APIENTRY DllMain( HANDLE hModule, -DWORD ul_reason_for_call, -LPVOID lpReserved -) -{ - return true; -}*/ + #endif #endif diff --git a/src/game/ScriptedSimpleAI.h b/src/game/ScriptedSimpleAI.h index 3a2e8a9341a..c67cf842ead 100644 --- a/src/game/ScriptedSimpleAI.h +++ b/src/game/ScriptedSimpleAI.h @@ -19,7 +19,7 @@ enum CastTarget CAST_JUSTDIED_KILLER, //Only works within JustDied function }; -struct TRINITY_DLL_DECL SimpleAI : public ScriptedAI +struct SimpleAI : public ScriptedAI { SimpleAI(Creature *c);// : ScriptedAI(c); diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 6cbb9b16e48..ad2a6c867be 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -49,7 +49,6 @@ #include "Util.h" #include "TemporarySummon.h" #include "Vehicle.h" -#include "ScriptCalls.h" #include "SpellAuraEffects.h" #include "SpellId.h" #include "ScriptMgr.h" diff --git a/src/game/Spell.h b/src/game/Spell.h index 004011f985e..043921a0e31 100644 --- a/src/game/Spell.h +++ b/src/game/Spell.h @@ -428,7 +428,7 @@ class Spell void CheckSrc() { if(!m_targets.HasSrc()) m_targets.setSrc(m_caster); } void CheckDst() { if(!m_targets.HasDst()) m_targets.setDst(m_caster); } - static void TRINITY_DLL_SPEC SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 cast_count, SpellCastResult result); + static void SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 cast_count, SpellCastResult result); void SendCastResult(SpellCastResult result); void SendSpellStart(); void SendSpellGo(); @@ -664,7 +664,7 @@ class Spell namespace Trinity { - struct TRINITY_DLL_DECL SpellNotifierCreatureAndPlayer + struct SpellNotifierCreatureAndPlayer { std::list<Unit*> *i_data; SpellNotifyPushType i_push_type; diff --git a/src/game/SpellAuraEffects.cpp b/src/game/SpellAuraEffects.cpp index 15d8084b828..30e019d669d 100644 --- a/src/game/SpellAuraEffects.cpp +++ b/src/game/SpellAuraEffects.cpp @@ -34,7 +34,6 @@ #include "BattleGround.h" #include "OutdoorPvPMgr.h" #include "Formulas.h" -#include "ScriptCalls.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "CellImpl.h" diff --git a/src/game/SpellAuraEffects.h b/src/game/SpellAuraEffects.h index 87d56b6d275..284f863f353 100644 --- a/src/game/SpellAuraEffects.h +++ b/src/game/SpellAuraEffects.h @@ -20,7 +20,7 @@ class Aura; typedef void(AuraEffect::*pAuraEffectHandler)(AuraApplication const * aurApp, uint8 mode, bool apply) const; -class TRINITY_DLL_SPEC AuraEffect +class AuraEffect { friend Aura::Aura(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID); friend Aura::~Aura(); diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 9ced669238d..3ca24609a3e 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -206,38 +206,6 @@ void AuraApplication::ClientUpdate(bool remove) m_target->SendMessageToSet(&data, true); } -void AuraApplication::ConstructAuraInfo(ByteBuffer &data) -{ - m_needClientUpdate = false; - - data << uint8(m_slot); - - if(!m_target->GetVisibleAura(m_slot)) - { - data << uint32(0); - sLog.outDebug("Aura %u removed slot %u",GetBase()->GetId(), m_slot); - return; - } - - Aura const * aura = GetBase(); - data << uint32(aura->GetId()); - uint32 flags = m_flags; - if (aura->GetMaxDuration() > 0) - flags |= AFLAG_DURATION; - data << uint8(flags); - data << uint8(aura->GetCasterLevel()); - data << uint8(aura->GetStackAmount() > 1 ? aura->GetStackAmount() : (aura->GetCharges()) ? aura->GetCharges() : 1); - - if(!(flags & AFLAG_CASTER)) - data.appendPackGUID(aura->GetCasterGUID()); - - if(flags & AFLAG_DURATION) - { - data << uint32(aura->GetMaxDuration()); - data << uint32(aura->GetDuration()); - } -} - Aura * Aura::TryCreate(SpellEntry const* spellproto, uint8 tryEffMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID) { assert(spellproto); diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index 7289b5c4d36..f6cd3804d53 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -23,7 +23,7 @@ #include "SpellAuraDefines.h" -class Unit; +class Unit; struct SpellEntry; struct SpellModifier; struct ProcTriggerSpell; @@ -75,10 +75,9 @@ class AuraApplication void SetNeedClientUpdate() { m_needClientUpdate = true;} bool IsNeedClientUpdate() const { return m_needClientUpdate;} void ClientUpdate(bool remove = false); - void ConstructAuraInfo(ByteBuffer &); }; -class TRINITY_DLL_SPEC Aura +class Aura { public: typedef std::map<uint64, AuraApplication *> ApplicationMap; @@ -192,7 +191,7 @@ class TRINITY_DLL_SPEC Aura Unit::AuraApplicationList m_removedApplications; }; -class TRINITY_DLL_SPEC UnitAura : public Aura +class UnitAura : public Aura { friend Aura * Aura::Create(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID); protected: @@ -213,7 +212,7 @@ class TRINITY_DLL_SPEC UnitAura : public Aura DiminishingGroup m_AuraDRGroup:8; // Diminishing }; -class TRINITY_DLL_SPEC DynObjAura : public Aura +class DynObjAura : public Aura { friend Aura * Aura::Create(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID); protected: diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 63ec61ad826..be7a3606086 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -56,7 +56,6 @@ #include "SocialMgr.h" #include "Util.h" #include "TemporarySummon.h" -#include "ScriptCalls.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" @@ -239,7 +238,7 @@ void Spell::EffectNULL(uint32 /*i*/) void Spell::EffectUnused(uint32 /*i*/) { - // NOT USED BY ANY SPELL OR USELESS OR IMPLEMENTED IN DIFFERENT WAY IN MANGOS + // NOT USED BY ANY SPELL OR USELESS OR IMPLEMENTED IN DIFFERENT WAY IN TRINITY } void Spell::EffectResurrectNew(uint32 i) diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index 7abb9820d71..74e29ec0b3c 100644 --- a/src/game/SpellHandler.cpp +++ b/src/game/SpellHandler.cpp @@ -27,7 +27,6 @@ #include "Log.h" #include "Opcodes.h" #include "Spell.h" -#include "ScriptCalls.h" #include "Totem.h" #include "TemporarySummon.h" #include "SpellAuras.h" diff --git a/src/game/TargetedMovementGenerator.h b/src/game/TargetedMovementGenerator.h index 9675eb82235..a4f45d1ef8a 100644 --- a/src/game/TargetedMovementGenerator.h +++ b/src/game/TargetedMovementGenerator.h @@ -26,7 +26,7 @@ #include "Traveller.h" #include "FollowerReference.h" -class TRINITY_DLL_SPEC TargetedMovementGeneratorBase +class TargetedMovementGeneratorBase { public: TargetedMovementGeneratorBase(Unit &target) { i_target.link(&target, this); } @@ -36,7 +36,7 @@ class TRINITY_DLL_SPEC TargetedMovementGeneratorBase }; template<class T> -class TRINITY_DLL_SPEC TargetedMovementGenerator +class TargetedMovementGenerator : public MovementGeneratorMedium< T, TargetedMovementGenerator<T> >, public TargetedMovementGeneratorBase { public: diff --git a/src/game/TemporarySummon.h b/src/game/TemporarySummon.h index b0206875b1a..e3e364cb531 100644 --- a/src/game/TemporarySummon.h +++ b/src/game/TemporarySummon.h @@ -23,7 +23,7 @@ #include "Creature.h" -class TRINITY_DLL_SPEC TempSummon : public Creature +class TempSummon : public Creature { public: explicit TempSummon(SummonPropertiesEntry const *properties, Unit *owner); diff --git a/src/game/ThreatManager.h b/src/game/ThreatManager.h index 6865453ae44..e7e51ad40d7 100644 --- a/src/game/ThreatManager.h +++ b/src/game/ThreatManager.h @@ -47,7 +47,7 @@ class ThreatCalcHelper }; //============================================================== -class TRINITY_DLL_SPEC HostilReference : public Reference<Unit, ThreatManager> +class HostilReference : public Reference<Unit, ThreatManager> { public: HostilReference(Unit* pUnit, ThreatManager *pThreatManager, float fThreat); @@ -147,7 +147,7 @@ class TRINITY_DLL_SPEC HostilReference : public Reference<Unit, ThreatManager> //============================================================== class ThreatManager; -class TRINITY_DLL_SPEC ThreatContainer +class ThreatContainer { private: std::list<HostilReference*> iThreatList; @@ -185,7 +185,7 @@ class TRINITY_DLL_SPEC ThreatContainer //================================================= -class TRINITY_DLL_SPEC ThreatManager +class ThreatManager { public: friend class HostilReference; diff --git a/src/game/TicketHandler.cpp b/src/game/TicketHandler.cpp index 2322084afbd..e766cb2763e 100644 --- a/src/game/TicketHandler.cpp +++ b/src/game/TicketHandler.cpp @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * - * Copyright (C) 2008-2010 Trinity + * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/game/TotemAI.h b/src/game/TotemAI.h index b61bb623afc..34f4dfa9945 100644 --- a/src/game/TotemAI.h +++ b/src/game/TotemAI.h @@ -27,7 +27,7 @@ class Creature; class Totem; -class TRINITY_DLL_DECL TotemAI : public CreatureAI +class TotemAI : public CreatureAI { public: diff --git a/src/game/Traveller.h b/src/game/Traveller.h index 3eb63879d80..a419fbda126 100644 --- a/src/game/Traveller.h +++ b/src/game/Traveller.h @@ -31,7 +31,7 @@ #define PLAYER_FLIGHT_SPEED 32.0f template<class T> -struct TRINITY_DLL_DECL Traveller +struct Traveller { T &i_traveller; Traveller(T &t) : i_traveller(t) {} diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 2b194a42f1f..e315f70cd30 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -54,7 +54,6 @@ #include "TemporarySummon.h" #include "Vehicle.h" #include "Transports.h" -#include "ScriptCalls.h" #include "SpellId.h" #include <math.h> diff --git a/src/game/Unit.h b/src/game/Unit.h index 4ef9adca1e9..45644700b04 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1075,7 +1075,7 @@ enum ReactiveType struct SpellProcEventEntry; // used only privately -class TRINITY_DLL_SPEC Unit : public WorldObject +class Unit : public WorldObject { public: typedef std::set<Unit*> AttackerSet; diff --git a/src/game/UnitAI.h b/src/game/UnitAI.h index 84c7d51b452..6e4f80c0b35 100644 --- a/src/game/UnitAI.h +++ b/src/game/UnitAI.h @@ -39,7 +39,7 @@ enum SelectAggroTarget SELECT_TARGET_FARTHEST, }; -class TRINITY_DLL_SPEC UnitAI +class UnitAI { protected: Unit * const me; @@ -86,7 +86,7 @@ class TRINITY_DLL_SPEC UnitAI static void FillAISpellInfo(); }; -class TRINITY_DLL_SPEC PlayerAI : public UnitAI +class PlayerAI : public UnitAI { protected: Player* const me; @@ -96,7 +96,7 @@ class TRINITY_DLL_SPEC PlayerAI : public UnitAI void OnCharmed(bool apply); }; -class TRINITY_DLL_SPEC SimpleCharmedAI : public PlayerAI +class SimpleCharmedAI : public PlayerAI { public: void UpdateAI(const uint32 diff); diff --git a/src/game/UnitEvents.h b/src/game/UnitEvents.h index 2f6499c48f3..69c66fe34b0 100644 --- a/src/game/UnitEvents.h +++ b/src/game/UnitEvents.h @@ -69,7 +69,7 @@ enum UNIT_EVENT_TYPE //============================================================== -class TRINITY_DLL_SPEC UnitBaseEvent +class UnitBaseEvent { private: uint32 iType; @@ -84,7 +84,7 @@ class TRINITY_DLL_SPEC UnitBaseEvent //============================================================== -class TRINITY_DLL_SPEC ThreatRefStatusChangeEvent : public UnitBaseEvent +class ThreatRefStatusChangeEvent : public UnitBaseEvent { private: HostilReference* iHostilReference; @@ -121,7 +121,7 @@ class TRINITY_DLL_SPEC ThreatRefStatusChangeEvent : public UnitBaseEvent //============================================================== -class TRINITY_DLL_SPEC ThreatManagerEvent : public ThreatRefStatusChangeEvent +class ThreatManagerEvent : public ThreatRefStatusChangeEvent { private: ThreatContainer* iThreatContainer; diff --git a/src/game/Vehicle.h b/src/game/Vehicle.h index 79270d269be..c8b12f9f6cb 100644 --- a/src/game/Vehicle.h +++ b/src/game/Vehicle.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOSSERVER_VEHICLE_H -#define MANGOSSERVER_VEHICLE_H +#ifndef __TRINITY_VEHICLE_H +#define __TRINITY_VEHICLE_H #include "ObjectDefines.h" @@ -40,7 +40,7 @@ struct VehicleSeat typedef std::map<int8, VehicleSeat> SeatMap; -class TRINITY_DLL_SPEC Vehicle +class Vehicle { public: explicit Vehicle(Unit *unit, VehicleEntry const *vehInfo); diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h index 70208966217..f9a47a681e6 100644 --- a/src/game/WaypointMovementGenerator.h +++ b/src/game/WaypointMovementGenerator.h @@ -42,7 +42,7 @@ #define STOP_TIME_FOR_PLAYER 3 * MINUTE * IN_MILISECONDS // 3 Minutes template<class T, class P = Path> -class TRINITY_DLL_SPEC PathMovementBase +class PathMovementBase { public: PathMovementBase() : i_currentNode(0) {} @@ -62,7 +62,7 @@ class TRINITY_DLL_SPEC PathMovementBase template<class T> -class TRINITY_DLL_SPEC WaypointMovementGenerator +class WaypointMovementGenerator : public MovementGeneratorMedium< T, WaypointMovementGenerator<T> >, public PathMovementBase<T> { public: @@ -90,7 +90,7 @@ class TRINITY_DLL_SPEC WaypointMovementGenerator /** FlightPathMovementGenerator generates movement of the player for the paths * and hence generates ground and activities for the player. */ -class TRINITY_DLL_SPEC FlightPathMovementGenerator +class FlightPathMovementGenerator : public MovementGeneratorMedium< Player, FlightPathMovementGenerator >, public PathMovementBase<Player> { diff --git a/src/game/World.cpp b/src/game/World.cpp index f23d4a23d22..9b92a4f56fa 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -47,7 +47,6 @@ #include "LootMgr.h" #include "ItemEnchantmentMgr.h" #include "MapManager.h" -#include "ScriptCalls.h" #include "CreatureAIRegistry.h" #include "Policies/SingletonImp.h" #include "BattleGroundMgr.h" @@ -1584,7 +1583,7 @@ void World::SetInitialWorldSettings() CreatureEAI_Mgr.LoadCreatureEventAI_Scripts(); sLog.outString("Initializing Scripts..."); - LoadScriptingModule(); + sScriptMgr.ScriptsInit(); ///- Initialize game time and timers sLog.outDebug("DEBUG:: Initialize game time and timers"); diff --git a/src/game/World.h b/src/game/World.h index ce680e10711..e18d1803a3d 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -630,10 +630,6 @@ class World char const* GetDBVersion() { return m_DBVersion.c_str(); } char const* GetCreatureEventAIVersion() { return m_CreatureEventAIVersion.c_str(); } - //used Script version - void SetScriptsVersion(char const* version) { m_ScriptsVersion = version ? version : "unknown scripting library"; } - char const* GetScriptsVersion() { return m_ScriptsVersion.c_str(); } - void RecordTimeDiff(const char * text, ...); void LoadAutobroadcasts(); @@ -729,7 +725,6 @@ class World //used versions std::string m_DBVersion; std::string m_CreatureEventAIVersion; - std::string m_ScriptsVersion; std::list<std::string> m_Autobroadcasts; }; diff --git a/src/game/WorldLog.h b/src/game/WorldLog.h index 0bd2a3b8b55..4ee9bb178ec 100644 --- a/src/game/WorldLog.h +++ b/src/game/WorldLog.h @@ -32,7 +32,7 @@ #include <stdarg.h> /// %Log packets to a file -class TRINITY_DLL_DECL WorldLog : public Trinity::Singleton<WorldLog, Trinity::ClassLevelLockable<WorldLog, ACE_Thread_Mutex> > +class WorldLog : public Trinity::Singleton<WorldLog, Trinity::ClassLevelLockable<WorldLog, ACE_Thread_Mutex> > { friend class Trinity::OperatorNew<WorldLog>; WorldLog(); diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index c87421e4d59..ddf0c9173bd 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -41,7 +41,6 @@ #include "MapManager.h" #include "SocialMgr.h" #include "zlib/zlib.h" -#include "ScriptCalls.h" #include "ScriptMgr.h" /// WorldSession constructor diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index 2d03bde4996..a6019d8112c 100644 --- a/src/game/WorldSession.h +++ b/src/game/WorldSession.h @@ -95,7 +95,7 @@ enum PartyResult }; /// Player session in the World -class TRINITY_DLL_SPEC WorldSession +class WorldSession { friend class CharacterHandler; public: diff --git a/src/game/ZoneScript.h b/src/game/ZoneScript.h index ed4db98b8b9..148ca994af0 100644 --- a/src/game/ZoneScript.h +++ b/src/game/ZoneScript.h @@ -26,7 +26,7 @@ class Creature; class GameObject; -class TRINITY_DLL_SPEC ZoneScript +class ZoneScript { public: explicit ZoneScript() {} |