.

Author: VReaperV

src/engine/client/cg_msgdef.h

@@ -99,15 +99,14 @@ namespace Util {
 	template<> struct SerializeTraits<std::vector<BoneMod>> {
 		static void Write( Writer& stream, const std::vector<BoneMod>& boneMods ) {
 			stream.WriteSize( boneMods.size() );
-			// stream.Write<float>( skel.scale );
-			// size_t length = sizeof( refBone_t ) * skel.numBones;
-			stream.WriteData( boneMods.data(), boneMods.size() );
+			stream.WriteData( boneMods.data(), boneMods.size() * sizeof( BoneMod ) );
 		}
+
 		static std::vector<BoneMod> Read( Reader& stream ) {
 			std::vector<BoneMod> boneMods;
-			boneMods.reserve( stream.ReadSize<BoneMod>() );
-			size_t length = sizeof( refBone_t ) * boneMods.size();
-			stream.ReadData( boneMods.data(), length );
+			const size_t size = stream.ReadSize<BoneMod>();
+			boneMods.resize( size );
+			stream.ReadData( boneMods.data(), size * sizeof( BoneMod ) );
 			return boneMods;
 		}
 	};
@@ -120,6 +119,7 @@ namespace Util {
 			stream.Write<std::vector<BoneMod>>( ent.boneMods );
 			// stream.Write<refSkeleton_t>(ent.skeleton);
 		}
+
 		static refEntity_t Read(Reader& stream)
 		{
 			refEntity_t ent;

src/engine/renderer/tr_main.cpp

@@ -2123,6 +2123,10 @@ void R_AddEntitySurfaces()
 									ent->e.lerp2, ent->e.clearOrigin2 );
 								RE_BlendSkeleton( &ent->e.skeleton, &skel, ent->e.blendLerp );
 							}
+
+							for ( const BoneMod& boneMod : ent->e.boneMods ) {
+								QuatMultiply2( ent->e.skeleton.bones[boneMod.index].t.rot, boneMod.rotation );
+							}
 							R_AddMD5Surfaces( ent );
 							break;
 
@@ -2152,6 +2156,10 @@ void R_AddEntitySurfaces()
 								RE_BlendSkeleton( &ent->e.skeleton, &skel, ent->e.blendLerp );
 							}
 							R_TransformSkeleton( &ent->e.skeleton, ent->e.scale );
+
+							for ( const BoneMod& boneMod : ent->e.boneMods ) {
+								QuatMultiply2( ent->e.skeleton.bones[boneMod.index].t.rot, boneMod.rotation );
+							}
 							R_AddIQMSurfaces( ent );
 							break;
 					}