diff options
| author | aap <aap@papnet.eu> | 2020-05-07 11:33:20 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-07 11:33:20 +0200 |
| commit | 05a1d64fbbe374dabb6572bb47d9a745464633bb (patch) | |
| tree | e56b03fbb2c768324a4b540645eac2dc8c5bdf08 /src/vehicles/Heli.cpp | |
| parent | changed default ID ranges. old default.ide incompatible now (diff) | |
| download | re3-05a1d64fbbe374dabb6572bb47d9a745464633bb.tar re3-05a1d64fbbe374dabb6572bb47d9a745464633bb.tar.gz re3-05a1d64fbbe374dabb6572bb47d9a745464633bb.tar.bz2 re3-05a1d64fbbe374dabb6572bb47d9a745464633bb.tar.lz re3-05a1d64fbbe374dabb6572bb47d9a745464633bb.tar.xz re3-05a1d64fbbe374dabb6572bb47d9a745464633bb.tar.zst re3-05a1d64fbbe374dabb6572bb47d9a745464633bb.zip | |
Diffstat (limited to 'src/vehicles/Heli.cpp')
| -rw-r--r-- | src/vehicles/Heli.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp index e4cd5883..d9c364d2 100644 --- a/src/vehicles/Heli.cpp +++ b/src/vehicles/Heli.cpp @@ -776,7 +776,6 @@ CHeli::InitHelis(void) for(i = 0; i < NUM_HELIS; i++) pHelis[i] = nil; - ((CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_ESCAPE))->SetColModel(&CTempColModels::ms_colModelPed1); ((CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_CHOPPER))->SetColModel(&CTempColModels::ms_colModelPed1); } @@ -787,10 +786,7 @@ GenerateHeli(bool catalina) CVector heliPos; int i; - if(catalina) - heli = new CHeli(MI_ESCAPE, PERMANENT_VEHICLE); - else - heli = new CHeli(MI_CHOPPER, PERMANENT_VEHICLE); + heli = new CHeli(MI_CHOPPER, PERMANENT_VEHICLE); if(catalina) heliPos = CVector(-224.0f, 201.0f, 83.0f); @@ -867,18 +863,6 @@ CHeli::UpdateHelis(void) pHelis[HELI_SCRIPT]->m_heliStatus = HELI_STATUS_FLY_AWAY; } - // Handle Catalina's heli - if(CatalinaHeliOn){ - if(CStreaming::HasModelLoaded(MI_ESCAPE) && pHelis[HELI_CATALINA] == nil){ - pHelis[HELI_CATALINA] = GenerateHeli(true); - pHelis[HELI_CATALINA]->m_heliType = HELI_TYPE_CATALINA; - }else - CStreaming::RequestModel(MI_ESCAPE, STREAMFLAGS_DONT_REMOVE); - }else{ - if(pHelis[HELI_CATALINA]) - pHelis[HELI_CATALINA]->m_heliStatus = HELI_STATUS_FLY_AWAY; - } - // Delete helis that we no longer need for(i = 0; i < NUM_HELIS; i++) if(pHelis[i] && pHelis[i]->m_heliStatus == HELI_STATUS_FLY_AWAY && pHelis[i]->GetPosition().z > 150.0f){ |