Vanilla refactor, fix uninitialized member bone ids, rename confusing bone callbacks

Author: yohjimane

src/xrGame/Actor.h

@@ -308,9 +308,9 @@ class CActor : public CEntityAlive,
     // callback на анимации модели актера
     void SetCallbacks();
     void ResetCallbacks();
-    static void Spin0Callback(CBoneInstance*);
-    static void Spin1Callback(CBoneInstance*);
-    static void ShoulderCallback(CBoneInstance*);
+    static void Spine0Callback(CBoneInstance*);
+    static void Spine1Callback(CBoneInstance*);
+    static void Spine2Callback(CBoneInstance*);
     static void HeadCallback(CBoneInstance*);
     static void VehicleHeadCallback(CBoneInstance*);
 
@@ -519,19 +519,19 @@ class CActor : public CEntityAlive,
 
 protected:
     //косточки используемые при стрельбе
-    int m_r_hand;
-    int m_l_finger1;
-    int m_r_finger2;
-    int m_head;
-    int m_eye_left;
-    int m_eye_right;
-
-    int m_l_clavicle;
-    int m_r_clavicle;
-    int m_spine2;
-    int m_spine1;
-    int m_spine;
-    int m_neck;
+    int m_r_hand{};
+    int m_l_finger1{};
+    int m_r_finger2{};
+    int m_head{};
+    int m_eye_left{};
+    int m_eye_right{};
+
+    int m_l_clavicle{};
+    int m_r_clavicle{};
+    int m_spine2{};
+    int m_spine1{};
+    int m_spine{};
+    int m_neck{};
 
     //////////////////////////////////////////////////////////////////////////
     // Network

src/xrGame/ActorAnimation.cpp

@@ -38,7 +38,7 @@ static const float r_head_factor = 0.2f;
 CBlend* PlayMotionByParts(
     IKinematicsAnimated* sa, MotionID motion_ID, BOOL bMixIn, PlayCallback Callback, LPVOID CallbackParam);
 
-void CActor::Spin0Callback(CBoneInstance* B)
+void CActor::Spine0Callback(CBoneInstance* B)
 {
     CActor* A = static_cast<CActor*>(B->callback_param());
     VERIFY(A);
@@ -52,7 +52,7 @@ void CActor::Spin0Callback(CBoneInstance* B)
     B->mTransform.mulA_43(spin);
     B->mTransform.c = c;
 }
-void CActor::Spin1Callback(CBoneInstance* B)
+void CActor::Spine1Callback(CBoneInstance* B)
 {
     CActor* A = static_cast<CActor*>(B->callback_param());
     VERIFY(A);
@@ -66,7 +66,7 @@ void CActor::Spin1Callback(CBoneInstance* B)
     B->mTransform.mulA_43(spin);
     B->mTransform.c = c;
 }
-void CActor::ShoulderCallback(CBoneInstance* B)
+void CActor::Spine2Callback(CBoneInstance* B)
 {
     CActor* A = static_cast<CActor*>(B->callback_param());
     VERIFY(A);

src/xrGame/Actor_Network.cpp

@@ -833,27 +833,19 @@ void CActor::SetCallbacks()
 {
     IKinematics* V = smart_cast<IKinematics*>(Visual());
     VERIFY(V);
-    u16 spine0_bone = V->LL_BoneID("bip01_spine");
-    u16 spine1_bone = V->LL_BoneID("bip01_spine1");
-    u16 shoulder_bone = V->LL_BoneID("bip01_spine2");
-    u16 head_bone = V->LL_BoneID("bip01_head");
-    V->LL_GetBoneInstance(u16(spine0_bone)).set_callback(bctCustom, Spin0Callback, this);
-    V->LL_GetBoneInstance(u16(spine1_bone)).set_callback(bctCustom, Spin1Callback, this);
-    V->LL_GetBoneInstance(u16(shoulder_bone)).set_callback(bctCustom, ShoulderCallback, this);
-    V->LL_GetBoneInstance(u16(head_bone)).set_callback(bctCustom, HeadCallback, this);
+    V->LL_GetBoneInstance(u16(m_spine)).set_callback(bctCustom, Spine0Callback, this);
+    V->LL_GetBoneInstance(u16(m_spine1)).set_callback(bctCustom, Spine1Callback, this);
+    V->LL_GetBoneInstance(u16(m_spine2)).set_callback(bctCustom, Spine2Callback, this);
+    V->LL_GetBoneInstance(u16(m_head)).set_callback(bctCustom, HeadCallback, this);
 }
 void CActor::ResetCallbacks()
 {
     IKinematics* V = smart_cast<IKinematics*>(Visual());
     VERIFY(V);
-    u16 spine0_bone = V->LL_BoneID("bip01_spine");
-    u16 spine1_bone = V->LL_BoneID("bip01_spine1");
-    u16 shoulder_bone = V->LL_BoneID("bip01_spine2");
-    u16 head_bone = V->LL_BoneID("bip01_head");
-    V->LL_GetBoneInstance(u16(spine0_bone)).reset_callback();
-    V->LL_GetBoneInstance(u16(spine1_bone)).reset_callback();
-    V->LL_GetBoneInstance(u16(shoulder_bone)).reset_callback();
-    V->LL_GetBoneInstance(u16(head_bone)).reset_callback();
+    V->LL_GetBoneInstance(u16(m_spine)).reset_callback();
+    V->LL_GetBoneInstance(u16(m_spine1)).reset_callback();
+    V->LL_GetBoneInstance(u16(m_spine2)).reset_callback();
+    V->LL_GetBoneInstance(u16(m_head)).reset_callback();
 }
 
 void CActor::OnChangeVisual()