mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 07:50:01 +00:00
small cleanup
This commit is contained in:
parent
556b9ae574
commit
d820df0dbe
|
@ -633,8 +633,8 @@ CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver()
|
|||
CStreaming::RemoveCurrentZonesModels();
|
||||
CStreaming::SetModelIsDeletable(MI_MALE01);
|
||||
CStreaming::SetModelTxdIsDeletable(MI_MALE01);
|
||||
CStreaming::SetModelIsDeletable(MI_HMOCA);
|
||||
CStreaming::SetModelTxdIsDeletable(MI_HMOCA);
|
||||
CStreaming::SetModelIsDeletable(MI_TAXI_D);
|
||||
CStreaming::SetModelTxdIsDeletable(MI_TAXI_D);
|
||||
CStreaming::SetModelIsDeletable(MI_NIGHTSTICK);
|
||||
CStreaming::SetModelTxdIsDeletable(MI_NIGHTSTICK);
|
||||
CStreaming::SetModelIsDeletable(MI_MISSILE);
|
||||
|
|
|
@ -558,12 +558,9 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
|
|||
// Taxi side mission
|
||||
if (CTheScripts::IsPlayerOnAMission()) {
|
||||
CPed *player = FindPlayerPed();
|
||||
if (player && player->InVehicle()) {
|
||||
int32 model = player->m_pMyVehicle->GetModelIndex();
|
||||
if (model == MI_TAXI || model == MI_CABBIE || model == MI_ZEBRA || model == MI_KAUFMAN)
|
||||
if (player && player->InVehicle() && player->m_pMyVehicle->IsTaxi())
|
||||
missionAndWeatherMult = 1.0f;
|
||||
}
|
||||
}
|
||||
if (CDarkel::FrenzyOnGoing())
|
||||
missionAndWeatherMult = 1.0f;
|
||||
int selectedMaxPeds = CGame::IsInInterior() ? CPopulation::MaxNumberOfPedsInUseInterior : CPopulation::MaxNumberOfPedsInUse;
|
||||
|
@ -843,7 +840,7 @@ CPopulation::AddPedInCar(CVehicle* car, bool isDriver)
|
|||
pedType = PEDTYPE_COP;
|
||||
break;
|
||||
default:
|
||||
if (car->GetModelIndex() == MI_TAXI || car->GetModelIndex() == MI_CABBIE || car->GetModelIndex() == MI_ZEBRA || car->GetModelIndex() == MI_KAUFMAN) {
|
||||
if (car->IsTaxi()) {
|
||||
if (isDriver) {
|
||||
pedType = PEDTYPE_CIVMALE;
|
||||
preferredModel = MI_TAXI_D;
|
||||
|
|
|
@ -350,7 +350,7 @@ void
|
|||
cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling)
|
||||
{
|
||||
// convert distance to m, time to 1/50s
|
||||
float velocity, a, b, specificVolume;
|
||||
float velocity, a, b;
|
||||
|
||||
handling->Transmission.fEngineAcceleration *= 1.0f/(50.0f*50.0f);
|
||||
handling->Transmission.fMaxVelocity *= 1000.0f/(60.0f*60.0f * 50.0f);
|
||||
|
|
Loading…
Reference in a new issue