josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*apply trinity style to whole source

Browse Source 
*comment out all mangos to trinity defines
*this will make merging a little harder, but code will be more clear

--HG--
branch : trunk
This commit is contained in:
Rat
2009-12-20 15:20:04 +01:00
parent baa264e615
commit 6fe36efe0f
49 changed files with 227 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/MapManager.h
+2 -2
View File
@@ -33,7 +33,7 @@ class Transport;
#define DEFAULT_VISIBILITY_NOTIFY_PERIOD 1000
class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::ClassLevelLockable<MapManager, ACE_Thread_Mutex> >
class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinity::ClassLevelLockable<MapManager, ACE_Thread_Mutex> >
{
friend class Trinity::OperatorNew<MapManager>;
@@ -149,7 +149,7 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
return (iter == i_maps.end() ? NULL : iter->second);
}
typedef MaNGOS::ClassLevelLockable<MapManager, ACE_Thread_Mutex>::Lock Guard;
typedef Trinity::ClassLevelLockable<MapManager, ACE_Thread_Mutex>::Lock Guard;
uint32 i_gridCleanUpDelay;
MapMapType i_maps;
IntervalTimer i_timer;