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

Changed: #1433 Merge changes from patch 1.13

Browse source
This commit is contained in:
kervala 2012-03-05 11:59:00 +01:00
parent 6b293ca23a
commit b1ad39a21b
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4720,9 +4720,6 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
if (command_args.size() < 4) if (command_args.size() < 4)
return false; return false;
const CSheetId sheetId(command_args[1]);
if (sheetId == CSheetId::Unknown)
return false;
uint32 quality; uint32 quality;
fromString(command_args[2], quality); fromString(command_args[2], quality);
if (quality == 0) if (quality == 0)
@ -4755,7 +4752,22 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
} }
} }
CGameItemPtr new_item = c->createItem(quality, quantity, sheetId); CGameItemPtr new_item;
string sheet = command_args[1];
if ( sheet.find(".sitem") == string::npos ) // try named item
{
new_item = CNamedItems::getInstance().createNamedItem(command_args[1], quantity);
if (new_item == NULL)
return true;
}
else
{
const CSheetId sheetId(sheet);
if (sheetId == CSheetId::Unknown)
return true;
new_item = c->createItem(quality, quantity, sheetId);
}
if (!c->addItemToInventory(inventory, new_item)) if (!c->addItemToInventory(inventory, new_item))
{ {