Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge pull request #110 from erorcun/erorcun

Browse Source 
Little fixes
This commit is contained in:
aap 2019-07-04 15:39:31 +02:00 committed by GitHub
commit bdd5ed6a20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/entities/Ped.cpp
View File

@ -2073,12 +2073,12 @@ CPed::SetupLighting(void)
{ {
ActivateDirectional(); ActivateDirectional();
SetAmbientColoursForPedsCarsAndObjects(); SetAmbientColoursForPedsCarsAndObjects();
if (m_ped_flagB10) { if (bRenderScorched) {
WorldReplaceNormalLightsWithScorched(Scene.world, 0.1f); WorldReplaceNormalLightsWithScorched(Scene.world, 0.1f);
} else { } else {
// Note that this lightMult is only affected by LIGHT_DARKEN. If there's no LIGHT_DARKEN, it will be 1.0. // Note that this lightMult is only affected by LIGHT_DARKEN. If there's no LIGHT_DARKEN, it will be 1.0.
float lightMult = CPointLights::GenerateLightsAffectingObject(&GetPosition()); float lightMult = CPointLights::GenerateLightsAffectingObject(&GetPosition());
if (!m_ped_flagB20 && lightMult != 1.0f) { if (!bHasBlip && lightMult != 1.0f) {
SetAmbientAndDirectionalColours(lightMult); SetAmbientAndDirectionalColours(lightMult);
return true; return true;
} }
@ -2252,7 +2252,7 @@ CPed::CanPedDriveOff(void)
bool bool
CPed::CanPedJumpThis(int32 unused) CPed::CanPedJumpThis(int32 unused)
{ {
CVector2D forward(-sin(m_fRotationCur), -cos(m_fRotationCur)); CVector2D forward(-sin(m_fRotationCur), cos(m_fRotationCur));
CVector pos = GetPosition(); CVector pos = GetPosition();
// wat? // wat?
CVector forwardPos( CVector forwardPos(