- do not check felony when adding cop lights

- fix bugs
This commit is contained in:
Ilya Shurumov 2020-06-18 02:11:06 +06:00
parent 6d53ce9222
commit eed1d58868
3 changed files with 4 additions and 10 deletions

View File

@ -1025,12 +1025,7 @@ void DrawCar(_CAR_DATA *cp, int view)
if (cp->controlType == 3) if (cp->controlType == 3)
{ {
if (player[0].playerCarId < 0) if (MissionHeader->residentModels[3] == 0)
psVar7 = &pedestrianFelony;
else
psVar7 = &car_data[player[0].playerCarId].felonyRating;
if (*psVar7 > 0x292 && (MissionHeader->residentModels[3] == 0))
{ {
if (cp->ai.p.dying < 75) if (cp->ai.p.dying < 75)
AddCopCarLight(cp); AddCopCarLight(cp);

View File

@ -749,7 +749,7 @@ void StoreVertexLists(void)
{ {
cTannerVNumbers[pBVar2->id] = -1; cTannerVNumbers[pBVar2->id] = -1;
} }
else else if(*pBVar2->pModel != NULL)
{ {
pMVar5 = *pBVar2->pModel; pMVar5 = *pBVar2->pModel;
local_a2_76 = (SVECTOR *)pMVar5->vertices; local_a2_76 = (SVECTOR *)pMVar5->vertices;

View File

@ -2005,6 +2005,7 @@ void ClearRegion(int target_region)
// End Line: 3837 // End Line: 3837
extern bool gDemoLevel; extern bool gDemoLevel;
extern bool gDriver1Level;
// [D] // [D]
int LoadRegionData(int region, int target_region) int LoadRegionData(int region, int target_region)
@ -2029,8 +2030,6 @@ int LoadRegionData(int region, int target_region)
offset = spoolptr->offset; offset = spoolptr->offset;
#ifndef PSX #ifndef PSX
extern bool gDriver1Level;
if (gDemoLevel) if (gDemoLevel)
{ {
RequestSpool(0, 0, offset, spoolptr->roadm_size, PVS_Buffers[target_region], NULL); RequestSpool(0, 0, offset, spoolptr->roadm_size, PVS_Buffers[target_region], NULL);
@ -4351,7 +4350,7 @@ void InitSpecSpool(void)
} }
#ifndef PSX #ifndef PSX
if(gDemoLevel) if(gDemoLevel || gDriver1Level)
allowSpecSpooling = 0; allowSpecSpooling = 0;
#endif #endif