Fix actor's car animations

Co-authored-by: v2v3v4 <terran.erre@mail.ru>

Author: sodat1de

src/xrGame/ActorAnimation.cpp

@@ -268,28 +268,29 @@ SVehicleAnimCollection::SVehicleAnimCollection()
 
 void SVehicleAnimCollection::Create(IKinematicsAnimated* V,u16 num)
 {
-	string128 buf,buff1,buff2;
-	xr_strconcat(buff1,_itoa(num,buf,10),"_");
-	steer_left=	V->ID_Cycle(xr_strconcat(buf,"steering_idle_",buff1,"ls"));
-	steer_right=V->ID_Cycle(xr_strconcat(buf,"steering_idle_",buff1,"rs"));
-
-	for(int i=0;MAX_IDLES>i;++i){
-		idles[i]=V->ID_Cycle_Safe(xr_strconcat(buf,"steering_idle_",buff1,_itoa(i,buff2,10)));
-		if(idles[i]) idles_num++;
-		else break;
-	}
+	steer_left = V->ID_Cycle_Safe("steering_torso_ls");
+	steer_right = V->ID_Cycle_Safe("steering_torso_rs");
+	idles[0] = V->ID_Cycle_Safe("steering_torso_idle");
+	idles[1] = V->ID_Cycle_Safe("steering_legs_idle");
 }
 
 void CActor::steer_Vehicle(float angle)	
 {
 	if(!m_holder)		return;
 
-	CCar*	car			= smart_cast<CCar*>(m_holder);
-	u16 anim_type       = car->DriverAnimationType();
-	SVehicleAnimCollection& anims=m_vehicle_anims->m_vehicles_type_collections[anim_type];
-	if(angle==0.f) 		smart_cast<IKinematicsAnimated*>	(Visual())->PlayCycle(anims.idles[0]);
-	else if(angle>0.f)	smart_cast<IKinematicsAnimated*>	(Visual())->PlayCycle(anims.steer_right);
-	else				smart_cast<IKinematicsAnimated*>	(Visual())->PlayCycle(anims.steer_left);
+	CCar* car = smart_cast<CCar*>(m_holder);
+	u16 anim_type = car->DriverAnimationType();
+	IKinematicsAnimated* ka = smart_cast<IKinematicsAnimated*>(Visual());
+	SVehicleAnimCollection& anims = m_vehicle_anims->m_vehicles_type_collections[anim_type];
+	if(angle==0.f)
+	{
+		ka->PlayCycle(anims.idles[0]);
+		ka->PlayCycle(anims.idles[1]);
+	}
+	else if(angle>0.f)
+		ka->PlayCycle(anims.steer_right);
+	else
+		ka->PlayCycle(anims.steer_left);
 }
 
 void legs_play_callback		(CBlend *blend)

src/xrGame/ActorVehicle.cpp

@@ -45,6 +45,7 @@ void CActor::attach_Vehicle(CHolderCustom* vehicle)
 	u16 anim_type					= car->DriverAnimationType();
 	SVehicleAnimCollection& anims	= m_vehicle_anims->m_vehicles_type_collections[anim_type];
 	V->PlayCycle					(anims.idles[0],FALSE);
+	V->PlayCycle					(anims.idles[1],FALSE);
 
 	ResetCallbacks					();
 	u16 head_bone					= pK->LL_BoneID("bip01_head");
@@ -54,7 +55,7 @@ void CActor::attach_Vehicle(CHolderCustom* vehicle)
 	mstate_wishful					= 0;
 	m_holderID=car->ID				();
 
-	SetWeaponHideState				(INV_STATE_CAR, true);
+	SetWeaponHideState				(INV_STATE_BLOCK_ALL, true);
 
 	CStepManager::on_animation_start(MotionID(), 0);	
 
@@ -97,7 +98,7 @@ void CActor::detach_Vehicle()
 	m_holderID=u16(-1);
 
 //.	SetWeaponHideState(whs_CAR, FALSE);
-	SetWeaponHideState(INV_STATE_CAR, false);
+	SetWeaponHideState(INV_STATE_BLOCK_ALL, false);
 	this->callback(GameObject::eDetachVehicle)(car->lua_game_object());
 }
 

src/xrGame/Inventory.cpp

@@ -28,7 +28,6 @@ using namespace InventoryUtilities;
 
 // what to block
 u16	INV_STATE_LADDER		= INV_STATE_BLOCK_ALL;
-u16	INV_STATE_CAR			= (1 << INV_SLOT_3 | 1 << BINOCULAR_SLOT);
 u16	INV_STATE_BLOCK_ALL		= 0xffff;
 u16	INV_STATE_INV_WND		= INV_STATE_BLOCK_ALL;
 u16	INV_STATE_BUY_MENU		= INV_STATE_BLOCK_ALL;

src/xrServerEntities/inventory_space.h

@@ -62,7 +62,6 @@ struct SInvItemPlace
 };
 
 extern u16	INV_STATE_LADDER;
-extern u16	INV_STATE_CAR;
 extern u16	INV_STATE_BLOCK_ALL;
 extern u16	INV_STATE_INV_WND;
 extern u16	INV_STATE_BUY_MENU;