summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-10-18 15:40:06 +0200
committerSergeanur <s.anureev@yandex.ua>2020-10-18 15:40:06 +0200
commitb91f6a45501634b55f6ef2c08d57c5293d5fd3a0 (patch)
tree34cdedbe9dda385d48a416d1c26ef220132d35f0 /src/peds
parentCleanup breaks CAutomobile::ProcessOpenDoor (diff)
downloadre3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar
re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.gz
re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.bz2
re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.lz
re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.xz
re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.zst
re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/Ped.cpp8
-rw-r--r--src/peds/Population.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 0c469942..7c9b78f4 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -14606,11 +14606,11 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
if (!collidingEnt->IsBuilding())
((CPhysical*)collidingEnt)->AddCollisionRecord(this);
- if (ourCollidedSpheres > 0 && (collidingEnt->IsBuilding() || collidingEnt->IsStatic())) {
+ if (ourCollidedSpheres > 0 && (collidingEnt->IsBuilding() || collidingEnt->GetIsStatic())) {
bHasHitWall = true;
}
}
- if (collidingEnt->IsBuilding() || collidingEnt->IsStatic()) {
+ if (collidingEnt->IsBuilding() || collidingEnt->GetIsStatic()) {
if (bWasStanding) {
CVector sphereNormal;
@@ -15956,7 +15956,7 @@ CPed::SeekCar(void)
} else {
m_fRotationCur = m_fRotationDest;
if (!bVehEnterDoorIsBlocked) {
- vehToSeek->bIsStatic = false;
+ vehToSeek->SetIsStatic(false);
if (m_objective == OBJECTIVE_SOLICIT_VEHICLE) {
SetSolicit(1000);
} else if (m_objective == OBJECTIVE_BUY_ICE_CREAM) {
@@ -16637,7 +16637,7 @@ CPed::SpawnFlyingComponent(int pedNode, int8 direction)
obj->m_fElasticity = 0.03f;
obj->m_fBuoyancy = m_fMass*GRAVITY/0.75f;
obj->ObjectCreatedBy = TEMP_OBJECT;
- obj->bIsStatic = false;
+ obj->SetIsStatic(false);
obj->bIsPickup = false;
obj->m_nSpecialCollisionResponseCases = COLLRESPONSE_SMALLBOX;
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index a1bde005..b3eaf471 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -972,7 +972,7 @@ CPopulation::ConvertToRealObject(CDummyObject *dummy)
if (IsGlass(obj->GetModelIndex())) {
obj->bIsVisible = false;
} else if (obj->GetModelIndex() == MI_BUOY) {
- obj->bIsStatic = false;
+ obj->SetIsStatic(false);
obj->m_vecMoveSpeed = CVector(0.0f, 0.0f, -0.001f);
obj->bTouchingWater = true;
obj->AddToMovingList();