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

Backed out changeset f2bc09b6da57

Browse source 
--HG--
branch : develop
This commit is contained in:
Inky 2019-04-30 22:26:25 +03:00
parent 59da139eb7
commit a6572f29eb
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/ryzom/client/src/client_sheets/item_sheet.cpp
View file

@ -367,11 +367,6 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
if (!val.empty()) if (!val.empty())
CraftPlan = CSheetId(val); CraftPlan = CSheetId(val);
// commands and menu label
TRANSLATE_VAL( Scroll.LuaCommand, "basics.Scroll.LuaCommand" );
TRANSLATE_VAL( Scroll.WebCommand, "basics.Scroll.WebCommand" );
TRANSLATE_VAL( Scroll.Label, "basics.Scroll.Label" );
// Special according to Family; // Special according to Family;
switch(Family) switch(Family)
{ {
@ -663,9 +658,6 @@ void CItemSheet::serial(NLMISC::IStream &f)
// **** Serial Help Infos // **** Serial Help Infos
f.serialEnum(ItemOrigin); f.serialEnum(ItemOrigin);
// item commands
f.serial(Scroll);
// Different Serial according to family // Different Serial according to family
switch(Family) switch(Family)
{ {
@ -705,9 +697,8 @@ void CItemSheet::serial(NLMISC::IStream &f)
case ITEMFAMILY::TELEPORT: case ITEMFAMILY::TELEPORT:
f.serial(Teleport); f.serial(Teleport);
break; break;
// keep for readability
case ITEMFAMILY::SCROLL: case ITEMFAMILY::SCROLL:
//f.serial(Scroll); f.serial(Scroll);
break; break;
case ITEMFAMILY::CONSUMABLE: case ITEMFAMILY::CONSUMABLE:
f.serial(Consumable); f.serial(Consumable);

6
code/ryzom/client/src/client_sheets/item_sheet.h
View file

@ -255,16 +255,10 @@ public:
struct CScroll struct CScroll
{ {
std::string Texture; std::string Texture;
std::string LuaCommand;
std::string WebCommand;
std::string Label;
void serial(NLMISC::IStream &f) void serial(NLMISC::IStream &f)
{ {
f.serial(Texture); f.serial(Texture);
f.serial(LuaCommand);
f.serial(WebCommand);
f.serial(Label);
} }
}; };