mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-26 02:33:45 +00:00
Code Issues Projects Releases Wiki Activity

friggin the riggin

Browse source
This commit is contained in:
Nikolay Korolev 2021-07-25 11:58:03 +03:00
parent dc729009ac
commit b69222e017
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/control/Script9.cpp
View file

@ -376,6 +376,7 @@ int8 CRunningScript::ProcessCommands1500To1599(int32 command)
} }
case COMMAND_CLEAR_OBJECT_LAST_WEAPON_DAMAGE: case COMMAND_CLEAR_OBJECT_LAST_WEAPON_DAMAGE:
{ {
CollectParameters(&m_nIp, 1);
CObject* pObject = CPools::GetObjectPool()->GetAt(GET_INTEGER_PARAM(0)); CObject* pObject = CPools::GetObjectPool()->GetAt(GET_INTEGER_PARAM(0));
if (!pObject) if (!pObject)
printf("CLEAR_OBJECT_LAST_WEAPON_DAMAGE - pObject doesn\'t exist"); printf("CLEAR_OBJECT_LAST_WEAPON_DAMAGE - pObject doesn\'t exist");

14
src/core/World.cpp
View file

@ -2294,3 +2294,17 @@ CWorld::IsWanderPathClear(CVector const& point1, CVector const& point2, float di
} }
return true; return true;
} }
void
CWorld::CheckObjectsEffectedByFire(float x, float y, float z, float radius, CEntity* reason)
{
int32 i = CPools::GetObjectPool()->GetSize();
while (i--) {
CObject* pObject = CPools::GetObjectPool()->GetSlot(i);
if (pObject) {
if (Abs(pObject->GetPosition().z - z) < 5.0f && Abs(pObject->GetPosition().x - x) < radius &&
Abs(pObject->GetPosition().y - y) < radius)
pObject->m_nLastWeaponToDamage = WEAPONTYPE_FLAMETHROWER;
}
}
}

1
src/core/World.h
View file

@ -155,6 +155,7 @@ public:
static void TriggerExplosion(const CVector& position, float fRadius, float fPower, CEntity* pCreator, bool bProcessVehicleBombTimer); static void TriggerExplosion(const CVector& position, float fRadius, float fPower, CEntity* pCreator, bool bProcessVehicleBombTimer);
static void TriggerExplosionSectorList(CPtrList& list, const CVector& position, float fRadius, float fPower, CEntity* pCreator, bool bProcessVehicleBombTimer); static void TriggerExplosionSectorList(CPtrList& list, const CVector& position, float fRadius, float fPower, CEntity* pCreator, bool bProcessVehicleBombTimer);
static void UseDetonator(CEntity *pEntity); static void UseDetonator(CEntity *pEntity);
static void CheckObjectsEffectedByFire(float, float, float, float, CEntity*);
// NB: following functions are unused (TODO?) // NB: following functions are unused (TODO?)
static void CastShadow(float, float, float, float); static void CastShadow(float, float, float, float);

6
src/weapons/ShotInfo.cpp
View file

@ -143,7 +143,9 @@ CShotInfo::Update()
} }
} }
} }
if (!((CTimer::GetFrameCounter() + slot) & 3)) if (!((CTimer::GetFrameCounter() + slot) & 3)) {
CWorld::SetCarsOnFire(shot.m_startPos.x, shot.m_startPos.y, shot.m_startPos.z, 4.0f, shot.m_sourceEntity); CWorld::SetCarsOnFire(shot.m_startPos.x, shot.m_startPos.y, shot.m_startPos.z, 2.0f, shot.m_sourceEntity);
CWorld::CheckObjectsEffectedByFire(shot.m_startPos.x, shot.m_startPos.y, shot.m_startPos.z, 2.0f, shot.m_sourceEntity);
}
} }
} }