mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-16 03:39:02 +00:00
Code Issues Projects Releases Wiki Activity

small cleanup

Browse source
This commit is contained in:
aap 2021-01-08 01:44:19 +01:00
parent 556b9ae574
commit d820df0dbe
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/animation/CutsceneMgr.cpp
View file

@ -633,8 +633,8 @@ CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver()
CStreaming::RemoveCurrentZonesModels(); CStreaming::RemoveCurrentZonesModels();
CStreaming::SetModelIsDeletable(MI_MALE01); CStreaming::SetModelIsDeletable(MI_MALE01);
CStreaming::SetModelTxdIsDeletable(MI_MALE01); CStreaming::SetModelTxdIsDeletable(MI_MALE01);
CStreaming::SetModelIsDeletable(MI_HMOCA); CStreaming::SetModelIsDeletable(MI_TAXI_D);
CStreaming::SetModelTxdIsDeletable(MI_HMOCA); CStreaming::SetModelTxdIsDeletable(MI_TAXI_D);
CStreaming::SetModelIsDeletable(MI_NIGHTSTICK); CStreaming::SetModelIsDeletable(MI_NIGHTSTICK);
CStreaming::SetModelTxdIsDeletable(MI_NIGHTSTICK); CStreaming::SetModelTxdIsDeletable(MI_NIGHTSTICK);
CStreaming::SetModelIsDeletable(MI_MISSILE); CStreaming::SetModelIsDeletable(MI_MISSILE);

7
src/peds/Population.cpp
View file

@ -558,12 +558,9 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
// Taxi side mission // Taxi side mission
if (CTheScripts::IsPlayerOnAMission()) { if (CTheScripts::IsPlayerOnAMission()) {
CPed *player = FindPlayerPed(); CPed *player = FindPlayerPed();
if (player && player->InVehicle()) { if (player && player->InVehicle() && player->m_pMyVehicle->IsTaxi())
int32 model = player->m_pMyVehicle->GetModelIndex();
if (model == MI_TAXI || model == MI_CABBIE || model == MI_ZEBRA || model == MI_KAUFMAN)
missionAndWeatherMult = 1.0f; missionAndWeatherMult = 1.0f;
} }
}
if (CDarkel::FrenzyOnGoing()) if (CDarkel::FrenzyOnGoing())
missionAndWeatherMult = 1.0f; missionAndWeatherMult = 1.0f;
int selectedMaxPeds = CGame::IsInInterior() ? CPopulation::MaxNumberOfPedsInUseInterior : CPopulation::MaxNumberOfPedsInUse; int selectedMaxPeds = CGame::IsInInterior() ? CPopulation::MaxNumberOfPedsInUseInterior : CPopulation::MaxNumberOfPedsInUse;
@ -843,7 +840,7 @@ CPopulation::AddPedInCar(CVehicle* car, bool isDriver)
pedType = PEDTYPE_COP; pedType = PEDTYPE_COP;
break; break;
default: default:
if (car->GetModelIndex() == MI_TAXI || car->GetModelIndex() == MI_CABBIE || car->GetModelIndex() == MI_ZEBRA || car->GetModelIndex() == MI_KAUFMAN) { if (car->IsTaxi()) {
if (isDriver) { if (isDriver) {
pedType = PEDTYPE_CIVMALE; pedType = PEDTYPE_CIVMALE;
preferredModel = MI_TAXI_D; preferredModel = MI_TAXI_D;

2
src/vehicles/HandlingMgr.cpp
View file

@ -350,7 +350,7 @@ void
cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling) cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling)
{ {
// convert distance to m, time to 1/50s // 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.fEngineAcceleration *= 1.0f/(50.0f*50.0f);
handling->Transmission.fMaxVelocity *= 1000.0f/(60.0f*60.0f * 50.0f); handling->Transmission.fMaxVelocity *= 1000.0f/(60.0f*60.0f * 50.0f);