random fixes

This commit is contained in:
aap 2020-05-11 17:04:08 +02:00
parent 85c44715ea
commit 95920d54f2
2 changed files with 16 additions and 16 deletions

View File

@ -262,7 +262,7 @@ CStreaming::Init(void)
} }
} }
#else #else
CStreaming::Init(); CStreaming::Init2();
#endif #endif
} }

View File

@ -362,21 +362,19 @@ CRenderer::SetupEntityVisibility(CEntity *ent)
ent->bNoBrightHeadLights = false; ent->bNoBrightHeadLights = false;
} }
return VIS_OFFSCREEN; return VIS_OFFSCREEN;
}else{
// All sorts of Clumps
if(ent->m_rwObject == nil || !ent->bIsVisible)
return VIS_INVISIBLE;
if(!ent->GetIsOnScreen())
return VIS_OFFSCREEN;
if(ent->bDrawLast){
dist = (ent->GetPosition() - ms_vecCameraPosition).Magnitude();
CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist);
ent->bDistanceFade = false;
return VIS_INVISIBLE;
}else
return VIS_VISIBLE;
} }
return VIS_INVISIBLE; // All sorts of Clumps
if(ent->m_rwObject == nil || !ent->bIsVisible)
return VIS_INVISIBLE;
if(!ent->GetIsOnScreen())
return VIS_OFFSCREEN;
if(ent->bDrawLast){
dist = (ent->GetPosition() - ms_vecCameraPosition).Magnitude();
CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist);
ent->bDistanceFade = false;
return VIS_INVISIBLE;
}
return VIS_VISIBLE;
} }
if(ent->IsObject() && if(ent->IsObject() &&
((CObject*)ent)->ObjectCreatedBy == TEMP_OBJECT){ ((CObject*)ent)->ObjectCreatedBy == TEMP_OBJECT){
@ -1196,8 +1194,10 @@ CRenderer::IsVehicleCullZoneVisible(CEntity *ent)
void void
CRenderer::RemoveVehiclePedLights(CEntity *ent, bool reset) CRenderer::RemoveVehiclePedLights(CEntity *ent, bool reset)
{ {
if(ent->bRenderScorched) if(ent->bRenderScorched){
WorldReplaceScorchedLightsWithNormal(Scene.world); WorldReplaceScorchedLightsWithNormal(Scene.world);
return;
}
CPointLights::RemoveLightsAffectingObject(); CPointLights::RemoveLightsAffectingObject();
if(reset) if(reset)
ReSetAmbientAndDirectionalColours(); ReSetAmbientAndDirectionalColours();