Merge branch 'inventory-fixes' into 'inventory-fixes'

Inventory Fixes - move to original repo See merge request ryzom/ryzom-core!9
3 years ago · 3c9b21c1b8
parent 8ef89b80b0 8f372625fa
commit 3c9b21c1b8
1 changed files with 5 additions and 1 deletions
--- a/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
@ -798,7 +798,11 @@ static DECLARE_INTERFACE_USER_FCT(getAnimalInventoryStateText)

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