summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-08-20 10:33:02 +0200
committeraap <aap@papnet.eu>2021-08-20 10:33:02 +0200
commitaed313d81c7602e49dc5f0d2ccf382811744d0bb (patch)
tree6104b4d4b7497395e7f6619ea74700c40b38b49c /src/vehicles/Vehicle.cpp
parentdisable switch workflow for now (diff)
downloadre3-aed313d81c7602e49dc5f0d2ccf382811744d0bb.tar
re3-aed313d81c7602e49dc5f0d2ccf382811744d0bb.tar.gz
re3-aed313d81c7602e49dc5f0d2ccf382811744d0bb.tar.bz2
re3-aed313d81c7602e49dc5f0d2ccf382811744d0bb.tar.lz
re3-aed313d81c7602e49dc5f0d2ccf382811744d0bb.tar.xz
re3-aed313d81c7602e49dc5f0d2ccf382811744d0bb.tar.zst
re3-aed313d81c7602e49dc5f0d2ccf382811744d0bb.zip
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
-rw-r--r--src/vehicles/Vehicle.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 591a9f83..be4012eb 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -1672,7 +1672,7 @@ CVehicle::IsLawEnforcementVehicle(void)
case MI_RHINO:
case MI_BARRACKS:
// case MI_FBIRANCH:
-// case MI_VICECHEE:
+ case MI_VICECHEE:
return true;
default:
return false;
@@ -1690,8 +1690,8 @@ CVehicle::UsesSiren(void)
case MI_POLICE:
case MI_ENFORCER:
case MI_PREDATOR:
-// case MI_FBIRANCH:
-// case MI_VICECHEE:
+ case MI_FBIRANCH:
+ case MI_VICECHEE:
return true;
default:
return false;
@@ -1955,12 +1955,11 @@ CVehicle::SetDriver(CPed *driver)
case MI_ENFORCER:
driver->m_fArmour = Max(driver->m_fArmour, CWorld::Players[0].m_nMaxArmour);
break;
-/*
+
case MI_CADDY:
if(!(driver->IsPlayer() && ((CPlayerPed*)driver)->DoesPlayerWantNewWeapon(WEAPONTYPE_GOLFCLUB, true)))
CStreaming::RequestModel(MI_GOLFCLUB, STREAMFLAGS_DONT_REMOVE);
break;
-*/
}
}
@@ -2035,12 +2034,10 @@ CVehicle::RemoveDriver(void)
bFreebies = false;
}
CStreaming::SetModelIsDeletable(MI_SHOTGUN);
-/*
}else if(GetModelIndex() == MI_CADDY && CStreaming::HasModelLoaded(MI_GOLFCLUB)){
if(((CPlayerPed*)pDriver)->DoesPlayerWantNewWeapon(WEAPONTYPE_GOLFCLUB, true))
pDriver->GiveWeapon(WEAPONTYPE_GOLFCLUB, 1, true);
CStreaming::SetModelIsDeletable(MI_GOLFCLUB);
-*/
}
}
pDriver = nil;