Disable item groups, not tested in our build

ryzomclassic-develop
kaetemi 4 years ago
parent b89441d673
commit 9883454926

@ -222,6 +222,7 @@ GROUP COMMANDS
***********************************************************************/ ***********************************************************************/
#ifdef RYZOM_FORGE
NLMISC_COMMAND(listGroup, "list all available group", "") NLMISC_COMMAND(listGroup, "list all available group", "")
{ {
CItemGroupManager::getInstance()->listGroup(); CItemGroupManager::getInstance()->listGroup();
@ -361,6 +362,8 @@ NLMISC_COMMAND(deleteGroup, "delete group <name>", "name")
return false; return false;
} }
} }
#endif
NLMISC_COMMAND(naked, "get naked !", "") NLMISC_COMMAND(naked, "get naked !", "")
{ {

@ -134,7 +134,9 @@ void CEventsListener::operator()(const CEvent& event)
{ {
// Interface saving // Interface saving
CInterfaceManager::getInstance()->uninitInGame0(); CInterfaceManager::getInstance()->uninitInGame0();
#ifdef RYZOM_FORGE
CItemGroupManager::getInstance()->uninit(); CItemGroupManager::getInstance()->uninit();
#endif
/* YOYO: /* YOYO:

@ -1306,7 +1306,9 @@ void CFarTP::sendReady()
// Instead of doing it in disconnectFromPreviousShard(), we do it here, only when it's needed // Instead of doing it in disconnectFromPreviousShard(), we do it here, only when it's needed
ClientCfg.R2EDEnabled = ! ClientCfg.R2EDEnabled; ClientCfg.R2EDEnabled = ! ClientCfg.R2EDEnabled;
pIM->uninitInGame0(); pIM->uninitInGame0();
#ifdef RYZOM_FORGE
CItemGroupManager::getInstance()->uninit(); CItemGroupManager::getInstance()->uninit();
#endif
ClientCfg.R2EDEnabled = ! ClientCfg.R2EDEnabled; ClientCfg.R2EDEnabled = ! ClientCfg.R2EDEnabled;
ActionsContext.removeAllCombos(); ActionsContext.removeAllCombos();

@ -739,7 +739,9 @@ void initMainLoop()
ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) ); ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
//nlinfo("****** InGame Interface Parsing and Init START ******"); //nlinfo("****** InGame Interface Parsing and Init START ******");
pIM->initInGame(); // must be called after waitForUserCharReceived() because Ring information is used by initInGame() pIM->initInGame(); // must be called after waitForUserCharReceived() because Ring information is used by initInGame()
#ifdef RYZOM_FORGE
CItemGroupManager::getInstance()->init(); // Init at the same time keys.xml is loaded CItemGroupManager::getInstance()->init(); // Init at the same time keys.xml is loaded
#endif
initLast = initCurrent; initLast = initCurrent;
initCurrent = ryzomGetLocalTime(); initCurrent = ryzomGetLocalTime();
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing ingame", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000); //nlinfo ("PROFILE: %d seconds (%d total) for Initializing ingame", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);

@ -2025,6 +2025,7 @@ class CHandlerItemMenuCheck : public IActionHandler
} }
//Item GROUP logic //Item GROUP logic
#ifdef RYZOM_FORGE
CGroupMenu *pGroupRootMenu = dynamic_cast<CGroupMenu*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:item_menu_in_bag:item_group_menu")); CGroupMenu *pGroupRootMenu = dynamic_cast<CGroupMenu*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:item_menu_in_bag:item_group_menu"));
if(pGroupRootMenu) if(pGroupRootMenu)
{ {
@ -2096,6 +2097,7 @@ class CHandlerItemMenuCheck : public IActionHandler
} }
} }
#endif
} }
}; };
REGISTER_ACTION_HANDLER( CHandlerItemMenuCheck, "item_menu_check" ); REGISTER_ACTION_HANDLER( CHandlerItemMenuCheck, "item_menu_check" );
@ -2329,6 +2331,7 @@ class CHandlerRingXpCatalyserStopUse : public IActionHandler
REGISTER_ACTION_HANDLER( CHandlerRingXpCatalyserStopUse, "ring_xp_catalyser_stop_use" ); REGISTER_ACTION_HANDLER( CHandlerRingXpCatalyserStopUse, "ring_xp_catalyser_stop_use" );
#ifdef RYZOM_FORGE
// *************************************************************************** // ***************************************************************************
// item groups // item groups
class CHandlerItemGroupMove : public IActionHandler class CHandlerItemGroupMove : public IActionHandler
@ -2365,3 +2368,4 @@ class CHandlerItemGroupEquip : public IActionHandler
} }
}; };
REGISTER_ACTION_HANDLER(CHandlerItemGroupEquip, "item_group_equip"); REGISTER_ACTION_HANDLER(CHandlerItemGroupEquip, "item_group_equip");
#endif

@ -1611,7 +1611,9 @@ void CInterfaceManager::updateFrameEvents()
CBGDownloaderAccess::getInstance().update(); CBGDownloaderAccess::getInstance().update();
#endif #endif
#ifdef RYZOM_FORGE
CItemGroupManager::getInstance()->update(); CItemGroupManager::getInstance()->update();
#endif
} }

@ -19,6 +19,7 @@
#include "stdpch.h" #include "stdpch.h"
#ifdef RYZOM_FORGE
#include "item_group_manager.h" #include "item_group_manager.h"
#include "interface_v3/inventory_manager.h" #include "interface_v3/inventory_manager.h"
#include "nel/gui/widget_manager.h" #include "nel/gui/widget_manager.h"
@ -833,3 +834,5 @@ void CItemGroupManager::releaseInstance()
delete _Instance; delete _Instance;
_Instance = NULL; _Instance = NULL;
} }
#endif

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RYZOM_FORGE
#ifndef RY_ITEM_GROUP_MANAGER_H #ifndef RY_ITEM_GROUP_MANAGER_H
#define RY_ITEM_GROUP_MANAGER_H #define RY_ITEM_GROUP_MANAGER_H
#include <limits> #include <limits>
@ -128,3 +128,4 @@ private:
}; };
#endif // RY_ITEM_GROUP_MANAGER_H #endif // RY_ITEM_GROUP_MANAGER_H
#endif

@ -2589,7 +2589,9 @@ bool mainLoop()
// Interface saving // Interface saving
CInterfaceManager::getInstance()->uninitInGame0(); CInterfaceManager::getInstance()->uninitInGame0();
#ifdef RYZOM_FORGE
CItemGroupManager::getInstance()->uninit(); CItemGroupManager::getInstance()->uninit();
#endif
///////////////////////////////// /////////////////////////////////
// Display the end background. // // Display the end background. //

@ -237,7 +237,9 @@ void releaseMainLoopReselect()
// save keys loaded and interface cfg (not done in releaseMainLoop() because done at end of mainLoop()...) // save keys loaded and interface cfg (not done in releaseMainLoop() because done at end of mainLoop()...)
pIM->uninitInGame0(); pIM->uninitInGame0();
#ifdef RYZOM_FORGE
CItemGroupManager::getInstance()->uninit(); CItemGroupManager::getInstance()->uninit();
#endif
// alredy called from farTPMainLoop() // alredy called from farTPMainLoop()
// --R2::getEditor().autoConfigRelease(IsInRingSession); // --R2::getEditor().autoConfigRelease(IsInRingSession);

Loading…
Cancel
Save