mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Merged in Glorf/ryzomcore/target_sheet (pull request #142)
Update target command --HG-- branch : compatibility-develop
This commit is contained in:
commit
f864aceee1
4 changed files with 38 additions and 4 deletions
|
@ -63,9 +63,15 @@
|
|||
<command name="target" action="target" params="entity=$" />
|
||||
<command name="tar" action="target" params="entity=$" />
|
||||
|
||||
<command name="target_quiet" action="target" params="entity=$|quiet=true" />
|
||||
<command name="tarq" action="target" params="entity=$|quiet=true" />
|
||||
|
||||
<command name="target" action="target" params="entity=$|prefer_complete_match=$" />
|
||||
<command name="tar" action="target" params="entity=$|prefer_complete_match=$" />
|
||||
|
||||
<command name="target_quiet" action="target" params="entity=$|prefer_complete_match=$|quiet=true" />
|
||||
<command name="tarq" action="target" params="entity=$|prefer_complete_match=$|quiet=true" />
|
||||
|
||||
<command name="target" action="no_target" params="" />
|
||||
<command name="tar" action="no_target" params="" />
|
||||
|
||||
|
|
|
@ -1949,7 +1949,26 @@ CEntityCL *CEntityManager::getEntityByCompressedIndex(TDataSetIndex compressedIn
|
|||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
//-----------------------------------------------
|
||||
// getEntityBySheetName :
|
||||
// Return an entity based on its sheet name
|
||||
//-----------------------------------------------
|
||||
CEntityCL *CEntityManager::getEntityBySheetName (const std::string &sheet) const
|
||||
{
|
||||
if (!sheet.empty())
|
||||
{
|
||||
uint i;
|
||||
const CSheetId& sheetRef = NLMISC::CSheetId(sheet);
|
||||
const uint count = (uint)_Entities.size();
|
||||
for (i=0; i<count; i++)
|
||||
{
|
||||
if(_Entities[i])
|
||||
if(_Entities[i]->sheetId() == sheetRef)
|
||||
return _Entities[i];
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
//-----------------------------------------------
|
||||
// managePACSTriggers :
|
||||
// Manage PACS Triggers.
|
||||
|
|
|
@ -277,7 +277,7 @@ public:
|
|||
* \param complete : if true, the name must match the full name of the entity.
|
||||
*/
|
||||
CEntityCL *getEntityByName (const ucstring &name, bool caseSensitive, bool complete) const;
|
||||
|
||||
CEntityCL *getEntityBySheetName (const std::string &sheet) const;
|
||||
/// Get an entity by dataset index. Returns NULL if the entity is not found.
|
||||
CEntityCL *getEntityByCompressedIndex(TDataSetIndex compressedIndex) const;
|
||||
|
||||
|
|
|
@ -2418,6 +2418,7 @@ class CAHTarget : public IActionHandler
|
|||
ucstring entityName;
|
||||
entityName.fromUtf8 (getParam (Params, "entity"));
|
||||
bool preferCompleteMatch = (getParam (Params, "prefer_complete_match") != "0");
|
||||
bool quiet = (getParam (Params, "quiet") == "true");
|
||||
|
||||
if (!entityName.empty())
|
||||
{
|
||||
|
@ -2434,6 +2435,12 @@ class CAHTarget : public IActionHandler
|
|||
entity = EntitiesMngr.getEntityByName (entityName, false, false);
|
||||
}
|
||||
|
||||
if (entity == NULL)
|
||||
{
|
||||
//Get the entity with a sheetName
|
||||
entity = EntitiesMngr.getEntityBySheetName(entityName.toUtf8());
|
||||
}
|
||||
|
||||
if (entity)
|
||||
{
|
||||
CCharacterCL *character = dynamic_cast<CCharacterCL*>(entity);
|
||||
|
@ -2457,6 +2464,7 @@ class CAHTarget : public IActionHandler
|
|||
// to avoid campfire selection exploit #316
|
||||
nldebug("is not prop selectable");
|
||||
CInterfaceManager *pIM= CInterfaceManager::getInstance();
|
||||
if(!quiet)
|
||||
pIM->displaySystemInfo(CI18N::get("uiTargetErrorCmd"));
|
||||
return;
|
||||
}
|
||||
|
@ -2467,6 +2475,7 @@ class CAHTarget : public IActionHandler
|
|||
else
|
||||
{
|
||||
CInterfaceManager *pIM= CInterfaceManager::getInstance();
|
||||
if(!quiet)
|
||||
pIM->displaySystemInfo(CI18N::get("uiTargetErrorCmd"));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue