A great purge of obsolete macros.

--HG--
branch : trunk

src/framework/Dynamic/FactoryHolder.h

@@ -29,7 +29,7 @@
 /** FactoryHolder holds a factory object of a specific type
  */
 template<class T, class Key = std::string>
-class TRINITY_DLL_DECL FactoryHolder
+class FactoryHolder
 {
     public:
         typedef ObjectRegistry<FactoryHolder<T, Key >, Key > FactoryHolderRegistry;

src/framework/Dynamic/ObjectRegistry.h

@@ -32,7 +32,7 @@
 /** ObjectRegistry holds all registry item of the same type
  */
 template<class T, class Key = std::string>
-class TRINITY_DLL_DECL ObjectRegistry
+class ObjectRegistry
 {
     public:
         typedef std::map<Key, T *> RegistryMapType;

src/framework/GameSystem/Grid.h

@@ -47,7 +47,7 @@ class WORLD_OBJECT_TYPES,
 class GRID_OBJECT_TYPES,
 class ThreadModel = Trinity::SingleThreaded<ACTIVE_OBJECT>
 >
-class TRINITY_DLL_DECL Grid
+class Grid
 {
     // allows the GridLoader to access its internals
     template<class A, class T, class O> friend class GridLoader;

src/framework/GameSystem/GridLoader.h

@@ -42,7 +42,7 @@ class ACTIVE_OBJECT,
 class WORLD_OBJECT_TYPES,
 class GRID_OBJECT_TYPES
 >
-class TRINITY_DLL_DECL GridLoader
+class GridLoader
 {
     public:
 

src/framework/GameSystem/GridReference.h

@@ -27,7 +27,7 @@ template<class OBJECT>
 class GridRefManager;
 
 template<class OBJECT>
-class TRINITY_DLL_SPEC GridReference : public Reference<GridRefManager<OBJECT>, OBJECT>
+class GridReference : public Reference<GridRefManager<OBJECT>, OBJECT>
 {
     protected:
         void targetObjectBuildLink()

src/framework/GameSystem/NGrid.h

@@ -70,7 +70,7 @@ class WORLD_OBJECT_TYPES,
 class GRID_OBJECT_TYPES,
 class ThreadModel = Trinity::SingleThreaded<ACTIVE_OBJECT>
 >
-class TRINITY_DLL_DECL NGrid
+class NGrid
 {
     public:
 

src/framework/GameSystem/TypeContainer.h

@@ -97,7 +97,7 @@ template<class H, class T> struct ContainerList<TypeList<H, T> >
  */
 
 template<class OBJECT_TYPES>
-class TRINITY_DLL_DECL TypeMapContainer
+class TypeMapContainer
 {
     public:
         template<class SPECIFIC_TYPE> size_t Count() const { return Trinity::Count(i_elements, (SPECIFIC_TYPE*)NULL); }

src/framework/GameSystem/TypeContainerVisitor.h

@@ -97,7 +97,7 @@ template<class VISITOR, class OBJECT_TYPES> void VisitorHelper(VISITOR &v, TypeM
 }
 
 template<class VISITOR, class TYPE_CONTAINER>
-class TRINITY_DLL_DECL TypeContainerVisitor
+class TypeContainerVisitor
 {
     public:
         TypeContainerVisitor(VISITOR &v) : i_visitor(v) {}

src/framework/Platform/Define.h

@@ -40,21 +40,9 @@
 #endif //TRINITY_ENDIAN
 
 #if PLATFORM == PLATFORM_WINDOWS
-#  define TRINITY_EXPORT __declspec(dllexport)
-#  define TRINITY_LIBRARY_HANDLE HMODULE
-#  define TRINITY_LOAD_LIBRARY(a) LoadLibrary(a)
-#  define TRINITY_CLOSE_LIBRARY FreeLibrary
-#  define TRINITY_GET_PROC_ADDR GetProcAddress
 #  define TRINITY_IMPORT __cdecl
-#  define TRINITY_SCRIPT_EXT ".dll"
-#  define TRINITY_SCRIPT_NAME "TrinityScript"
 #  define TRINITY_PATH_MAX MAX_PATH
 #else //PLATFORM != PLATFORM_WINDOWS
-#  define TRINITY_LIBRARY_HANDLE void*
-#  define TRINITY_EXPORT export
-#  define TRINITY_LOAD_LIBRARY(a) dlopen(a,RTLD_NOW)
-#  define TRINITY_CLOSE_LIBRARY dlclose
-#  define TRINITY_GET_PROC_ADDR dlsym
 #  if defined(__APPLE_CC__) && defined(BIG_ENDIAN)
 #    define TRINITY_IMPORT __attribute__ ((longcall))
 #  elif defined(__x86_64__)
@@ -62,45 +50,15 @@
 #  else
 #    define TRINITY_IMPORT __attribute__ ((cdecl))
 #  endif //__APPLE_CC__ && BIG_ENDIAN
-#  if defined(__APPLE_CC__)
-#    define TRINITY_SCRIPT_EXT ".dylib"
-#    if defined(DO_SCRIPTS)
-#      define TRINITY_SCRIPT_NAME "../lib/libtrinityscript"
-#    else
-#      define TRINITY_SCRIPT_NAME "../lib/libtrinityinterface"
-#    endif // DO_SCRIPTS
-#  else
-#    define TRINITY_SCRIPT_EXT ".so"
-#    if defined(DO_SCRIPTS)
-#      define TRINITY_SCRIPT_NAME "libtrinityscript"
-#    else
-#      define TRINITY_SCRIPT_NAME "libtrinityinterface"
-#    endif // DO_SCRIPTS
-#  endif //__APPLE_CC__
 #  define TRINITY_PATH_MAX PATH_MAX
 #endif //PLATFORM
 
-#if PLATFORM == PLATFORM_WINDOWS
-#  ifdef TRINITY_WIN32_DLL_IMPORT
-#    define TRINITY_DLL_DECL __declspec(dllimport)
-#  else //!TRINITY_WIN32_DLL_IMPORT
-#    ifdef TRINITY_WIND_DLL_EXPORT
-#      define TRINITY_DLL_DECL __declspec(dllexport)
-#    else //!TRINITY_WIND_DLL_EXPORT
-#      define TRINITY_DLL_DECL
-#    endif //TRINITY_WIND_DLL_EXPORT
-#  endif //TRINITY_WIN32_DLL_IMPORT
-#else //PLATFORM != PLATFORM_WINDOWS
-#  define TRINITY_DLL_DECL
-#endif //PLATFORM
 
 #if PLATFORM == PLATFORM_WINDOWS
-#  define TRINITY_DLL_SPEC __declspec(dllexport)
 #  ifndef DECLSPEC_NORETURN
 #    define DECLSPEC_NORETURN __declspec(noreturn)
 #  endif //DECLSPEC_NORETURN
 #else //PLATFORM != PLATFORM_WINDOWS
-#  define TRINITY_DLL_SPEC
 #  define DECLSPEC_NORETURN
 #endif //PLATFORM
 
@@ -137,26 +95,8 @@ typedef uint32      DWORD;
 
 typedef uint64 OBJECT_HANDLE;
 
-//commented out
-//so all future merges with invalid style will drop build errors
-//this way devs will at least read thru what they merge to find the error
-
-//#define MaNGOS              Trinity
-//#define MANGOS_DLL_DECL     TRINITY_DLL_DECL
-//#define MANGOS_DLL_SPEC     TRINITY_DLL_SPEC
-//#define GetMangosString     GetTrinityString
-
-#if defined(MANGOS_DEBUG) || defined(TRINITY_DEBUG)
-#  ifndef TRINITY_DEBUG
-#    define TRINITY_DEBUG
-#  endif
-#  ifndef MANGOS_DEBUG
-#    define MANGOS_DEBUG
-#  endif
-#endif
-
 #ifndef CLIENT_VER
-#define CLIENT_VER 313
+#define CLIENT_VER 322
 #endif
 
 #endif //TRINITY_DEFINE_H

src/framework/Policies/CreationPolicy.h

@@ -30,7 +30,7 @@ namespace Trinity
      * OperatorNew policy creates an object on the heap using new.
      */
     template <class T>
-        class TRINITY_DLL_DECL OperatorNew
+        class OperatorNew
     {
         public:
             static T* Create(void) { return (new T); }
@@ -42,7 +42,7 @@ namespace Trinity
      * the first time call Create.
      */
     template <class T>
-        class TRINITY_DLL_DECL LocalStaticCreation
+        class LocalStaticCreation
     {
         union MaxAlign
         {
@@ -71,7 +71,7 @@ namespace Trinity
      * CreateUsingMalloc by pass the memory manger.
      */
     template<class T>
-        class TRINITY_DLL_DECL CreateUsingMalloc
+        class CreateUsingMalloc
     {
         public:
             static T* Create()
@@ -92,7 +92,7 @@ namespace Trinity
      * CreateOnCallBack creates the object base on the call back.
      */
     template<class T, class CALL_BACK>
-        class TRINITY_DLL_DECL CreateOnCallBack
+        class CreateOnCallBack
     {
         public:
             static T* Create()

src/framework/Policies/ObjectLifeTime.cpp

@@ -28,7 +28,7 @@ namespace Trinity
         std::atexit( (void (*)())p );
     }
 
-    void TRINITY_DLL_SPEC at_exit( void (*func)() )
+    void at_exit( void (*func)() )
     {
         external_wrapper((void*)func);
     }

src/framework/Policies/ObjectLifeTime.h

@@ -28,10 +28,10 @@ typedef void (* Destroyer)(void);
 
 namespace Trinity
 {
-    void TRINITY_DLL_SPEC at_exit( void (*func)() );
+    void at_exit( void (*func)() );
 
     template <class T>
-        class TRINITY_DLL_DECL ObjectLifeTime
+        class ObjectLifeTime
     {
         public:
             static void ScheduleCall(void (*destroyer)() )

src/framework/Policies/Singleton.h

@@ -38,7 +38,7 @@ namespace Trinity
         class CreatePolicy = Trinity::OperatorNew<T>,
         class LifeTimePolicy = Trinity::ObjectLifeTime<T>
         >
-        class TRINITY_DLL_DECL Singleton
+        class Singleton
     {
         public:
             static T& Instance();

src/framework/Policies/SingletonImp.h

@@ -71,22 +71,22 @@ Trinity::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySing
 }
 
 #define INSTANTIATE_SINGLETON_1(TYPE) \
-    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \
+    template class Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \
     template<> TYPE* Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \
     template<> bool Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_destroyed = false
 
 #define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \
-    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \
+    template class Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \
     template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \
     template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_destroyed = false
 
 #define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \
-    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeTime<TYPE> >; \
+    template class Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeTime<TYPE> >; \
     template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \
     template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeType<TYPE> >::si_destroyed = false
 
 #define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \
-    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >; \
+    template class Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >; \
     template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_instance = 0; \
     template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_destroyed = false
 #endif

src/framework/Policies/ThreadingModel.h

@@ -32,7 +32,7 @@ namespace Trinity
 {
     inline void Guard(void *) {}
 
-    template<typename MUTEX> class TRINITY_DLL_DECL GeneralLock
+    template<typename MUTEX> class GeneralLock
     {
         public:
             GeneralLock(MUTEX &m) : i_mutex(m)
@@ -51,7 +51,7 @@ namespace Trinity
     };
 
     template <class T>
-        class TRINITY_DLL_DECL SingleThreaded
+        class SingleThreaded
     {
         public:
 
@@ -69,7 +69,7 @@ namespace Trinity
 
     // object level lockable
     template<class T, class MUTEX>
-        class TRINITY_DLL_DECL ObjectLevelLockable
+        class ObjectLevelLockable
     {
         public:
             ObjectLevelLockable() : i_mtx() {}
@@ -98,7 +98,7 @@ namespace Trinity
     };
 
     template<class T, class MUTEX>
-        class TRINITY_DLL_DECL ClassLevelLockable
+        class ClassLevelLockable
     {
         public:
             class Lock;
@@ -125,6 +125,6 @@ namespace Trinity
 template<class T, class MUTEX> MUTEX Trinity::ClassLevelLockable<T, MUTEX>::si_mtx;
 
 #define INSTANTIATE_CLASS_MUTEX(CTYPE,MUTEX) \
-    template class TRINITY_DLL_DECL Trinity::ClassLevelLockable<CTYPE, MUTEX >
+    template class Trinity::ClassLevelLockable<CTYPE, MUTEX >
 #endif
 

src/framework/Utilities/CountedReference/Reference.h

@@ -42,7 +42,7 @@ template
 typename T,
 class THREADING_MODEL = Trinity::SingleThreaded<T>
 >
-class TRINITY_DLL_DECL Referencer
+class Referencer
 {
     typedef typename THREADING_MODEL::Lock Lock;
     typedef ReferenceHolder<T, THREADING_MODEL> ReferenceeHolder;

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>

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];

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
 {

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; }

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"

src/game/Chat.cpp

@@ -1185,7 +1185,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 +1194,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 +1219,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 +1228,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 +1245,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 +1263,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 +1281,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 +1289,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 +1501,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 +1514,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 +1640,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 +1672,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 +1680,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

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) {}

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);

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:

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:
 

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

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;

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

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:

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"

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;    }

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

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"

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";

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;

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:

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();

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();

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
 

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();

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;

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) {}

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;

src/game/GridNotifiersImpl.h

@@ -584,4 +584,4 @@ struct ObjectDistanceOrderReversed : public std::binary_function<const WorldObje
     }
 };
 
-#endif                                                      // MANGOS_GRIDNOTIFIERSIMPL_H
+#endif                                                      // TRINITY_GRIDNOTIFIERSIMPL_H

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:
 

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

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;

src/game/GuardAI.h

@@ -26,7 +26,7 @@
 
 class Creature;
 
-class TRINITY_DLL_DECL GuardAI : public CreatureAI
+class GuardAI : public CreatureAI
 {
     enum GuardState
     {

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:

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) :

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:
 

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:

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 );

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:

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);

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:

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>;

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()

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(){}

src/game/MiscHandler.cpp

@@ -207,7 +207,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 +359,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))
     {

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;

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)

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();

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>;

src/game/ObjectGridLoader.cpp

@@ -30,7 +30,7 @@
 #include "CellImpl.h"
 #include "CreatureAI.h"
 
-class TRINITY_DLL_DECL ObjectGridRespawnMover
+class ObjectGridRespawnMover
 {
     public:
         ObjectGridRespawnMover() {}

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) {}

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);
 }

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

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) {}

src/game/PetAI.h

@@ -27,7 +27,7 @@
 class Creature;
 class Spell;
 
-class TRINITY_DLL_DECL PetAI : public CreatureAI
+class PetAI : public CreatureAI
 {
     public:
 

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

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);

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:

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"

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

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:

src/game/ReactorAI.h

@@ -25,7 +25,7 @@
 
 class Unit;
 
-class TRINITY_DLL_DECL ReactorAI : public CreatureAI
+class ReactorAI : public CreatureAI
 {
     public:
 

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"

src/game/ScriptCalls.h

@@ -117,8 +117,6 @@ typedef struct
     scriptCallEffectDummyItem     EffectDummyItem;
     scriptCallGetAI GetAI;
     scriptCallCreateInstanceData CreateInstanceData;
-
-    TRINITY_LIBRARY_HANDLE hScriptsLib;
 }_ScriptSet,*ScriptsSet;
 #endif
 

src/game/ScriptMgr.h

@@ -163,15 +163,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
 

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)

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() {}

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);

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);

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) {}
 

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

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);
 

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;

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();

src/game/SpellAuras.h

@@ -23,7 +23,7 @@
 
 #include "SpellAuraDefines.h"
 
-class  Unit;
+class Unit;
 struct SpellEntry;
 struct SpellModifier;
 struct ProcTriggerSpell;
@@ -78,7 +78,7 @@ class AuraApplication
         void ConstructAuraInfo(ByteBuffer &);
 };
 
-class TRINITY_DLL_SPEC Aura
+class Aura
 {
     public:
         typedef std::map<uint64, AuraApplication *> ApplicationMap;
@@ -192,7 +192,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 +213,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:

src/game/SpellEffects.cpp

@@ -239,7 +239,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)

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:

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);

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;

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

src/game/TotemAI.h

@@ -27,7 +27,7 @@
 class Creature;
 class Totem;
 
-class TRINITY_DLL_DECL TotemAI : public CreatureAI
+class TotemAI : public CreatureAI
 {
     public:
 

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) {}

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;

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);