Skip to content

Commit b026283

Browse files
committed
fixes
1 parent c4d2bad commit b026283

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ void CWeaponRPCs::TakeWeapons(CClientEntity* pSource, NetBitStreamInterface& bit
192192
if (!bitStream.Read(count))
193193
return;
194194

195-
CClientPed* pPed = m_pPedManager->Get(pSource->GetID(), true);
196-
if (!pPed)
195+
CClientPed* ped = m_pPedManager->Get(pSource->GetID(), true);
196+
if (!ped)
197197
return;
198198

199199
for (std::uint32_t i = 0; i < count; i++)
@@ -205,17 +205,17 @@ void CWeaponRPCs::TakeWeapons(CClientEntity* pSource, NetBitStreamInterface& bit
205205
if (!CClientPickupManager::IsValidWeaponID(weaponID))
206206
continue;
207207

208-
if (pPed->IsLocalPlayer())
208+
if (ped->IsLocalPlayer())
209209
{
210-
pPed->RemoveWeapon(static_cast<eWeaponType>(weaponID));
210+
ped->RemoveWeapon(static_cast<eWeaponType>(weaponID));
211211
}
212212
else
213213
{
214-
CWeapon* pPlayerWeapon = pPed->GetWeapon((eWeaponType)weaponID);
215-
if (pPlayerWeapon)
214+
CWeapon* playerWeapon = ped->GetWeapon(static_cast<eWeaponType>(weaponID));
215+
if (playerWeapon)
216216
{
217-
pPlayerWeapon->SetAmmoInClip(0);
218-
pPlayerWeapon->SetAmmoTotal(0);
217+
playerWeapon->SetAmmoInClip(0);
218+
playerWeapon->SetAmmoTotal(0);
219219
}
220220
}
221221
}

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4977,7 +4977,7 @@ bool CStaticFunctionDefinitions::TakeAllWeapons(CElement* pElement)
49774977
if (!weapons.empty())
49784978
{
49794979
CBitStream BitStream;
4980-
std::uint32_t weaponsTaken = (std::uint32_t)weapons.size();
4980+
std::uint32_t weaponsTaken = static_cast<std::uint32_t>(weapons.size());
49814981

49824982
BitStream.pBitStream->Write(weaponsTaken);
49834983

0 commit comments

Comments
 (0)