Revert "Merge branch '32-remove-fmod-option-not-used-or-client-crash' into main/atys-live"

This reverts commit 0e2ec103ab.

ryzom/client/src/client_cfg.cpp

@@ -1297,6 +1297,7 @@ void CClientConfig::setValues()
 	if (varPtr)
 	{
 		if (nlstricmp(varPtr->asString(), "Auto") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvAuto;
+		else if (nlstricmp(varPtr->asString(), "FMod") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvFMod;
 		else if (nlstricmp(varPtr->asString(), "OpenAL") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvOpenAL;
 		else if (nlstricmp(varPtr->asString(), "DirectSound") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvDirectSound;
 		else if (nlstricmp(varPtr->asString(), "XAudio2") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvXAudio2;

ryzom/client/src/client_cfg.h

@@ -58,7 +58,7 @@ using std::string;
 struct CClientConfig
 {
 	enum TDriver3D { DrvAuto = 0, OpenGL, Direct3D, OpenGLES };
-	enum TDriverSound { SoundDrvAuto = 0, SoundDrvOpenAL, SoundDrvDirectSound, SoundDrvXAudio2 };
+	enum TDriverSound { SoundDrvAuto = 0, SoundDrvFMod, SoundDrvOpenAL, SoundDrvDirectSound, SoundDrvXAudio2 };
 	enum TStageLCTUsage { StageUseNoLCT = 0, StageUseAllLCT, StageUsePosOnlyLCT };
 
 	// the config file must be always be available

ryzom/client/src/commands.cpp

@@ -408,18 +408,6 @@ NLMISC_COMMAND(afk, "Set the player as 'away from keyboard'","[<custom text>]")
 	return true;
 }
 
-NLMISC_COMMAND(selfkill, "Kill the player ","")
-{
-	CBitMemStream out;
-	if(!GenericMsgHeaderMngr.pushNameToStream("COMMAND:SELFKILL", out))
-	{
-		nlwarning("Unknown message name COMMAND:SELFKILL");
-		return false;
-	}
-	NetMngr.push(out);
-	return true;
-}
-
 bool randomCheckCharset(std::string const& str)
 {
 	std::string::const_iterator it, itEnd = str.end();

ryzom/client/src/interface_v3/action_handler_game.cpp

@@ -1095,20 +1095,6 @@ public:
 REGISTER_ACTION_HANDLER( CHandlerContextWebPage, "context_web_page");
 
 
-// ***************************************************************************
-class CHandlerFullMap : public IActionHandler
-{
-public:
-	void execute (CCtrlBase * /* pCaller */, const std::string &/* sParams */)
-	{
-		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-		CLuaManager::getInstance().executeLuaScript("game:openFullMap()", true);
-	}
-};
-REGISTER_ACTION_HANDLER( CHandlerFullMap, "fullmap");
-
-
 
 
 // ***************************************************************************

ryzom/client/src/interface_v3/action_handler_item.cpp

@@ -1960,15 +1960,16 @@ class CHandlerItemMenuCheck : public IActionHandler
 			for(i=0;i<MAX_INVENTORY_ANIMAL;i++)
 			{
 				if (pMoveToPa[i])
-					pMoveToPa[i]->setActive((uint)invId!=INVENTORIES::pet_animal+i &&
+					pMoveToPa[i]->setActive(invId!=INVENTORIES::guild &&
+											(uint)invId!=INVENTORIES::pet_animal+i &&
 											 invMngr.isInventoryPresent((INVENTORIES::TInventory)(INVENTORIES::pet_animal+i)) );
 			}
 
 			if (pMoveToGuild)
-				pMoveToGuild->setActive(invId!=INVENTORIES::guild && invMngr.isInventoryPresent(INVENTORIES::guild));
+				pMoveToGuild->setActive(invId==INVENTORIES::bag && invMngr.isInventoryPresent(INVENTORIES::guild));
 
 			if (pMoveToRoom)
-				pMoveToRoom->setActive(invId!=INVENTORIES::player_room && invMngr.isInventoryPresent(INVENTORIES::player_room));
+				pMoveToRoom->setActive(invId==INVENTORIES::bag && invMngr.isInventoryPresent(INVENTORIES::player_room));
 
 			// std case: can drop / destroy
 			if(pDrop)		pDrop->setActive(invId!=INVENTORIES::guild);
@@ -2049,7 +2050,6 @@ class CHandlerItemMenuCheck : public IActionHandler
 		}
 
 		// Only show lock menu item if inventory contains the info
-		if (invId!=INVENTORIES::guild)
 		if (pLockUnlock) pLockUnlock->setActive(pCS->canOwnerLock());
 
 

ryzom/client/src/interface_v3/action_phrase_faber.cpp

@@ -50,10 +50,6 @@ using namespace NLMISC;
 
 // ***************************************************************************
 const std::string	FaberPlanDB= "UI:PHRASE:FABER:FABER_PLAN:SHEET";
-const std::string	FaberPlanHpBuffDB= "UI:PHRASE:FABER:FABER_PLAN:HP_BUFF";
-const std::string	FaberPlanSapBuffDB= "UI:PHRASE:FABER:FABER_PLAN:SAP_BUFF";
-const std::string	FaberPlanStaBuffDB= "UI:PHRASE:FABER:FABER_PLAN:STA_BUFF";
-const std::string	FaberPlanFocusBuffDB= "UI:PHRASE:FABER:FABER_PLAN:FOCUS_BUFF";
 const std::string	MPFaberDB= "UI:PHRASE:FABER:MP_BUILD";
 const std::string	MPSelectionDB= "UI:PHRASE:FABER:MP_SELECT";
 const std::string	MPQuantityDb= "UI:PHRASE:FABER:MP_QUANTITY";
@@ -174,16 +170,6 @@ void		CActionPhraseFaber::launchFaberCastWindow(sint32 memoryLine, uint memoryIn
 	if(node)
 		node->setValue32(0);
 
-	// Reset buff values
-	node = NLGUI::CDBManager::getInstance()->getDbProp(FaberPlanHpBuffDB, false);
-	if (node) node->setValue32(0);
-	node = NLGUI::CDBManager::getInstance()->getDbProp(FaberPlanSapBuffDB, false);
-	if (node) node->setValue32(0);
-	node = NLGUI::CDBManager::getInstance()->getDbProp(FaberPlanStaBuffDB, false);
-	if (node) node->setValue32(0);
-	node = NLGUI::CDBManager::getInstance()->getDbProp(FaberPlanFocusBuffDB, false);
-	if (node) node->setValue32(0);
-
 	// Reset the result item
 	node= NLGUI::CDBManager::getInstance()->getDbProp(ItemResultSheetDB, false);
 	if(node)
@@ -1579,14 +1565,6 @@ void	CActionPhraseFaber::updateItemResult()
 	uint		phraseSlot= pPM->getMemorizedPhrase(_ExecuteFromMemoryLine, _ExecuteFromMemoryIndex);
 	const CSPhraseCom	&phrase= pPM->getPhrase(phraseSlot);
 	uint32		recommendedPropId= pBM->getBrickPropId("cr_recommended");
-	uint32 crHp = pBM->getBrickPropId("cr_hp");
-	uint32 crSap = pBM->getBrickPropId("cr_sap");
-	uint32 crSta = pBM->getBrickPropId("cr_sta");
-	uint32 crFocus = pBM->getBrickPropId("cr_focus");
-	sint32 hpBuff = 0;
-	sint32 sapBuff = 0;
-	sint32 staBuff = 0;
-	sint32 focusBuff = 0;
 	for(i=0;i<phrase.Bricks.size();i++)
 	{
 		CSBrickSheet	*brick= pBM->getBrick(phrase.Bricks[i]);
@@ -1600,30 +1578,10 @@ void	CActionPhraseFaber::updateItemResult()
 					// minimze the level
 					minLevel= min(minLevel, sint32(brick->Properties[j].Value));
 				}
-
-				if (brick->Properties[j].PropId == crHp)
-					hpBuff = sint32(brick->Properties[j].Value);
-				if (brick->Properties[j].PropId == crSap)
-					sapBuff = sint32(brick->Properties[j].Value);
-				if (brick->Properties[j].PropId == crSta)
-					staBuff = sint32(brick->Properties[j].Value);
-				if (brick->Properties[j].PropId == crFocus)
-					focusBuff = sint32(brick->Properties[j].Value);
 			}
 		}
 	}
 
-	{
-		NLGUI::CDBManager *cdb = NLGUI::CDBManager::getInstance();
-		NLMISC::CCDBNodeLeaf *node = cdb->getDbProp(FaberPlanHpBuffDB, false);
-		if (node) node->setValue32(hpBuff);
-		node = cdb->getDbProp(FaberPlanSapBuffDB, false);
-		if (node) node->setValue32(sapBuff);
-		node = cdb->getDbProp(FaberPlanStaBuffDB, false);
-		if (node) node->setValue32(staBuff);
-		node = cdb->getDbProp(FaberPlanFocusBuffDB, false);
-		if (node) node->setValue32(focusBuff);
-	}
 
 	// **** Parse all MPs setuped, to compute level and stats
 	uint	totalItemPartMPReq= 0;

ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -2534,8 +2534,7 @@ void CDBCtrlSheet::drawSheet (sint32 x, sint32 y, bool draging, bool showSelecti
 					// there is max 4 icons
 					sint32 hArea = (hSheet / 4);
 					sint32 xIcon = x;
-					// move buff icons up a row, quantity text is displayed on bottom-left corner
+					sint32 yIcon = y;
-					sint32 yIcon = y + hArea;
 					for (uint i = 0; i < _BuffIcons.size(); ++i)
 					{
 						sint32 wIcon = _BuffIcons[i].IconW;

ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp

@@ -799,11 +799,7 @@ static DECLARE_INTERFACE_USER_FCT(getAnimalInventoryStateText)
 
 	// According to server status, change the inventory text
 	uint	status= (uint)args[0].getInteger();
-	if(ANIMAL_STATUS::isInBag((ANIMAL_STATUS::EAnimalStatus)status))
+	if(ANIMAL_STATUS::isInStable((ANIMAL_STATUS::EAnimalStatus)status))
-	{
-		result.setString("uiAnimalInBag");
-	}
-	else if(ANIMAL_STATUS::isInStable((ANIMAL_STATUS::EAnimalStatus)status))
 	{
 		result.setString("uiAnimalInStable");
 	}

ryzom/client/src/sound_manager.cpp

@@ -468,7 +468,9 @@ void CSoundManager::init(IProgressCallback *progressCallBack)
 			_AudioMixer->setPackedSheetOption("", false);
 
 		UAudioMixer::TDriver	driverType= UAudioMixer::DriverAuto;
-		if(ClientCfg.DriverSound==CClientConfig::SoundDrvOpenAL)
+		if(ClientCfg.DriverSound==CClientConfig::SoundDrvFMod)
+			driverType= UAudioMixer::DriverFMod;
+		else if(ClientCfg.DriverSound==CClientConfig::SoundDrvOpenAL)
 			driverType= UAudioMixer::DriverOpenAl;
 		else if(ClientCfg.DriverSound==CClientConfig::SoundDrvDirectSound)
 			driverType= UAudioMixer::DriverDSound;