Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-23 02:42:38 +01:00
Code Issues Projects Releases Wiki Activity

- improve car cop lights code flow

Browse Source
This commit is contained in:
Ilya Shurumov 2020-12-23 16:21:54 +06:00
parent b092358afd
commit a6b80c7213
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src_rebuild/GAME/C/CARS.C
View File

@ -1477,7 +1477,7 @@ void DrawCar(CAR_DATA* cp, int view)
else if (cp->controlType == CONTROL_TYPE_CIV_AI)
CivCarFX(cp);
if (gLightsOn != 0 && lightsOnDelay[cp->id] == 0)
if (gLightsOn && lightsOnDelay[cp->id] == 0)
{
if (cp->controlType == CONTROL_TYPE_CIV_AI)
{
@ -1488,26 +1488,16 @@ void DrawCar(CAR_DATA* cp, int view)
AddNightLights(cp);
}
if (cp->controlType == CONTROL_TYPE_PURSUER_AI)
if(CarHasSiren(cp->ap.model))
{
if (MissionHeader->residentModels[3] == 0)
if ((IS_ROADBLOCK_CAR(cp) || cp->controlType == CONTROL_TYPE_PURSUER_AI) || // any regular cop car including roadblock
gInGameCutsceneActive && cp->controlType == CONTROL_TYPE_CUTSCENE && force_siren[CAR_INDEX(cp)] != 0 || // any car with siren in cutscene
gCurrentMissionNumber == 26 && cp->controlType == CONTROL_TYPE_CUTSCENE && cp->ap.model == 4) // Vegas ambulance
{
if (cp->ai.p.dying < 75)
AddCopCarLight(cp);
return;
}
}
// optimzed check for hndType, controlType, controlFlags
if (!IS_ROADBLOCK_CAR(cp) && (gInGameCutsceneActive == 0 || cp->controlType != CONTROL_TYPE_CUTSCENE || force_siren[CAR_INDEX(cp)] == 0))
{
if (gCurrentMissionNumber != 26 || cp->ap.model != 4 || cp->controlType != CONTROL_TYPE_CUTSCENE)
return;
}
if (cp->ai.p.dying < 75)
AddCopCarLight(cp);
}
// [D] [T]