mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-17 19:54:08 +00:00
Code Issues Projects Releases Wiki Activity

merge attempt

Browse source
This commit is contained in:
Nikolay Korolev 2020-12-19 03:21:04 +03:00
commit 8d1996833b
68 changed files with 2149 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/peds/Ped.cpp
View file

@ -2664,19 +2664,19 @@ CPed::ProcessControl(void)
Flee();
break;
case PED_FOLLOW_PATH:
CPed::FollowPath();
FollowPath();
break;
case PED_PAUSE:
CPed::Pause();
Pause();
break;
case PED_ATTACK:
CPed::Attack();
Attack();
break;
case PED_FIGHT:
CPed::Fight();
Fight();
break;
case PED_CHAT:
CPed::Chat();
Chat();
break;
case PED_AIM_GUN:
if (m_pPointGunAt && m_pPointGunAt->IsPed()
@ -9697,17 +9697,6 @@ CPed::Say(uint16 audio, int32 time)
}
}
void
CPed::SetWeaponLockOnTarget(CEntity *target)
{
if (m_pPointGunAt)
m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
m_pPointGunAt = (CPed*)target;
if (target)
((CEntity*)target)->RegisterReference(&m_pPointGunAt);
}
#ifdef COMPATIBLE_SAVES
#define CopyFromBuf(buf, data) memcpy(&data, buf, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
#define CopyToBuf(buf, data) memcpy(buf, &data, sizeof(data)); SkipSaveBuf(buf, sizeof(data));