diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-11 08:36:58 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-11 08:36:58 +0200 |
| commit | 2c79080e1b16cb794b33e24508c11ab4fc259b48 (patch) | |
| tree | 9f602753c501bd1524179753beeb52771f43e924 /src/renderer | |
| parent | Merge remote-tracking branch 'upstream/lcs' into lcs (diff) | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-2c79080e1b16cb794b33e24508c11ab4fc259b48.tar re3-2c79080e1b16cb794b33e24508c11ab4fc259b48.tar.gz re3-2c79080e1b16cb794b33e24508c11ab4fc259b48.tar.bz2 re3-2c79080e1b16cb794b33e24508c11ab4fc259b48.tar.lz re3-2c79080e1b16cb794b33e24508c11ab4fc259b48.tar.xz re3-2c79080e1b16cb794b33e24508c11ab4fc259b48.tar.zst re3-2c79080e1b16cb794b33e24508c11ab4fc259b48.zip | |
Diffstat (limited to 'src/renderer')
| -rw-r--r-- | src/renderer/Fluff.cpp | 2 | ||||
| -rw-r--r-- | src/renderer/Renderer.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/renderer/Fluff.cpp b/src/renderer/Fluff.cpp index 404f1a4a..b914d1bc 100644 --- a/src/renderer/Fluff.cpp +++ b/src/renderer/Fluff.cpp @@ -929,7 +929,7 @@ CEscalator::AddThisOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, b m_pos2 = pos2; m_pos3 = pos3; - float escalatorStepHeight = CModelInfo::GetModelInfo(MI_ESCALATORSTEP)->GetColModel()->boundingBox.max.z; + float escalatorStepHeight = CModelInfo::GetColModel(MI_ESCALATORSTEP)->boundingBox.max.z; m_pos0.z -= escalatorStepHeight; m_pos1.z -= escalatorStepHeight; m_pos2.z -= escalatorStepHeight; diff --git a/src/renderer/Renderer.cpp b/src/renderer/Renderer.cpp index 8e460208..28177cca 100644 --- a/src/renderer/Renderer.cpp +++ b/src/renderer/Renderer.cpp @@ -141,7 +141,7 @@ CRenderer::RenderOneRoad(CEntity *e) if(gbDontRenderBuildings) return; if(gbShowCollisionPolys || gbShowCollisionPolysReflections || gbShowCollisionPolysNoShadows) - CCollision::DrawColModel_Coloured(e->GetMatrix(), *CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel(), e->GetModelIndex()); + CCollision::DrawColModel_Coloured(e->GetMatrix(), *CModelInfo::GetColModel(e->GetModelIndex()), e->GetModelIndex()); else #endif { @@ -164,7 +164,7 @@ CRenderer::RenderOneNonRoad(CEntity *e) #ifndef MASTER if(gbShowCollisionPolys || gbShowCollisionPolysReflections || gbShowCollisionPolysNoShadows){ if(!e->IsVehicle()){ - CCollision::DrawColModel_Coloured(e->GetMatrix(), *CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel(), e->GetModelIndex()); + CCollision::DrawColModel_Coloured(e->GetMatrix(), *CModelInfo::GetColModel(e->GetModelIndex()), e->GetModelIndex()); return; } }else |