From a6572f29eb1230371c91d6bcfcbf1747b6700487 Mon Sep 17 00:00:00 2001 From: Inky Date: Tue, 30 Apr 2019 22:26:25 +0300 Subject: [PATCH] Backed out changeset f2bc09b6da57 --HG-- branch : develop --- code/ryzom/client/src/client_sheets/item_sheet.cpp | 11 +---------- code/ryzom/client/src/client_sheets/item_sheet.h | 6 ------ 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/code/ryzom/client/src/client_sheets/item_sheet.cpp b/code/ryzom/client/src/client_sheets/item_sheet.cpp index daac055fe..e13d8e267 100644 --- a/code/ryzom/client/src/client_sheets/item_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/item_sheet.cpp @@ -367,11 +367,6 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item) if (!val.empty()) 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; switch(Family) { @@ -663,9 +658,6 @@ void CItemSheet::serial(NLMISC::IStream &f) // **** Serial Help Infos f.serialEnum(ItemOrigin); - // item commands - f.serial(Scroll); - // Different Serial according to family switch(Family) { @@ -705,9 +697,8 @@ void CItemSheet::serial(NLMISC::IStream &f) case ITEMFAMILY::TELEPORT: f.serial(Teleport); break; - // keep for readability case ITEMFAMILY::SCROLL: - //f.serial(Scroll); + f.serial(Scroll); break; case ITEMFAMILY::CONSUMABLE: f.serial(Consumable); diff --git a/code/ryzom/client/src/client_sheets/item_sheet.h b/code/ryzom/client/src/client_sheets/item_sheet.h index bd79b1569..c363c9756 100644 --- a/code/ryzom/client/src/client_sheets/item_sheet.h +++ b/code/ryzom/client/src/client_sheets/item_sheet.h @@ -255,16 +255,10 @@ public: struct CScroll { std::string Texture; - std::string LuaCommand; - std::string WebCommand; - std::string Label; void serial(NLMISC::IStream &f) { f.serial(Texture); - f.serial(LuaCommand); - f.serial(WebCommand); - f.serial(Label); } };