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/entities | |
| 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/entities')
| -rw-r--r-- | src/entities/Building.cpp | 2 | ||||
| -rw-r--r-- | src/entities/Entity.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/entities/Building.cpp b/src/entities/Building.cpp index aad2d402..3c096636 100644 --- a/src/entities/Building.cpp +++ b/src/entities/Building.cpp @@ -12,7 +12,7 @@ CBuilding::ReplaceWithNewModel(int32 id) { DeleteRwObject(); - if(CModelInfo::GetModelInfo(m_modelIndex)->m_refCount == 0) + if (CModelInfo::GetModelInfo(m_modelIndex)->GetNumRefs() == 0) CStreaming::RemoveModel(m_modelIndex); m_modelIndex = id; diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 2a6211d6..4e4c9dbc 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -452,7 +452,7 @@ CEntity::PreRender(void) break; } - if(CModelInfo::GetModelInfo(GetModelIndex())->m_num2dEffects != 0) + if (CModelInfo::GetModelInfo(GetModelIndex())->GetNum2dEffects() != 0) ProcessLightsForEntity(); } @@ -611,7 +611,7 @@ CEntity::AddSteamsFromGround(CVector *unused) C2dEffect *effect; CVector pos; - n = CModelInfo::GetModelInfo(GetModelIndex())->m_num2dEffects; + n = CModelInfo::GetModelInfo(GetModelIndex())->GetNum2dEffects(); for(i = 0; i < n; i++){ effect = CModelInfo::GetModelInfo(GetModelIndex())->Get2dEffect(i); if(effect->type != EFFECT_PARTICLE) @@ -654,7 +654,7 @@ CEntity::ProcessLightsForEntity(void) flashTimer2 = 0; flashTimer3 = 0; - n = CModelInfo::GetModelInfo(GetModelIndex())->m_num2dEffects; + n = CModelInfo::GetModelInfo(GetModelIndex())->GetNum2dEffects(); for(i = 0; i < n; i++, flashTimer1 += 0x80, flashTimer2 += 0x100, flashTimer3 += 0x200){ effect = CModelInfo::GetModelInfo(GetModelIndex())->Get2dEffect(i); |