Changed: Minor changes
This commit is contained in:
parent
93b0557ca1
commit
76848d6172
2 changed files with 2 additions and 3 deletions
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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");
|
||||||
|
|
Loading…
Reference in a new issue