aboutsummaryrefslogtreecommitdiff
path: root/src/game/MapManager.h
diff options
context:
space:
mode:
authormegamage <none@none>2008-11-20 10:43:20 -0600
committermegamage <none@none>2008-11-20 10:43:20 -0600
commit85d28160134fc81d28304ffd3361a589a96b848a (patch)
tree778c3ab2a3cdd1c51d550abc23533e382f59f5a2 /src/game/MapManager.h
parent0b61584e1b19afb8dbef376a4e2903d8631bfc1d (diff)
*DB script table stucture change. Source Mangos. Also fix some bugs. Hopefully this rev will make program usable again.
--HG-- branch : trunk
Diffstat (limited to 'src/game/MapManager.h')
-rw-r--r--src/game/MapManager.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/MapManager.h b/src/game/MapManager.h
index 44197ccd84a..cba0a86d1a5 100644
--- a/src/game/MapManager.h
+++ b/src/game/MapManager.h
@@ -10,12 +10,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 TRINITY_MAPMANAGER_H
@@ -27,6 +27,7 @@
#include "Common.h"
#include "Map.h"
#include "GridStates.h"
+
class Transport;
class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinity::ClassLevelLockable<MapManager, ZThread::Mutex> >
@@ -44,7 +45,7 @@ class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinit
// only const version for outer users
Map const* GetBaseMap(uint32 id) const { return const_cast<MapManager*>(this)->_GetBaseMap(id); }
- void DeleteInstance(uint32 mapid, uint32 instanceId, uint8 mode);
+ void DeleteInstance(uint32 mapid, uint32 instanceId);
inline uint16 GetAreaFlag(uint32 mapid, float x, float y) const
{