Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions Client/mods/deathmatch/logic/CPacketHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,38 @@ void CPacketHandler::Packet_PlayerList(NetBitStreamInterface& bitStream)
pPlayer->GiveWeapon(static_cast<eWeaponType>(weaponType.data.ucWeaponType), 1);
}
}

// Animation
if (bitStream.ReadBit())
{
std::string blockName, animName;
int time, blendTime;
bool looped, updatePosition, interruptable, freezeLastFrame, taskRestore;
float speed;
double startTime;

// Read data
bitStream.ReadString(blockName);
bitStream.ReadString(animName);
bitStream.Read(time);
bitStream.ReadBit(looped);
bitStream.ReadBit(updatePosition);
bitStream.ReadBit(interruptable);
bitStream.ReadBit(freezeLastFrame);
bitStream.Read(blendTime);
bitStream.ReadBit(taskRestore);
bitStream.Read(startTime);
bitStream.Read(speed);

// Run anim
CStaticFunctionDefinitions::SetPedAnimation(*pPlayer, blockName, animName.c_str(), time, blendTime, looped, updatePosition, interruptable,
freezeLastFrame);
pPlayer->m_AnimationCache.startTime = static_cast<std::int64_t>(startTime);
pPlayer->m_AnimationCache.speed = speed;
pPlayer->m_AnimationCache.progress = 0.0f;

pPlayer->SetHasSyncedAnim(true);
}
}

// Set move anim even if not spawned
Expand Down
19 changes: 19 additions & 0 deletions Server/mods/deathmatch/logic/packets/CPlayerListPacket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,25 @@ bool CPlayerListPacket::Write(NetBitStreamInterface& BitStream) const
else
BitStream.WriteBit(false);
}

const SPlayerAnimData& animData = pPlayer->GetAnimationData();
bool animRuning = animData.IsAnimating();

BitStream.WriteBit(animRuning);
if (animRuning)
{
BitStream.WriteString(animData.blockName);
BitStream.WriteString(animData.animName);
BitStream.Write(animData.time);
BitStream.WriteBit(animData.loop);
BitStream.WriteBit(animData.updatePosition);
BitStream.WriteBit(animData.interruptable);
BitStream.WriteBit(animData.freezeLastFrame);
BitStream.Write(animData.blendTime);
BitStream.WriteBit(animData.taskToBeRestoredOnAnimEnd);
BitStream.Write(static_cast<double>(animData.startTime));
BitStream.Write(animData.speed);
}
}
}

Expand Down
Loading