added some missing functions
This commit is contained in:
parent
2650fa9a92
commit
35258b9b9c
@ -111,6 +111,8 @@ const int32 gaCarsToCollectInCraigsGarages[TOTAL_COLLECTCARS_GARAGES][TOTAL_COLL
|
|||||||
{ MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_CHEETAH, MI_TAXI, MI_ESPERANT, MI_SENTINEL, MI_IDAHO }
|
{ MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_CHEETAH, MI_TAXI, MI_ESPERANT, MI_SENTINEL, MI_IDAHO }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const int32 gaCarsToCollectIn60Seconds[] = { MI_CHEETAH, MI_TAXI, MI_ESPERANT, MI_SENTINEL, MI_IDAHO };
|
||||||
|
|
||||||
int32 CGarages::BankVansCollected;
|
int32 CGarages::BankVansCollected;
|
||||||
bool CGarages::BombsAreFree;
|
bool CGarages::BombsAreFree;
|
||||||
bool CGarages::RespraysAreFree;
|
bool CGarages::RespraysAreFree;
|
||||||
@ -2424,3 +2426,41 @@ CGarages::IsModelIndexADoor(uint32 id)
|
|||||||
id == MI_CRUSHERBODY ||
|
id == MI_CRUSHERBODY ||
|
||||||
id == MI_CRUSHERLID;
|
id == MI_CRUSHERLID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CGarages::StopCarFromBlowingUp(CAutomobile* pCar)
|
||||||
|
{
|
||||||
|
pCar->m_fFireBlowUpTimer = 0.0f;
|
||||||
|
pCar->m_fHealth = Max(pCar->m_fHealth, 300.0f);
|
||||||
|
pCar->Damage.SetEngineStatus(Max(pCar->Damage.GetEngineStatus(), 275));
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CGarage::Does60SecondsNeedThisCarAtAll(int mi)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < ARRAY_SIZE(gaCarsToCollectIn60Seconds); i++) {
|
||||||
|
if (gaCarsToCollectIn60Seconds[i] == mi)
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CGarage::Does60SecondsNeedThisCar(int mi)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < ARRAY_SIZE(gaCarsToCollectIn60Seconds); i++) {
|
||||||
|
if (gaCarsToCollectIn60Seconds[i] == mi)
|
||||||
|
return m_bCollectedCarsState & BIT(i);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void CGarage::MarkThisCarAsCollectedFor60Seconds(int mi)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < ARRAY_SIZE(gaCarsToCollectIn60Seconds); i++) {
|
||||||
|
if (gaCarsToCollectIn60Seconds[i] == mi)
|
||||||
|
m_bCollectedCarsState |= BIT(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CGarage::IsPlayerEntirelyInsideGarage()
|
||||||
|
{
|
||||||
|
return IsEntityEntirelyInside3D(FindPlayerVehicle() ? (CEntity*)FindPlayerVehicle() : (CEntity*)FindPlayerPed(), 0.0f);
|
||||||
|
}
|
||||||
|
@ -166,6 +166,10 @@ public:
|
|||||||
void FindDoorsEntities();
|
void FindDoorsEntities();
|
||||||
void FindDoorsEntitiesSectorList(CPtrList&, bool);
|
void FindDoorsEntitiesSectorList(CPtrList&, bool);
|
||||||
void PlayerArrestedOrDied();
|
void PlayerArrestedOrDied();
|
||||||
|
bool Does60SecondsNeedThisCarAtAll(int mi);
|
||||||
|
bool Does60SecondsNeedThisCar(int mi);
|
||||||
|
void MarkThisCarAsCollectedFor60Seconds(int mi);
|
||||||
|
bool IsPlayerEntirelyInsideGarage();
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -236,6 +240,7 @@ public:
|
|||||||
static bool IsModelIndexADoor(uint32 id);
|
static bool IsModelIndexADoor(uint32 id);
|
||||||
static void SetFreeBombs(bool bValue) { BombsAreFree = bValue; }
|
static void SetFreeBombs(bool bValue) { BombsAreFree = bValue; }
|
||||||
static void SetFreeResprays(bool bValue) { RespraysAreFree = bValue; }
|
static void SetFreeResprays(bool bValue) { RespraysAreFree = bValue; }
|
||||||
|
static void StopCarFromBlowingUp(CAutomobile*);
|
||||||
|
|
||||||
static bool IsCarSprayable(CVehicle*);
|
static bool IsCarSprayable(CVehicle*);
|
||||||
static float FindDoorHeightForMI(int32);
|
static float FindDoorHeightForMI(int32);
|
||||||
|
Loading…
Reference in New Issue
Block a user