Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
0328f16c6c
9 changed files with 13 additions and 14 deletions
|
@ -282,10 +282,10 @@ CMoveGrid<T, CELLS, CSIZE>::~CMoveGrid()
|
|||
while ((node = cellNode->NodeList.getHead()) != NULL)
|
||||
{
|
||||
cellNode->NodeList.remove(node);
|
||||
_NodeAllocator.free(node);
|
||||
_NodeAllocator.freeBlock(node);
|
||||
}
|
||||
list.remove(cellNode);
|
||||
_CellNodeAllocator.free(cellNode);
|
||||
_CellNodeAllocator.freeBlock(cellNode);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5489,7 +5489,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
|
|||
if (command_args.size() > 8)
|
||||
{
|
||||
if (command_args[8] != "*") {
|
||||
NLMISC::fromString(command_args[7], z);
|
||||
NLMISC::fromString(command_args[8], z);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -227,7 +227,7 @@ CMoveGrid<T, CELLS, CSIZE>::~CMoveGrid()
|
|||
while ((node = list.getHead()) != NULL)
|
||||
{
|
||||
list.remove(node);
|
||||
_NodeAllocator.free(node);
|
||||
_NodeAllocator.freeBlock(node);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -282,7 +282,7 @@ void CMoveGrid<T, CELLS, CSIZE>::remove(CIterator &it)
|
|||
|
||||
it._Node = NULL;
|
||||
|
||||
_NodeAllocator.free(node);
|
||||
_NodeAllocator.freeBlock(node);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -191,7 +191,7 @@ public:
|
|||
static CCell *create() { return _CellAllocator.allocate(); }
|
||||
|
||||
/// Removes an entity (delete equivalent).
|
||||
static void remove(CCell *cell) { _CellAllocator.free(cell); }
|
||||
static void remove(CCell *cell) { _CellAllocator.freeBlock(cell); }
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
@ -381,10 +381,10 @@ void CMoveGrid<T, CELLS, CSIZE>::clear()
|
|||
while ((node = cellNode->NodeList.getHead()) != NULL)
|
||||
{
|
||||
cellNode->NodeList.remove(node);
|
||||
_NodeAllocator.free(node);
|
||||
_NodeAllocator.freeBlock(node);
|
||||
}
|
||||
list.remove(cellNode);
|
||||
_CellNodeAllocator.free(cellNode);
|
||||
_CellNodeAllocator.freeBlock(cellNode);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -482,7 +482,7 @@ void CMoveGrid<T, CELLS, CSIZE>::remove(CIterator &it)
|
|||
removeNode(it);
|
||||
it._Node = NULL;
|
||||
|
||||
_NodeAllocator.free(node);
|
||||
_NodeAllocator.freeBlock(node);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -67,7 +67,7 @@ void CWorldEntity::remove(CWorldEntity* entity)
|
|||
{
|
||||
CWorldPositionManager::_PrimitivedList.erase(entity->PrimIterator);
|
||||
}
|
||||
_EntityAllocator.free(entity);
|
||||
_EntityAllocator.freeBlock(entity);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -461,7 +461,7 @@ public:
|
|||
static CPlayerInfos *create() { return _PlayerAllocator.allocate(); }
|
||||
|
||||
/// Removes an entity (delete equivalent).
|
||||
static void remove(CPlayerInfos *player) { _PlayerAllocator.free(player); }
|
||||
static void remove(CPlayerInfos *player) { _PlayerAllocator.freeBlock(player); }
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
@ -1236,7 +1236,7 @@ void CChatManager::chatParamInGroup( TGroupId& grpId, const std::string & phrase
|
|||
CMirrorPropValueRO<uint32> instanceId( TheDataset, *itM, DSPropertyAI_INSTANCE );
|
||||
|
||||
// check the ai instance for region chat
|
||||
if (chatGrp.Type != CChatGroup::region
|
||||
if (chatGrp.Type != CChatGroup::region
|
||||
|| instanceId == senderInstanceId)
|
||||
{
|
||||
const CEntityId &eid = TheDataset.getEntityId(*itM);
|
||||
|
@ -1816,7 +1816,7 @@ void CChatManager::tell2( const TDataSetRow& sender, const TDataSetRow& receiver
|
|||
|
||||
bms.serial( senderInfos->NameIndex );
|
||||
bms.serial( id);
|
||||
|
||||
|
||||
msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
|
||||
CUnifiedNetwork::getInstance()->send(TServiceId(receiverInfos->EntityId.getDynamicId()), msgout);
|
||||
}
|
||||
|
|
|
@ -1864,7 +1864,6 @@ void CStringManager::init(NLMISC::CLog *log)
|
|||
|
||||
if (_SheetInfo.empty())
|
||||
{
|
||||
// std::map<std::string, TSheetInfo> container;
|
||||
// Load the sheet
|
||||
std::vector<std::string> exts;
|
||||
exts.push_back("creature");
|
||||
|
|
Loading…
Reference in a new issue