diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 14:06:55 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 14:06:55 +0200 |
| commit | 4cc1bb92e74eaabe9d5ef3d20fb658d577699fa9 (patch) | |
| tree | 2f970e7b4fc457d3312b8ee3fef2d0de72f6fff8 /src/core/AnimViewer.cpp | |
| parent | More use of GetModelIndex (diff) | |
| download | re3-4cc1bb92e74eaabe9d5ef3d20fb658d577699fa9.tar re3-4cc1bb92e74eaabe9d5ef3d20fb658d577699fa9.tar.gz re3-4cc1bb92e74eaabe9d5ef3d20fb658d577699fa9.tar.bz2 re3-4cc1bb92e74eaabe9d5ef3d20fb658d577699fa9.tar.lz re3-4cc1bb92e74eaabe9d5ef3d20fb658d577699fa9.tar.xz re3-4cc1bb92e74eaabe9d5ef3d20fb658d577699fa9.tar.zst re3-4cc1bb92e74eaabe9d5ef3d20fb658d577699fa9.zip | |
Diffstat (limited to 'src/core/AnimViewer.cpp')
| -rw-r--r-- | src/core/AnimViewer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp index 992dffb5..00d39066 100644 --- a/src/core/AnimViewer.cpp +++ b/src/core/AnimViewer.cpp @@ -148,7 +148,7 @@ LastPedModelId(int modelId) CBaseModelInfo *model; for (int i = modelId; i >= 0; i--) { model = CModelInfo::GetModelInfo(i); - if (model->m_type == MITYPE_PED) + if (model->GetModelType() == MITYPE_PED) return i; } return modelId; @@ -160,7 +160,7 @@ LastVehicleModelId(int modelId) CBaseModelInfo* model; for (int i = modelId; i >= 0; i--) { model = CModelInfo::GetModelInfo(i); - if (model->m_type == MITYPE_VEHICLE) + if (model->GetModelType() == MITYPE_VEHICLE) return i; } return modelId; @@ -222,7 +222,7 @@ CAnimViewer::Update(void) CBaseModelInfo *modelInfo = CModelInfo::GetModelInfo(modelId); CEntity *newEntity = nil; - if (modelInfo->m_type == MITYPE_PED) { + if (modelInfo->GetModelType() == MITYPE_PED) { int animGroup = ((CPedModelInfo*)modelInfo)->m_animGroup; if (animId > ANIM_IDLE_STANCE) @@ -257,7 +257,7 @@ CAnimViewer::Update(void) if (!pTarget) { - if (modelInfo->m_type == MITYPE_VEHICLE) { + if (modelInfo->GetModelType() == MITYPE_VEHICLE) { CVehicleModelInfo* veh = (CVehicleModelInfo*)modelInfo; if (veh->m_vehicleType != VEHICLE_TYPE_CAR) { @@ -281,7 +281,7 @@ CAnimViewer::Update(void) newEntity->SetStatus(STATUS_ABANDONED); } newEntity->bIsStuck = true; - } else if (modelInfo->m_type == MITYPE_PED) { + } else if (modelInfo->GetModelType() == MITYPE_PED) { pTarget = newEntity = new CPed(PEDTYPE_CIVMALE); newEntity->SetModelIndex(modelId); } else { @@ -301,9 +301,9 @@ CAnimViewer::Update(void) } pTarget->GetMatrix().GetPosition().z = 0.0f; - if (modelInfo->m_type != MITYPE_PED) { + if (modelInfo->GetModelType() != MITYPE_PED) { - if (modelInfo->m_type == MITYPE_VEHICLE) { + if (modelInfo->GetModelType() == MITYPE_VEHICLE) { if (pad->NewState.LeftShoulder1 && !pad->OldState.LeftShoulder1) { nextModelId = LastPedModelId(modelId); |