diff options
| author | aap <aap@papnet.eu> | 2019-08-16 18:28:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 18:28:52 +0200 |
| commit | 41e8caeb6e2e4ae3e60aaf69e7c7d62a7aaeeeea (patch) | |
| tree | a1cccdd7386516fb8bb6daf7b9c491b1b12c5924 /src/core/AnimViewer.cpp | |
| parent | Merge pull request #192 from erorcun/erorcun (diff) | |
| parent | Little CPed fixes & Peddebug (diff) | |
| download | re3-41e8caeb6e2e4ae3e60aaf69e7c7d62a7aaeeeea.tar re3-41e8caeb6e2e4ae3e60aaf69e7c7d62a7aaeeeea.tar.gz re3-41e8caeb6e2e4ae3e60aaf69e7c7d62a7aaeeeea.tar.bz2 re3-41e8caeb6e2e4ae3e60aaf69e7c7d62a7aaeeeea.tar.lz re3-41e8caeb6e2e4ae3e60aaf69e7c7d62a7aaeeeea.tar.xz re3-41e8caeb6e2e4ae3e60aaf69e7c7d62a7aaeeeea.tar.zst re3-41e8caeb6e2e4ae3e60aaf69e7c7d62a7aaeeeea.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/AnimViewer.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp index b80fbcc7..30773889 100644 --- a/src/core/AnimViewer.cpp +++ b/src/core/AnimViewer.cpp @@ -213,7 +213,7 @@ CAnimViewer::Update(void) AssocGroupId animGroup = ASSOCGRP_STD; int nextModelId = modelId; CBaseModelInfo *modelInfo = CModelInfo::GetModelInfo(modelId); - CEntity *entity = nil; + CEntity *newEntity = nil; if (modelInfo->m_type == MITYPE_PED) { int animGroup = ((CPedModelInfo*)modelInfo)->m_animGroup; @@ -256,34 +256,34 @@ CAnimViewer::Update(void) { v33 = (CBoat*)CVehicle::operator new((CVehicle*)0x488, v6); CBoat::CBoat(v33, modelId, 1u); - entity = (int)v33; + newEntity = (int)v33; pTarget = (int)v33; } else { -*/ entity = pTarget = new CObject(modelId, true); +*/ newEntity = pTarget = new CObject(modelId, true); if (!modelInfo->GetColModel()) { modelInfo->SetColModel(&CTempColModels::ms_colModelWheel1); } // } } else { - entity = pTarget = new CAutomobile(modelId, RANDOM_VEHICLE); - entity->m_status = STATUS_ABANDONED; + newEntity = pTarget = new CAutomobile(modelId, RANDOM_VEHICLE); + newEntity->m_status = STATUS_ABANDONED; } - entity->bIsStuck = true; + newEntity->bIsStuck = true; } else if (modelInfo->m_type == MITYPE_PED) { - pTarget = entity = new CPed(PEDTYPE_CIVMALE); - entity->SetModelIndex(modelId); + pTarget = newEntity = new CPed(PEDTYPE_CIVMALE); + newEntity->SetModelIndex(modelId); } else { - entity = pTarget = new CObject(modelId, true); + newEntity = pTarget = new CObject(modelId, true); if (!modelInfo->GetColModel()) { modelInfo->SetColModel(&CTempColModels::ms_colModelWheel1); } - entity->bIsStuck = true; + newEntity->bIsStuck = true; } - entity->GetPosition() = CVector(0.0f, 0.0f, 0.0f); - CWorld::Add(entity); + newEntity->GetPosition() = CVector(0.0f, 0.0f, 0.0f); + CWorld::Add(newEntity); TheCamera.TakeControl(pTarget, 9, 2, 1); } if (pTarget->m_type == ENTITY_TYPE_VEHICLE || pTarget->m_type == ENTITY_TYPE_PED || pTarget->m_type == ENTITY_TYPE_OBJECT) { |