mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 303

Browse source 
Conflicts:
	contrib/extractor/System.cpp
	contrib/extractor/ad.exe
	src/game/WorldSocket.cpp
This commit is contained in:
tomrus88 2008-11-06 15:50:47 +03:00
commit 78ec66babc
78 changed files with 510 additions and 752 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/MapManager.cpp
View file

@ -109,7 +109,7 @@ MapManager::_GetBaseMap(uint32 id)
const MapEntry* entry = sMapStore.LookupEntry(id);
if (entry && entry->IsDungeon())
{
m = new MapInstanced(id, i_gridCleanUpDelay, 0);
m = new MapInstanced(id, i_gridCleanUpDelay);
}
else
{
@ -221,7 +221,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
return true;
}
void MapManager::DeleteInstance(uint32 mapid, uint32 instanceId, uint8 mode)
void MapManager::DeleteInstance(uint32 mapid, uint32 instanceId)
{
Map *m = _GetBaseMap(mapid);
if (m && m->Instanceable())