From 03aeffdda7f6c55d41fcce16dea2f73112d12b79 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 19 Dec 2016 09:27:18 +0100 Subject: [PATCH] Merge with develop --- code/ryzom/server/src/ags_test/move_grid.h | 4 ++-- code/ryzom/server/src/entities_game_service/admin.cpp | 2 +- code/ryzom/server/src/entity_view_service/move_grid.h | 4 ++-- code/ryzom/server/src/gpm_service/cell.h | 2 +- code/ryzom/server/src/gpm_service/move_grid.h | 6 +++--- code/ryzom/server/src/gpm_service/world_entity.cpp | 2 +- code/ryzom/server/src/gpm_service/world_entity.h | 2 +- code/ryzom/server/src/input_output_service/chat_manager.cpp | 4 ++-- .../src/input_output_service/string_manager_parser.cpp | 1 - 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/code/ryzom/server/src/ags_test/move_grid.h b/code/ryzom/server/src/ags_test/move_grid.h index ba03c2610..70790e091 100644 --- a/code/ryzom/server/src/ags_test/move_grid.h +++ b/code/ryzom/server/src/ags_test/move_grid.h @@ -282,10 +282,10 @@ CMoveGrid::~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); } } } diff --git a/code/ryzom/server/src/entities_game_service/admin.cpp b/code/ryzom/server/src/entities_game_service/admin.cpp index 585b4c1a8..a969b3c19 100644 --- a/code/ryzom/server/src/entities_game_service/admin.cpp +++ b/code/ryzom/server/src/entities_game_service/admin.cpp @@ -5489,7 +5489,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", " 8) { if (command_args[8] != "*") { - NLMISC::fromString(command_args[7], z); + NLMISC::fromString(command_args[8], z); } } diff --git a/code/ryzom/server/src/entity_view_service/move_grid.h b/code/ryzom/server/src/entity_view_service/move_grid.h index 8d8aae34b..13e6fc3fa 100644 --- a/code/ryzom/server/src/entity_view_service/move_grid.h +++ b/code/ryzom/server/src/entity_view_service/move_grid.h @@ -227,7 +227,7 @@ CMoveGrid::~CMoveGrid() while ((node = list.getHead()) != NULL) { list.remove(node); - _NodeAllocator.free(node); + _NodeAllocator.freeBlock(node); } } } @@ -282,7 +282,7 @@ void CMoveGrid::remove(CIterator &it) it._Node = NULL; - _NodeAllocator.free(node); + _NodeAllocator.freeBlock(node); } diff --git a/code/ryzom/server/src/gpm_service/cell.h b/code/ryzom/server/src/gpm_service/cell.h index 8cc740a08..382358a93 100644 --- a/code/ryzom/server/src/gpm_service/cell.h +++ b/code/ryzom/server/src/gpm_service/cell.h @@ -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: diff --git a/code/ryzom/server/src/gpm_service/move_grid.h b/code/ryzom/server/src/gpm_service/move_grid.h index 60cb36da9..4e0022e7c 100644 --- a/code/ryzom/server/src/gpm_service/move_grid.h +++ b/code/ryzom/server/src/gpm_service/move_grid.h @@ -381,10 +381,10 @@ void CMoveGrid::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::remove(CIterator &it) removeNode(it); it._Node = NULL; - _NodeAllocator.free(node); + _NodeAllocator.freeBlock(node); } diff --git a/code/ryzom/server/src/gpm_service/world_entity.cpp b/code/ryzom/server/src/gpm_service/world_entity.cpp index 7ebdcbf2a..ce1f5af69 100644 --- a/code/ryzom/server/src/gpm_service/world_entity.cpp +++ b/code/ryzom/server/src/gpm_service/world_entity.cpp @@ -67,7 +67,7 @@ void CWorldEntity::remove(CWorldEntity* entity) { CWorldPositionManager::_PrimitivedList.erase(entity->PrimIterator); } - _EntityAllocator.free(entity); + _EntityAllocator.freeBlock(entity); } diff --git a/code/ryzom/server/src/gpm_service/world_entity.h b/code/ryzom/server/src/gpm_service/world_entity.h index e22e2359c..50f04e2fd 100644 --- a/code/ryzom/server/src/gpm_service/world_entity.h +++ b/code/ryzom/server/src/gpm_service/world_entity.h @@ -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: diff --git a/code/ryzom/server/src/input_output_service/chat_manager.cpp b/code/ryzom/server/src/input_output_service/chat_manager.cpp index 872aa4501..f20d4300d 100644 --- a/code/ryzom/server/src/input_output_service/chat_manager.cpp +++ b/code/ryzom/server/src/input_output_service/chat_manager.cpp @@ -1236,7 +1236,7 @@ void CChatManager::chatParamInGroup( TGroupId& grpId, const std::string & phrase CMirrorPropValueRO 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); } diff --git a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp index c13c0a987..ef55570f9 100644 --- a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp +++ b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp @@ -1864,7 +1864,6 @@ void CStringManager::init(NLMISC::CLog *log) if (_SheetInfo.empty()) { - // std::map container; // Load the sheet std::vector exts; exts.push_back("creature");