Merge remote-tracking branch 'origin/master'
* origin/master: startproject now depends on librw Ped jump teleport/kill fix
This commit is contained in:
commit
a6b56e6b7a
@ -236,6 +236,10 @@ project "re3"
|
|||||||
targetname "re3"
|
targetname "re3"
|
||||||
targetdir "bin/%{cfg.platform}/%{cfg.buildcfg}"
|
targetdir "bin/%{cfg.platform}/%{cfg.buildcfg}"
|
||||||
|
|
||||||
|
if(_OPTIONS["with-librw"]) then
|
||||||
|
dependson "librw"
|
||||||
|
end
|
||||||
|
|
||||||
files { addSrcFiles("src") }
|
files { addSrcFiles("src") }
|
||||||
files { addSrcFiles("src/animation") }
|
files { addSrcFiles("src/animation") }
|
||||||
files { addSrcFiles("src/audio") }
|
files { addSrcFiles("src/audio") }
|
||||||
|
@ -2448,12 +2448,17 @@ CPed::ProcessControl(void)
|
|||||||
#ifdef VC_PED_PORTS
|
#ifdef VC_PED_PORTS
|
||||||
uint8 flyDir = 0;
|
uint8 flyDir = 0;
|
||||||
float feetZ = GetPosition().z - FEET_OFFSET;
|
float feetZ = GetPosition().z - FEET_OFFSET;
|
||||||
if ((obstacleForFlyingZ <= feetZ || obstacleForFlyingOtherDirZ >= 500.0f) && (obstacleForFlyingZ <= feetZ || obstacleForFlyingOtherDirZ <= feetZ)) {
|
#ifdef FIX_BUGS
|
||||||
if (obstacleForFlyingOtherDirZ > feetZ && obstacleForFlyingZ < 499.0f)
|
if (obstacleForFlyingZ > feetZ && obstacleForFlyingOtherDirZ < 501.0f)
|
||||||
flyDir = 2;
|
|
||||||
} else {
|
|
||||||
flyDir = 1;
|
flyDir = 1;
|
||||||
}
|
else if (obstacleForFlyingOtherDirZ > feetZ && obstacleForFlyingZ < 500.0f)
|
||||||
|
flyDir = 2;
|
||||||
|
#else
|
||||||
|
if ((obstacleForFlyingZ > feetZ && obstacleForFlyingOtherDirZ < 500.0f) || (obstacleForFlyingZ > feetZ && obstacleForFlyingOtherDirZ > feetZ))
|
||||||
|
flyDir = 1;
|
||||||
|
else if (obstacleForFlyingOtherDirZ > feetZ && obstacleForFlyingZ < 499.0f)
|
||||||
|
flyDir = 2;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (flyDir != 0 && !bSomeVCflag1) {
|
if (flyDir != 0 && !bSomeVCflag1) {
|
||||||
SetPosition((flyDir == 2 ? obstacleForFlyingOtherDir.point : obstacleForFlying.point));
|
SetPosition((flyDir == 2 ? obstacleForFlyingOtherDir.point : obstacleForFlying.point));
|
||||||
@ -2471,6 +2476,10 @@ CPed::ProcessControl(void)
|
|||||||
forceDir.z = 4.0f;
|
forceDir.z = 4.0f;
|
||||||
ApplyMoveForce(forceDir);
|
ApplyMoveForce(forceDir);
|
||||||
|
|
||||||
|
// What was that for?? It pushes player inside of collision sometimes and kills him.
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (!IsPlayer())
|
||||||
|
#endif
|
||||||
GetMatrix().GetPosition() += 0.25f * offsetToCheck;
|
GetMatrix().GetPosition() += 0.25f * offsetToCheck;
|
||||||
|
|
||||||
m_fRotationCur = CGeneral::GetRadianAngleBetweenPoints(offsetToCheck.x, offsetToCheck.y, 0.0f, 0.0f);
|
m_fRotationCur = CGeneral::GetRadianAngleBetweenPoints(offsetToCheck.x, offsetToCheck.y, 0.0f, 0.0f);
|
||||||
|
Loading…
Reference in New Issue
Block a user