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

Changed: Minor changes

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-12-19 09:26:46 +01:00
parent bd13cabb13
commit 61b76ad106
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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");