Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-12-19 09:27:18 +01:00
parent 1e8d28759a
commit 03aeffdda7
9 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/server/src/ags_test/move_grid.h
View file

@ -282,10 +282,10 @@ CMoveGrid<T, CELLS, CSIZE>::~CMoveGrid()
while ((node = cellNode->NodeList.getHead()) != NULL) while ((node = cellNode->NodeList.getHead()) != NULL)
{ {
cellNode->NodeList.remove(node); cellNode->NodeList.remove(node);
_NodeAllocator.free(node); _NodeAllocator.freeBlock(node);
} }
list.remove(cellNode); list.remove(cellNode);
_CellNodeAllocator.free(cellNode); _CellNodeAllocator.freeBlock(cellNode);
} }
} }
} }

2
code/ryzom/server/src/entities_game_service/admin.cpp
View file

@ -5489,7 +5489,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
if (command_args.size() > 8) if (command_args.size() > 8)
{ {
if (command_args[8] != "*") { if (command_args[8] != "*") {
NLMISC::fromString(command_args[7], z); NLMISC::fromString(command_args[8], z);
} }
} }

4
code/ryzom/server/src/entity_view_service/move_grid.h
View file

@ -227,7 +227,7 @@ CMoveGrid<T, CELLS, CSIZE>::~CMoveGrid()
while ((node = list.getHead()) != NULL) while ((node = list.getHead()) != NULL)
{ {
list.remove(node); list.remove(node);
_NodeAllocator.free(node); _NodeAllocator.freeBlock(node);
} }
} }
} }
@ -282,7 +282,7 @@ void CMoveGrid<T, CELLS, CSIZE>::remove(CIterator &it)
it._Node = NULL; it._Node = NULL;
_NodeAllocator.free(node); _NodeAllocator.freeBlock(node);
} }

2
code/ryzom/server/src/gpm_service/cell.h
View file

@ -191,7 +191,7 @@ public:
static CCell *create() { return _CellAllocator.allocate(); } static CCell *create() { return _CellAllocator.allocate(); }
/// Removes an entity (delete equivalent). /// Removes an entity (delete equivalent).
static void remove(CCell *cell) { _CellAllocator.free(cell); } static void remove(CCell *cell) { _CellAllocator.freeBlock(cell); }
private: private:

6
code/ryzom/server/src/gpm_service/move_grid.h
View file

@ -381,10 +381,10 @@ void CMoveGrid<T, CELLS, CSIZE>::clear()
while ((node = cellNode->NodeList.getHead()) != NULL) while ((node = cellNode->NodeList.getHead()) != NULL)
{ {
cellNode->NodeList.remove(node); cellNode->NodeList.remove(node);
_NodeAllocator.free(node); _NodeAllocator.freeBlock(node);
} }
list.remove(cellNode); list.remove(cellNode);
_CellNodeAllocator.free(cellNode); _CellNodeAllocator.freeBlock(cellNode);
} }
} }
} }
@ -482,7 +482,7 @@ void CMoveGrid<T, CELLS, CSIZE>::remove(CIterator &it)
removeNode(it); removeNode(it);
it._Node = NULL; it._Node = NULL;
_NodeAllocator.free(node); _NodeAllocator.freeBlock(node);
} }

2
code/ryzom/server/src/gpm_service/world_entity.cpp
View file

@ -67,7 +67,7 @@ void CWorldEntity::remove(CWorldEntity* entity)
{ {
CWorldPositionManager::_PrimitivedList.erase(entity->PrimIterator); CWorldPositionManager::_PrimitivedList.erase(entity->PrimIterator);
} }
_EntityAllocator.free(entity); _EntityAllocator.freeBlock(entity);
} }

2
code/ryzom/server/src/gpm_service/world_entity.h
View file

@ -461,7 +461,7 @@ public:
static CPlayerInfos *create() { return _PlayerAllocator.allocate(); } static CPlayerInfos *create() { return _PlayerAllocator.allocate(); }
/// Removes an entity (delete equivalent). /// Removes an entity (delete equivalent).
static void remove(CPlayerInfos *player) { _PlayerAllocator.free(player); } static void remove(CPlayerInfos *player) { _PlayerAllocator.freeBlock(player); }
private: private:

4
code/ryzom/server/src/input_output_service/chat_manager.cpp
View file

@ -1236,7 +1236,7 @@ void CChatManager::chatParamInGroup( TGroupId& grpId, const std::string & phrase
CMirrorPropValueRO<uint32> instanceId( TheDataset, *itM, DSPropertyAI_INSTANCE ); CMirrorPropValueRO<uint32> instanceId( TheDataset, *itM, DSPropertyAI_INSTANCE );
// check the ai instance for region chat // check the ai instance for region chat
if (chatGrp.Type != CChatGroup::region if (chatGrp.Type != CChatGroup::region
|| instanceId == senderInstanceId) || instanceId == senderInstanceId)
{ {
const CEntityId &eid = TheDataset.getEntityId(*itM); 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( senderInfos->NameIndex );
bms.serial( id); bms.serial( id);
msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length()); msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
CUnifiedNetwork::getInstance()->send(TServiceId(receiverInfos->EntityId.getDynamicId()), msgout); CUnifiedNetwork::getInstance()->send(TServiceId(receiverInfos->EntityId.getDynamicId()), msgout);
} }

1
code/ryzom/server/src/input_output_service/string_manager_parser.cpp
View file

@ -1864,7 +1864,6 @@ void CStringManager::init(NLMISC::CLog *log)
if (_SheetInfo.empty()) if (_SheetInfo.empty())
{ {
// std::map<std::string, TSheetInfo> container;
// Load the sheet // Load the sheet
std::vector<std::string> exts; std::vector<std::string> exts;
exts.push_back("creature"); exts.push_back("creature");