Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Instances: Fix crash and allocation issue in instance id generation

Browse Source
This commit is contained in:
leak
2011-03-11 13:24:58 +01:00
parent 3973d1b454
commit 190ef1c2ef
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Instances/InstanceSaveMgr.cpp
View File

@@ -560,7 +560,7 @@ void InstanceSaveManager::_ResetInstance(uint32 mapid, uint32 instanceId)
sObjectMgr->DeleteRespawnTimeForInstance(instanceId); // even if map is not loaded
// Free up the instance id and allow it to be reused
sMapMgr->FreeInstanceId(iMap->GetInstanceId());
sMapMgr->FreeInstanceId(instanceId);
}
void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, time_t resetTime)

6
src/server/game/Maps/MapManager.cpp
View File

@@ -404,16 +404,12 @@ uint32 MapManager::GenerateInstanceId()
// Allocate space if necessary
if (newInstanceId >= uint32(_instanceIds.size()))
{
// DEBUG CODE - TO BE REMOVED OR ENABLED DEPENDING ON THIS ASSERT TRIGGERING
ASSERT(_instanceIds.size() == _instanceIds.capacity());
/*
// Due to the odd memory allocation behavior of vector<bool> we match size to capacity before triggering a new allocation
if (_instanceIds.size() < _instanceIds.capacity())
{
_instanceIds.resize(_instanceIds.capacity());
}
else
*/
_instanceIds.resize(floor(newInstanceId / 32.0f) * 32 + (newInstanceId % 32 > 0 ? 32 : 0));
}