diff options
| author | Seline <none@none> | 2008-10-14 11:57:03 -0500 |
|---|---|---|
| committer | Seline <none@none> | 2008-10-14 11:57:03 -0500 |
| commit | 2265aef916e3b2d63d87faa68a2b51e7d747c54c (patch) | |
| tree | b05420685b7d202aade6f70a6f511adbfb79e37f /src/game/InstanceSaveMgr.h | |
| parent | 222cbfd4644412fb8e5aeed7c37c88797d09964a (diff) | |
[svn] * Merge Temp dev SVN with Assembla.
* Changes include:
- Implementation of w12x's Outdoor PvP and Game Event Systems.
- Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed).
- All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql).
- Improved Config cleanup.
- And many more changes.
--HG--
branch : trunk
Diffstat (limited to 'src/game/InstanceSaveMgr.h')
| -rw-r--r-- | src/game/InstanceSaveMgr.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h index 961e915eb11..9fa542c3571 100644 --- a/src/game/InstanceSaveMgr.h +++ b/src/game/InstanceSaveMgr.h @@ -1,5 +1,8 @@ /* - * Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/> +/* Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * * * 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 @@ -8,12 +11,12 @@ * * 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 + * 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 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __InstanceSaveMgr_H @@ -110,7 +113,7 @@ class InstanceSave bool m_canReset; }; -class MANGOS_DLL_DECL InstanceSaveManager : public MaNGOS::Singleton<InstanceSaveManager, MaNGOS::ClassLevelLockable<InstanceSaveManager, ZThread::Mutex> > +class TRINITY_DLL_DECL InstanceSaveManager : public Trinity::Singleton<InstanceSaveManager, Trinity::ClassLevelLockable<InstanceSaveManager, ZThread::Mutex> > { friend class InstanceSave; public: @@ -168,5 +171,5 @@ class MANGOS_DLL_DECL InstanceSaveManager : public MaNGOS::Singleton<InstanceSav ResetTimeQueue m_resetTimeQueue; }; -#define sInstanceSaveManager MaNGOS::Singleton<InstanceSaveManager>::Instance() +#define sInstanceSaveManager Trinity::Singleton<InstanceSaveManager>::Instance() #endif |