mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-24 02:40:00 +00:00
Merge pull request #516 from Nick007J/miami
miami (script + other) stuff
This commit is contained in:
commit
03cecb6f1c
|
@ -146,7 +146,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
|
|||
case MISSION_BLOCKPLAYER_CLOSE:
|
||||
if (FindSwitchDistanceFar(pVehicle) >= (FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() ||
|
||||
pVehicle->AutoPilot.m_bIgnorePathfinding) {
|
||||
if (FindPlayerVehicle() && FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.05f)
|
||||
if (FindPlayerVehicle() && FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.04f)
|
||||
#ifdef FIX_BUGS
|
||||
pVehicle->m_nTimeBlocked += CTimer::GetTimeStepInMilliseconds();
|
||||
#else
|
||||
|
@ -155,7 +155,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
|
|||
else
|
||||
pVehicle->m_nTimeBlocked = 0;
|
||||
if (!FindPlayerVehicle() || FindPlayerVehicle()->IsUpsideDown() ||
|
||||
FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.05f && pVehicle->m_nTimeBlocked > TIME_COPS_WAIT_TO_EXIT_AFTER_STOPPING) {
|
||||
FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.04f && pVehicle->m_nTimeBlocked > TIME_COPS_WAIT_TO_EXIT_AFTER_STOPPING) {
|
||||
if (pVehicle->bIsLawEnforcer &&
|
||||
(pVehicle->GetModelIndex() != MI_RHINO || pVehicle->m_randomSeed > 10000) &&
|
||||
(FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() < 10.0f) {
|
||||
|
|
|
@ -90,14 +90,16 @@ uint32 aCarsToKeepTime[MAX_CARS_TO_KEEP];
|
|||
void
|
||||
CCarCtrl::GenerateRandomCars()
|
||||
{
|
||||
if (CCutsceneMgr::IsRunning())
|
||||
if (CCutsceneMgr::IsRunning()) {
|
||||
CountDownToCarsAtStart = 2;
|
||||
return;
|
||||
}
|
||||
if (NumRandomCars < 30){
|
||||
if (CountDownToCarsAtStart == 0){
|
||||
GenerateOneRandomCar();
|
||||
}
|
||||
else if (--CountDownToCarsAtStart == 0) {
|
||||
for (int i = 0; i < 50; i++)
|
||||
for (int i = 0; i < 100; i++)
|
||||
GenerateOneRandomCar();
|
||||
CTheCarGenerators::GenerateEvenIfPlayerIsCloseCounter = 20;
|
||||
}
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include "CarGen.h"
|
||||
#include "CivilianPed.h"
|
||||
#include "Clock.h"
|
||||
#include "ColStore.h"
|
||||
#include "CopPed.h"
|
||||
#include "Coronas.h"
|
||||
#include "Cranes.h"
|
||||
|
@ -170,10 +171,46 @@ void CMissionCleanup::AddEntityToList(int32 id, uint8 type)
|
|||
m_nCount++;
|
||||
}
|
||||
|
||||
static void PossiblyWakeThisEntity(CPhysical* pEntity)
|
||||
{
|
||||
if (!pEntity->bIsStaticWaitingForCollision)
|
||||
return;
|
||||
if (CColStore::HasCollisionLoaded(pEntity->GetPosition())) {
|
||||
pEntity->bIsStaticWaitingForCollision = false;
|
||||
if (!pEntity->IsStatic())
|
||||
pEntity->AddToMovingList();
|
||||
}
|
||||
}
|
||||
|
||||
void CMissionCleanup::RemoveEntityFromList(int32 id, uint8 type)
|
||||
{
|
||||
for (int i = 0; i < MAX_CLEANUP; i++){
|
||||
if (m_sEntities[i].type == type && m_sEntities[i].id == id){
|
||||
switch (m_sEntities[i].type) {
|
||||
case CLEANUP_CAR:
|
||||
{
|
||||
CVehicle* v = CPools::GetVehiclePool()->GetAt(m_sEntities[i].id);
|
||||
if (v)
|
||||
PossiblyWakeThisEntity(v);
|
||||
break;
|
||||
}
|
||||
case CLEANUP_CHAR:
|
||||
{
|
||||
CPed* p = CPools::GetPedPool()->GetAt(m_sEntities[i].id);
|
||||
if (p)
|
||||
PossiblyWakeThisEntity(p);
|
||||
break;
|
||||
}
|
||||
case CLEANUP_OBJECT:
|
||||
{
|
||||
CObject* o = CPools::GetObjectPool()->GetAt(m_sEntities[i].id);
|
||||
if (o)
|
||||
PossiblyWakeThisEntity(o);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
m_sEntities[i].id = 0;
|
||||
m_sEntities[i].type = CLEANUP_UNUSED;
|
||||
m_nCount--;
|
||||
|
@ -181,6 +218,52 @@ void CMissionCleanup::RemoveEntityFromList(int32 id, uint8 type)
|
|||
}
|
||||
}
|
||||
|
||||
void CMissionCleanup::CheckIfCollisionHasLoadedForMissionObject()
|
||||
{
|
||||
for (int i = 0; i < MAX_CLEANUP; i++) {
|
||||
switch (m_sEntities[i].type) {
|
||||
case CLEANUP_CAR:
|
||||
{
|
||||
CVehicle* v = CPools::GetVehiclePool()->GetAt(m_sEntities[i].id);
|
||||
if (v)
|
||||
PossiblyWakeThisEntity(v);
|
||||
break;
|
||||
}
|
||||
case CLEANUP_CHAR:
|
||||
{
|
||||
CPed* p = CPools::GetPedPool()->GetAt(m_sEntities[i].id);
|
||||
if (p)
|
||||
PossiblyWakeThisEntity(p);
|
||||
break;
|
||||
}
|
||||
case CLEANUP_OBJECT:
|
||||
{
|
||||
CObject* o = CPools::GetObjectPool()->GetAt(m_sEntities[i].id);
|
||||
if (o)
|
||||
PossiblyWakeThisEntity(o);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CPhysical* CMissionCleanup::DoesThisEntityWaitForCollision(int i)
|
||||
{
|
||||
if (m_sEntities[i].type == CLEANUP_CAR) {
|
||||
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(m_sEntities[i].id);
|
||||
if (pVehicle && pVehicle->GetStatus() != STATUS_WRECKED)
|
||||
return pVehicle;
|
||||
}
|
||||
else if (m_sEntities[i].type == CLEANUP_CHAR) {
|
||||
CPed* pPed = CPools::GetPedPool()->GetAt(m_sEntities[i].id);
|
||||
if (pPed && !pPed->DyingOrDead())
|
||||
return pPed;
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
void CMissionCleanup::Process()
|
||||
{
|
||||
CPopulation::m_AllRandomPedsThisType = -1;
|
||||
|
@ -646,6 +729,7 @@ void CTheScripts::Process()
|
|||
float timeStep = CTimer::GetTimeStepInMilliseconds();
|
||||
UpsideDownCars.UpdateTimers();
|
||||
StuckCars.Process();
|
||||
MissionCleanup.CheckIfCollisionHasLoadedForMissionObject();
|
||||
DrawScriptSpheres();
|
||||
if (FailCurrentMission)
|
||||
--FailCurrentMission;
|
||||
|
@ -1728,6 +1812,8 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
|
|||
ped->SetPosition(pos);
|
||||
ped->SetOrientation(0.0f, 0.0f, 0.0f);
|
||||
CTheScripts::ClearSpaceForMissionEntity(pos, ped);
|
||||
if (m_bIsMissionScript)
|
||||
ped->bIsStaticWaitingForCollision = true;
|
||||
CWorld::Add(ped);
|
||||
ped->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pos);
|
||||
CPopulation::ms_nTotalMissionPeds++;
|
||||
|
@ -1946,6 +2032,8 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
|
|||
boat->AutoPilot.m_nCarMission = MISSION_NONE;
|
||||
boat->AutoPilot.m_nTempAction = TEMPACT_NONE; /* Animation ID? */
|
||||
boat->AutoPilot.m_nCruiseSpeed = boat->AutoPilot.m_fMaxTrafficSpeed = 20.0f;
|
||||
if (m_bIsMissionScript)
|
||||
boat->bIsStaticWaitingForCollision = true;
|
||||
CWorld::Add(boat);
|
||||
handle = CPools::GetVehiclePool()->GetIndex(boat);
|
||||
}
|
||||
|
@ -1970,6 +2058,8 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
|
|||
car->bEngineOn = false;
|
||||
car->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pos);
|
||||
car->bHasBeenOwnedByPlayer = true;
|
||||
if (m_bIsMissionScript)
|
||||
car->bIsStaticWaitingForCollision = true;
|
||||
CWorld::Add(car);
|
||||
handle = CPools::GetVehiclePool()->GetIndex(car);
|
||||
}
|
||||
|
@ -7324,6 +7414,8 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
|
|||
ped->SetPosition(pos);
|
||||
ped->SetOrientation(0.0f, 0.0f, 0.0f);
|
||||
CTheScripts::ClearSpaceForMissionEntity(pos, ped);
|
||||
if (m_bIsMissionScript)
|
||||
ped->bIsStaticWaitingForCollision = true;
|
||||
CWorld::Add(ped);
|
||||
ped->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pos);
|
||||
CPopulation::ms_nTotalMissionPeds++;
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
class CEntity;
|
||||
class CBuilding;
|
||||
class CPhysical;
|
||||
class CVehicle;
|
||||
class CPed;
|
||||
class CObject;
|
||||
|
@ -131,6 +132,8 @@ public:
|
|||
void AddEntityToList(int32, uint8);
|
||||
void RemoveEntityFromList(int32, uint8);
|
||||
void Process();
|
||||
void CheckIfCollisionHasLoadedForMissionObject();
|
||||
CPhysical* DoesThisEntityWaitForCollision(int i);
|
||||
};
|
||||
|
||||
struct CUpsideDownCarCheckEntry
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include "Timer.h"
|
||||
#include "Camera.h"
|
||||
#include "Frontend.h"
|
||||
#include "Physical.h"
|
||||
#include "ColStore.h"
|
||||
|
||||
CPool<ColDef,ColDef> *CColStore::ms_pColPool;
|
||||
|
@ -174,7 +175,13 @@ CColStore::LoadCollision(const CVector2D &pos)
|
|||
CGeneral::faststrcmp(GetColName(i), "yacht") == 0){
|
||||
wantThisOne = true;
|
||||
}else{
|
||||
// TODO: check mission cleanup list
|
||||
for (int j = 0; j < MAX_CLEANUP; j++) {
|
||||
CPhysical* pEntity = CTheScripts::MissionCleanup.DoesThisEntityWaitForCollision(j);
|
||||
if (pEntity /* !pEntity->bDontLoadCollision && !pEntity->bIsFrozen */) {
|
||||
if (GetBoundingBox(i).IsPointInside(pEntity->GetPosition(), -80.0f))
|
||||
wantThisOne = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(wantThisOne)
|
||||
|
@ -221,7 +228,7 @@ CColStore::HasCollisionLoaded(const CVector2D &pos)
|
|||
int i;
|
||||
|
||||
for(i = 1; i < COLSTORESIZE; i++)
|
||||
if(GetSlot(i) && GetBoundingBox(i).IsPointInside(pos, -110.0f) &&
|
||||
if(GetSlot(i) && GetBoundingBox(i).IsPointInside(pos, -115.0f) &&
|
||||
!GetSlot(i)->isLoaded)
|
||||
return false;
|
||||
return true;
|
||||
|
|
|
@ -74,6 +74,8 @@ CEntity::CEntity(void)
|
|||
bDistanceFade = false;
|
||||
m_flagE2 = false;
|
||||
|
||||
bIsStaticWaitingForCollision = false;
|
||||
|
||||
m_scanCode = 0;
|
||||
m_modelIndex = -1;
|
||||
m_rwObject = nil;
|
||||
|
|
|
@ -84,6 +84,7 @@ public:
|
|||
// flagsE
|
||||
uint32 m_flagE2 : 1;
|
||||
// TODO(MIAMI)
|
||||
uint32 bIsStaticWaitingForCollision : 1; // this is used by script created entities - they are static until the collision is loaded below them
|
||||
|
||||
uint16 m_scanCode;
|
||||
uint16 m_randomSeed;
|
||||
|
@ -98,7 +99,7 @@ public:
|
|||
eEntityStatus GetStatus() const { return (eEntityStatus)m_status; }
|
||||
void SetStatus(eEntityStatus status) { m_status = status; }
|
||||
CColModel *GetColModel(void) { return CModelInfo::GetModelInfo(m_modelIndex)->GetColModel(); }
|
||||
bool IsStatic(void) { return bIsStatic; }
|
||||
bool IsStatic(void) { return bIsStatic || bIsStaticWaitingForCollision; }
|
||||
#ifdef COMPATIBLE_SAVES
|
||||
void SaveEntityFlags(uint8*& buf);
|
||||
void LoadEntityFlags(uint8*& buf);
|
||||
|
|
|
@ -218,7 +218,8 @@ CPhysical::GetBoundRect(void)
|
|||
void
|
||||
CPhysical::AddToMovingList(void)
|
||||
{
|
||||
m_movingListNode = CWorld::GetMovingEntityList().InsertItem(this);
|
||||
if (!bIsStaticWaitingForCollision)
|
||||
m_movingListNode = CWorld::GetMovingEntityList().InsertItem(this);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in a new issue