mirror of
https://github.com/halpz/re3.git
synced 2025-07-03 12:00:51 +00:00
get rid of most --MIAMI comments
This commit is contained in:
withmorten
@ -18,8 +18,6 @@
|
||||
#include <float.h>
|
||||
#endif
|
||||
|
||||
// --MIAMI: file done
|
||||
|
||||
CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype)
|
||||
{
|
||||
SetModelIndex(mi);
|
||||
@ -420,7 +418,6 @@ CCivilianPed::ProcessControl(void)
|
||||
Avoid();
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::RunToReportCrime(eCrimeType crimeToReport)
|
||||
{
|
||||
|
||||
@ -20,8 +20,6 @@
|
||||
#include "Ropes.h"
|
||||
#include "Stinger.h"
|
||||
|
||||
// --MIAMI: file done except TODOs
|
||||
|
||||
CCopPed::CCopPed(eCopType copType, int32 modifier) : CPed(PEDTYPE_COP)
|
||||
{
|
||||
m_nCopType = copType;
|
||||
|
||||
@ -9,8 +9,6 @@
|
||||
#include "CarCtrl.h"
|
||||
#include "Accident.h"
|
||||
|
||||
// --MIAMI: file done
|
||||
|
||||
CEmergencyPed::CEmergencyPed(uint32 type) : CPed(type)
|
||||
{
|
||||
switch (type){
|
||||
|
||||
@ -6,8 +6,6 @@
|
||||
#include "Streaming.h"
|
||||
#include "Weapon.h"
|
||||
|
||||
// --MIAMI: file done
|
||||
|
||||
CGangInfo CGangs::Gang[NUM_GANGS];
|
||||
bool CGangs::GangAttackWithCops[NUM_GANGS];
|
||||
|
||||
|
||||
181
src/peds/Ped.cpp
181
src/peds/Ped.cpp
File diff suppressed because it is too large
Load Diff
@ -30,8 +30,6 @@
|
||||
#include "GameLogic.h"
|
||||
#include "Streaming.h"
|
||||
|
||||
//--MIAMI: file done
|
||||
|
||||
CVector vecPedCarDoorAnimOffset;
|
||||
CVector vecPedCarDoorLoAnimOffset;
|
||||
CVector vecPedVanRearDoorAnimOffset;
|
||||
@ -44,7 +42,6 @@ CVector vecPedHarleyBikeJumpRhsAnimOffset;
|
||||
CVector vecPedDirtBikeJumpRhsAnimOffset;
|
||||
CVector vecPedBikeKickAnimOffset;
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetObjectiveTimer(int time)
|
||||
{
|
||||
@ -55,7 +52,6 @@ CPed::SetObjectiveTimer(int time)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetStoredObjective(void)
|
||||
{
|
||||
@ -90,7 +86,6 @@ CPed::SetStoredObjective(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ForceStoredObjective(eObjective objective)
|
||||
{
|
||||
@ -124,7 +119,6 @@ CPed::ForceStoredObjective(eObjective objective)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::IsTemporaryObjective(eObjective objective)
|
||||
{
|
||||
@ -133,7 +127,6 @@ CPed::IsTemporaryObjective(eObjective objective)
|
||||
objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetObjective(eObjective newObj)
|
||||
{
|
||||
@ -180,7 +173,6 @@ CPed::SetObjective(eObjective newObj)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetObjective(eObjective newObj, void *entity)
|
||||
{
|
||||
@ -370,7 +362,6 @@ CPed::SetObjective(eObjective newObj, void *entity)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
// Only used in 01E1: SET_CHAR_OBJ_FOLLOW_ROUTE opcode
|
||||
// IDA fails very badly in here, puts a fake loop and ignores SetFollowRoute call...
|
||||
void
|
||||
@ -403,7 +394,6 @@ CPed::SetObjective(eObjective newObj, int16 routePoint, int16 routeType)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetObjective(eObjective newObj, CVector dest)
|
||||
{
|
||||
@ -543,7 +533,6 @@ CPed::SetObjective(eObjective newObj, CVector dest)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
|
||||
{
|
||||
@ -560,7 +549,6 @@ CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ClearObjective(void)
|
||||
{
|
||||
@ -586,7 +574,6 @@ CPed::ClearObjective(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ClearLeader(void)
|
||||
{
|
||||
@ -606,7 +593,6 @@ CPed::ClearLeader(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::UpdateFromLeader(void)
|
||||
{
|
||||
@ -765,7 +751,6 @@ CPed::UpdateFromLeader(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::RestorePreviousObjective(void)
|
||||
{
|
||||
@ -788,7 +773,6 @@ CPed::RestorePreviousObjective(void)
|
||||
bObjectiveCompleted = false;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ProcessObjective(void)
|
||||
{
|
||||
@ -2060,7 +2044,6 @@ CPed::ProcessObjective(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetFollowRoute(int16 currentPoint, int16 routeType)
|
||||
{
|
||||
@ -2073,7 +2056,6 @@ CPed::SetFollowRoute(int16 currentPoint, int16 routeType)
|
||||
m_nextRoutePointPos = CRouteNode::GetPointPosition(GetNextPointOnRoute());
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
int
|
||||
CPed::GetNextPointOnRoute(void)
|
||||
{
|
||||
@ -2101,7 +2083,6 @@ CPed::GetNextPointOnRoute(void)
|
||||
return nextPoint;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::HaveReachedNextPointOnRoute(float distToCountReached)
|
||||
{
|
||||
@ -2112,7 +2093,6 @@ CPed::HaveReachedNextPointOnRoute(float distToCountReached)
|
||||
return false;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::CanSeeEntity(CEntity *entity, float threshold)
|
||||
{
|
||||
@ -2138,7 +2118,6 @@ CPed::CanSeeEntity(CEntity *entity, float threshold)
|
||||
return neededTurn < threshold || TWOPI - threshold < neededTurn;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
// Only used while deciding which gun ped should switch to, if no ammo left.
|
||||
bool
|
||||
CPed::SelectGunIfArmed(void)
|
||||
@ -2159,7 +2138,6 @@ CPed::SelectGunIfArmed(void)
|
||||
SetCurrentWeapon(WEAPONTYPE_UNARMED);
|
||||
return false;
|
||||
}
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ReactToPointGun(CEntity *entWithGun)
|
||||
{
|
||||
@ -2244,7 +2222,6 @@ CPed::ReactToPointGun(CEntity *entWithGun)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ReactToAttack(CEntity *attacker)
|
||||
{
|
||||
@ -2317,7 +2294,6 @@ CPed::ReactToAttack(CEntity *attacker)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
|
||||
{
|
||||
@ -2562,7 +2538,6 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
{
|
||||
@ -2782,7 +2757,6 @@ CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
return;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
{
|
||||
@ -2868,7 +2842,6 @@ CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
|
||||
{
|
||||
@ -3018,7 +2991,6 @@ CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedShuffle(void)
|
||||
{
|
||||
@ -3034,7 +3006,6 @@ CPed::PedShuffle(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
|
||||
{
|
||||
@ -3101,7 +3072,6 @@ CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg)
|
||||
{
|
||||
@ -3113,7 +3083,6 @@ CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetFormation(eFormation type)
|
||||
{
|
||||
@ -3137,7 +3106,6 @@ CPed::SetFormation(eFormation type)
|
||||
m_pedFormation = type;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
CVector
|
||||
CPed::GetFormationPosition(void)
|
||||
{
|
||||
@ -3186,7 +3154,6 @@ CPed::GetFormationPosition(void)
|
||||
return m_pedInObjective->GetMatrix() * formationOffset;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
{
|
||||
@ -3326,7 +3293,6 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
return;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::LineUpPedWithCar(PedLineUpPhase phase)
|
||||
{
|
||||
@ -3663,7 +3629,6 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
|
||||
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetCarJack(CVehicle* car)
|
||||
{
|
||||
@ -3746,7 +3711,6 @@ CPed::SetCarJack(CVehicle* car)
|
||||
SetCarJack_AllClear(car, m_vehDoor, doorFlag);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag)
|
||||
{
|
||||
@ -3789,7 +3753,6 @@ CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack)
|
||||
{
|
||||
@ -3838,7 +3801,6 @@ CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack)
|
||||
veh->m_nGettingOutFlags |= GetCarDoorFlag(m_vehDoor);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::BeingDraggedFromCar(void)
|
||||
{
|
||||
@ -3904,7 +3866,6 @@ CPed::BeingDraggedFromCar(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetEnterCar(CVehicle *car, uint32 unused)
|
||||
{
|
||||
@ -3981,7 +3942,6 @@ CPed::SetEnterCar(CVehicle *car, uint32 unused)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
|
||||
{
|
||||
@ -4034,7 +3994,6 @@ CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::EnterCar(void)
|
||||
{
|
||||
@ -4078,7 +4037,6 @@ CPed::EnterCar(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::QuitEnteringCar(void)
|
||||
{
|
||||
@ -4127,7 +4085,6 @@ CPed::QuitEnteringCar(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetExitBoat(CVehicle *boat)
|
||||
{
|
||||
@ -4185,7 +4142,6 @@ CPed::SetExitBoat(CVehicle *boat)
|
||||
m_vecMoveSpeed = boat->m_vecMoveSpeed;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
// wantedDoorNode = 0 means that func. will determine it
|
||||
void
|
||||
CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
|
||||
@ -4570,7 +4526,6 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ExitCar(void)
|
||||
{
|
||||
@ -4642,7 +4597,6 @@ CPed::ExitCar(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
CVector
|
||||
CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component)
|
||||
{
|
||||
@ -4655,7 +4609,6 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component)
|
||||
return vehDoorPos;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen)
|
||||
{
|
||||
@ -4724,7 +4677,6 @@ CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen)
|
||||
{
|
||||
@ -4808,7 +4760,6 @@ CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen)
|
||||
return canEnter;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::GoToNearestDoor(CVehicle *veh)
|
||||
{
|
||||
@ -4818,7 +4769,6 @@ CPed::GoToNearestDoor(CVehicle *veh)
|
||||
SetMoveState(PEDMOVE_RUN);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
// Unused
|
||||
void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
|
||||
{
|
||||
@ -4832,7 +4782,6 @@ void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
|
||||
pPed->SetPosition(position);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetAnimOffsetForEnterOrExitVehicle(void)
|
||||
{
|
||||
@ -4994,7 +4943,6 @@ CPed::SetAnimOffsetForEnterOrExitVehicle(void)
|
||||
CAnimManager::RemoveAnimBlockRef(bikedBlock);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void *arg)
|
||||
{
|
||||
@ -5083,7 +5031,6 @@ CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void
|
||||
ped->m_nLastPedState = PED_WANDER_PATH;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
{
|
||||
@ -5180,7 +5127,6 @@ CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
ped->SetGetUp();
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
uint8
|
||||
CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos)
|
||||
{
|
||||
@ -5198,7 +5144,6 @@ CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos)
|
||||
return 1;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
uint8
|
||||
CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos)
|
||||
{
|
||||
@ -5257,7 +5202,6 @@ CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos)
|
||||
return 1;
|
||||
}
|
||||
|
||||
// --MIAMI: Done :D
|
||||
void
|
||||
CPed::PedSetInTrainCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
{
|
||||
@ -5407,7 +5351,6 @@ CPed::PedSetOutTrainCB(CAnimBlendAssociation *animAssoc, void *arg)
|
||||
}
|
||||
#endif
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::RegisterThreatWithGangPeds(CEntity *attacker)
|
||||
{
|
||||
@ -5471,7 +5414,6 @@ CPed::RegisterThreatWithGangPeds(CEntity *attacker)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
// Some helper function which doesn't exist in og game.
|
||||
inline void
|
||||
SelectClosestNodeForSeek(CPed *ped, CPathNode *node, CVector2D closeDist, CVector2D farDist, CPathNode *closeNode, CPathNode *closeNode2, int runCount = 3)
|
||||
@ -5501,7 +5443,6 @@ SelectClosestNodeForSeek(CPed *ped, CPathNode *node, CVector2D closeDist, CVecto
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords)
|
||||
{
|
||||
@ -5542,7 +5483,6 @@ CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords)
|
||||
return false;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::DuckAndCover(void)
|
||||
{
|
||||
@ -5731,7 +5671,6 @@ CPed::DuckAndCover(void)
|
||||
return false;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
CVector
|
||||
CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset)
|
||||
{
|
||||
@ -5779,7 +5718,6 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset)
|
||||
return veh->GetPosition() + doorPos;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
CVector
|
||||
CPed::GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float seatPosMult)
|
||||
{
|
||||
@ -5865,7 +5803,7 @@ CPed::GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float seatP
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done, but what is this parameter for?
|
||||
// TODO: what is this parameter for?
|
||||
void
|
||||
CPed::SetDuck(uint32 time, bool sth)
|
||||
{
|
||||
@ -5891,7 +5829,6 @@ CPed::SetDuck(uint32 time, bool sth)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::Duck(void)
|
||||
{
|
||||
@ -5918,7 +5855,6 @@ CPed::Duck(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ClearDuck(bool clearTimer)
|
||||
{
|
||||
@ -5941,7 +5877,6 @@ CPed::ClearDuck(bool clearTimer)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::InformMyGangOfAttack(CEntity *attacker)
|
||||
{
|
||||
@ -5976,7 +5911,6 @@ CPed::InformMyGangOfAttack(CEntity *attacker)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
{
|
||||
@ -5999,7 +5933,6 @@ CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg)
|
||||
veh->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_OK);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetSeekBoatPosition(CVehicle *boat)
|
||||
{
|
||||
@ -6015,7 +5948,6 @@ CPed::SetSeekBoatPosition(CVehicle *boat)
|
||||
SetPedState(PED_SEEK_IN_BOAT);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SeekBoatPosition(void)
|
||||
{
|
||||
@ -6037,7 +5969,6 @@ CPed::SeekBoatPosition(void)
|
||||
RestorePreviousState();
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::IsRoomToBeCarJacked(void)
|
||||
{
|
||||
@ -6061,7 +5992,6 @@ CPed::IsRoomToBeCarJacked(void)
|
||||
return false;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::AddInCarAnims(CVehicle* car, bool isDriver)
|
||||
{
|
||||
@ -6096,7 +6026,6 @@ CPed::AddInCarAnims(CVehicle* car, bool isDriver)
|
||||
StopNonPartialAnims();
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::RemoveDrivebyAnims()
|
||||
{
|
||||
@ -6124,7 +6053,6 @@ CPed::RemoveDrivebyAnims()
|
||||
animAssoc->blendDelta = -1000.0f;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::RemoveInCarAnims(void)
|
||||
{
|
||||
@ -6137,7 +6065,6 @@ CPed::RemoveInCarAnims(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::PositionPedOutOfCollision(void)
|
||||
{
|
||||
@ -6276,7 +6203,6 @@ CPed::PositionPedOutOfCollision(void)
|
||||
return true;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
// "Any" means he shouldn't have to be in vehicle.
|
||||
bool
|
||||
CPed::PositionAnyPedOutOfCollision(void)
|
||||
@ -6332,7 +6258,6 @@ CPed::PositionAnyPedOutOfCollision(void)
|
||||
return true;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::WarpPedToNearLeaderOffScreen(void)
|
||||
{
|
||||
@ -6366,7 +6291,6 @@ CPed::WarpPedToNearLeaderOffScreen(void)
|
||||
return teleported;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo)
|
||||
{
|
||||
@ -6400,7 +6324,6 @@ CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo)
|
||||
return teleported;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
int32
|
||||
CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWithTarget)
|
||||
{
|
||||
@ -6675,7 +6598,6 @@ CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWith
|
||||
return ATTACK_IN_PROGRESS;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
int32
|
||||
CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWithTarget)
|
||||
{
|
||||
@ -6930,7 +6852,6 @@ CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWith
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::CanBeDamagedByThisGangMember(CPed* who)
|
||||
{
|
||||
|
||||
@ -13,8 +13,6 @@ const int gcMaxSizeOfPizzaQueue = 5;
|
||||
const int gcMaxSizeOfShelterQueue = 5;
|
||||
const int gcMaxSizeOfIceCreamQueue = 1;
|
||||
|
||||
//--MIAMI: file done
|
||||
|
||||
std::vector<CVector> CPedShelterAttractor::ms_displacements;
|
||||
|
||||
CPedAttractorManager* GetPedAttractorManager()
|
||||
|
||||
@ -4,8 +4,6 @@
|
||||
#include "General.h"
|
||||
#include "Ped.h"
|
||||
|
||||
// --MIAMI: file done
|
||||
|
||||
// Corresponds to ped sounds (from SOUND_PED_DEATH to SOUND_PED_TAXI_CALL)
|
||||
PedAudioData CommentWaitTime[56] = {
|
||||
{ 500, 800, 500, 2 },
|
||||
|
||||
@ -26,8 +26,6 @@
|
||||
#include "Glass.h"
|
||||
#include "SpecialFX.h"
|
||||
|
||||
//--MIAMI: file done
|
||||
|
||||
uint16 nPlayerInComboMove;
|
||||
RpClump* flyingClumpTemp;
|
||||
|
||||
@ -159,7 +157,6 @@ CheckForPedsOnGroundToAttack(CPed *attacker, CPed **pedOnGround)
|
||||
return stateToReturn;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetPointGunAt(CEntity *to)
|
||||
{
|
||||
@ -202,7 +199,6 @@ CPed::SetPointGunAt(CEntity *to)
|
||||
Say(SOUND_PED_ATTACK);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PointGunAt(void)
|
||||
{
|
||||
@ -230,7 +226,6 @@ CPed::PointGunAt(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ClearPointGunAt(void)
|
||||
{
|
||||
@ -257,7 +252,6 @@ CPed::ClearPointGunAt(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetAttack(CEntity *victim)
|
||||
{
|
||||
@ -440,7 +434,6 @@ CPed::SetAttack(CEntity *victim)
|
||||
SetLookTimer(100);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ClearAttack(void)
|
||||
{
|
||||
@ -461,7 +454,6 @@ CPed::ClearAttack(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ClearAttackByRemovingAnim(void)
|
||||
{
|
||||
@ -497,7 +489,6 @@ CPed::ClearAttackByRemovingAnim(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
|
||||
{
|
||||
@ -577,7 +568,6 @@ CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
|
||||
{
|
||||
@ -611,7 +601,6 @@ CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
uint8
|
||||
CPed::CheckForPointBlankPeds(CPed *pedToVerify)
|
||||
{
|
||||
@ -655,7 +644,6 @@ CPed::CheckForPointBlankPeds(CPed *pedToVerify)
|
||||
return NO_POINT_BLANK_PED;
|
||||
}
|
||||
|
||||
// --MIAMI: Done except commented things
|
||||
void
|
||||
CPed::Attack(void)
|
||||
{
|
||||
@ -1043,7 +1031,6 @@ CPed::Attack(void)
|
||||
bIsAttacking = attackShouldContinue;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::StartFightAttack(uint8 buttonPressure)
|
||||
{
|
||||
@ -1136,7 +1123,6 @@ CPed::StartFightAttack(uint8 buttonPressure)
|
||||
nPlayerInComboMove = 0;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
|
||||
{
|
||||
@ -1380,7 +1366,6 @@ CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::Fight(void)
|
||||
{
|
||||
@ -1608,7 +1593,6 @@ CPed::Fight(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
int32
|
||||
CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon)
|
||||
{
|
||||
@ -1695,7 +1679,6 @@ CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon)
|
||||
return FIGHTMOVE_SHUFFLE_F;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
int32
|
||||
CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon)
|
||||
{
|
||||
@ -1936,7 +1919,6 @@ CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon)
|
||||
return choosenMove;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::EndFight(uint8 endType)
|
||||
{
|
||||
@ -1971,7 +1953,6 @@ CPed::EndFight(uint8 endType)
|
||||
m_nWaitTimer = 0;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::PlayHitSound(CPed *hitTo)
|
||||
{
|
||||
@ -2047,7 +2028,6 @@ CPed::PlayHitSound(CPed *hitTo)
|
||||
DMAudio.PlayOneShot(m_audioEntityId, soundId, (weapon << 8) | ENTITY_TYPE_PED);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon)
|
||||
{
|
||||
@ -2144,7 +2124,6 @@ CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon)
|
||||
return false;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece)
|
||||
{
|
||||
@ -2294,7 +2273,6 @@ CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg)
|
||||
{
|
||||
@ -2306,7 +2284,6 @@ CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::LoadFightData(void)
|
||||
{
|
||||
@ -2394,7 +2371,6 @@ CPed::LoadFightData(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCountDone, uint16 time, float angle)
|
||||
{
|
||||
@ -2417,7 +2393,6 @@ CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCount
|
||||
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::InvestigateEvent(void)
|
||||
{
|
||||
@ -2623,7 +2598,6 @@ CPed::InvestigateEvent(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::ClearInvestigateEvent(void)
|
||||
{
|
||||
@ -2649,7 +2623,6 @@ CPed::ClearInvestigateEvent(void)
|
||||
SetMoveState(PEDMOVE_WALK);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPieceTypes pedPiece, uint8 direction)
|
||||
{
|
||||
@ -3221,7 +3194,6 @@ RecurseFrameChildrenToCloneCB(RwFrame *frame, void *data)
|
||||
return newFrame;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::RemoveBodyPart(PedNode nodeId, int8 direction)
|
||||
{
|
||||
@ -3252,7 +3224,6 @@ CPed::RemoveBodyPart(PedNode nodeId, int8 direction)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
CObject*
|
||||
CPed::SpawnFlyingComponent(int pedNode, int8 direction)
|
||||
{
|
||||
@ -3260,7 +3231,6 @@ CPed::SpawnFlyingComponent(int pedNode, int8 direction)
|
||||
return nil;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
// III leftover and unused
|
||||
void
|
||||
CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer)
|
||||
@ -3303,14 +3273,12 @@ CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::IsPedHeadAbovePos(float zOffset)
|
||||
{
|
||||
return zOffset + GetPosition().z < GetNodePosition(PED_HEAD).z;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPed::PlacePedOnDryLand(void)
|
||||
{
|
||||
@ -3362,7 +3330,6 @@ CPed::PlacePedOnDryLand(void)
|
||||
return true;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::CollideWithPed(CPed *collideWith)
|
||||
{
|
||||
@ -3629,7 +3596,6 @@ CPed::CollideWithPed(CPed *collideWith)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::KillPedWithCar(CVehicle *car, float impulse)
|
||||
{
|
||||
@ -3867,7 +3833,6 @@ CPed::KillPedWithCar(CVehicle *car, float impulse)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::DriveVehicle(void)
|
||||
{
|
||||
@ -4175,7 +4140,6 @@ CPed::DriveVehicle(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPed::RemoveWeaponAnims(int unused, float animDelta)
|
||||
{
|
||||
|
||||
@ -7,8 +7,6 @@
|
||||
#include "General.h"
|
||||
#include "RwHelper.h"
|
||||
|
||||
//--MIAMI: file done
|
||||
|
||||
LimbMovementInfo CPedIK::ms_torsoInfo = { DEGTORAD(50.0f), DEGTORAD(-50.0f), DEGTORAD(8.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };
|
||||
LimbMovementInfo CPedIK::ms_headInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(15.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(8.0f) };
|
||||
LimbMovementInfo CPedIK::ms_headRestoreInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(10.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
#include "PedPlacement.h"
|
||||
#include "World.h"
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPedPlacement::FindZCoorForPed(CVector* pos)
|
||||
{
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
#include "main.h"
|
||||
#include "PedRoutes.h"
|
||||
|
||||
// --MIAMI: file done
|
||||
|
||||
CRouteNode gaRoutes[NUMPEDROUTES];
|
||||
|
||||
void
|
||||
|
||||
@ -4,8 +4,6 @@
|
||||
#include "FileMgr.h"
|
||||
#include "PedType.h"
|
||||
|
||||
// --MIAMI: file done
|
||||
|
||||
CPedType *CPedType::ms_apPedType[NUM_PEDTYPES];
|
||||
CPedStats *CPedStats::ms_apPedStats[NUM_PEDSTATS];
|
||||
|
||||
|
||||
@ -51,7 +51,6 @@ CPlayerPed::~CPlayerPed()
|
||||
delete m_pWanted;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
|
||||
{
|
||||
m_fMoveSpeed = 0.0f;
|
||||
@ -100,7 +99,6 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
|
||||
idleAnimBlockIndex = CAnimManager::GetAnimationBlockIndex("playidles");
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::ClearWeaponTarget()
|
||||
{
|
||||
@ -112,21 +110,18 @@ CPlayerPed::ClearWeaponTarget()
|
||||
ClearPointGunAt();
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::SetWantedLevel(int32 level)
|
||||
{
|
||||
m_pWanted->SetWantedLevel(level);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::SetWantedLevelNoDrop(int32 level)
|
||||
{
|
||||
m_pWanted->SetWantedLevelNoDrop(level);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::MakeObjectTargettable(int32 handle)
|
||||
{
|
||||
@ -138,7 +133,6 @@ CPlayerPed::MakeObjectTargettable(int32 handle)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
// I don't know the actual purpose of parameter
|
||||
void
|
||||
CPlayerPed::AnnoyPlayerPed(bool annoyedByPassingEntity)
|
||||
@ -152,7 +146,6 @@ CPlayerPed::AnnoyPlayerPed(bool annoyedByPassingEntity)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::ClearAdrenaline(void)
|
||||
{
|
||||
@ -162,7 +155,6 @@ CPlayerPed::ClearAdrenaline(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
CPlayerInfo *
|
||||
CPlayerPed::GetPlayerInfoForThisPlayerPed()
|
||||
{
|
||||
@ -172,7 +164,6 @@ CPlayerPed::GetPlayerInfoForThisPlayerPed()
|
||||
return nil;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::SetupPlayerPed(int32 index)
|
||||
{
|
||||
@ -193,21 +184,18 @@ CPlayerPed::SetupPlayerPed(int32 index)
|
||||
#endif
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::DeactivatePlayerPed(int32 index)
|
||||
{
|
||||
CWorld::Remove(CWorld::Players[index].m_pPed);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::ReactivatePlayerPed(int32 index)
|
||||
{
|
||||
CWorld::Add(CWorld::Players[index].m_pPed);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::UseSprintEnergy(void)
|
||||
{
|
||||
@ -224,7 +212,6 @@ CPlayerPed::UseSprintEnergy(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::MakeChangesForNewWeapon(eWeaponType weapon)
|
||||
{
|
||||
@ -249,7 +236,6 @@ CPlayerPed::MakeChangesForNewWeapon(eWeaponType weapon)
|
||||
TheCamera.ClearPlayerWeaponMode();
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::MakeChangesForNewWeapon(int32 slot)
|
||||
{
|
||||
@ -257,7 +243,6 @@ CPlayerPed::MakeChangesForNewWeapon(int32 slot)
|
||||
MakeChangesForNewWeapon(m_weapons[slot].m_eWeaponType);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::ReApplyMoveAnims(void)
|
||||
{
|
||||
@ -277,7 +262,6 @@ CPlayerPed::ReApplyMoveAnims(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::SetInitialState(void)
|
||||
{
|
||||
@ -324,7 +308,6 @@ CPlayerPed::SetInitialState(void)
|
||||
m_attachWepAmmo = 0;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::SetRealMoveAnim(void)
|
||||
{
|
||||
@ -568,7 +551,6 @@ CPlayerPed::SetRealMoveAnim(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::RestoreSprintEnergy(float restoreSpeed)
|
||||
{
|
||||
@ -576,7 +558,6 @@ CPlayerPed::RestoreSprintEnergy(float restoreSpeed)
|
||||
m_fCurrentStamina += restoreSpeed * CTimer::GetTimeStep() * 0.5f;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
float
|
||||
CPlayerPed::DoWeaponSmoothSpray(void)
|
||||
{
|
||||
@ -626,7 +607,6 @@ CPlayerPed::DoWeaponSmoothSpray(void)
|
||||
return -1.0f;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::DoStuffToGoOnFire(void)
|
||||
{
|
||||
@ -634,7 +614,6 @@ CPlayerPed::DoStuffToGoOnFire(void)
|
||||
TheCamera.ClearPlayerWeaponMode();
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPlayerPed::DoesTargetHaveToBeBroken(CVector target, CWeapon *weaponUsed)
|
||||
{
|
||||
@ -646,7 +625,6 @@ CPlayerPed::DoesTargetHaveToBeBroken(CVector target, CWeapon *weaponUsed)
|
||||
return false;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
// Cancels landing anim while running & jumping? I think
|
||||
void
|
||||
CPlayerPed::RunningLand(CPad *padUsed)
|
||||
@ -665,7 +643,6 @@ CPlayerPed::RunningLand(CPad *padUsed)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPlayerPed::IsThisPedAnAimingPriority(CPed *suspect)
|
||||
{
|
||||
@ -688,7 +665,6 @@ CPlayerPed::IsThisPedAnAimingPriority(CPed *suspect)
|
||||
return suspect->m_nPedState == PED_ABSEIL;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::PlayerControlSniper(CPad *padUsed)
|
||||
{
|
||||
@ -725,7 +701,6 @@ CPlayerPed::PlayerControlSniper(CPad *padUsed)
|
||||
GetWeapon()->Update(m_audioEntityId, nil);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
// I think R* also used goto in here.
|
||||
void
|
||||
CPlayerPed::ProcessWeaponSwitch(CPad *padUsed)
|
||||
@ -816,7 +791,6 @@ switchDetectDone:
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::PlayerControlM16(CPad *padUsed)
|
||||
{
|
||||
@ -853,7 +827,6 @@ CPlayerPed::PlayerControlM16(CPad *padUsed)
|
||||
GetWeapon()->Update(m_audioEntityId, nil);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::PlayerControlFighter(CPad *padUsed)
|
||||
{
|
||||
@ -879,7 +852,6 @@ CPlayerPed::PlayerControlFighter(CPad *padUsed)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::PlayerControl1stPersonRunAround(CPad *padUsed)
|
||||
{
|
||||
@ -940,7 +912,6 @@ CPlayerPed::PlayerControl1stPersonRunAround(CPad *padUsed)
|
||||
#endif
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::KeepAreaAroundPlayerClear(void)
|
||||
{
|
||||
@ -990,7 +961,6 @@ CPlayerPed::KeepAreaAroundPlayerClear(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::EvaluateNeighbouringTarget(CEntity *candidate, CEntity **targetPtr, float *lastCloseness, float distLimit, float angleOffset, bool lookToLeft, bool priority)
|
||||
{
|
||||
@ -1017,7 +987,6 @@ CPlayerPed::EvaluateNeighbouringTarget(CEntity *candidate, CEntity **targetPtr,
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::EvaluateTarget(CEntity *candidate, CEntity **targetPtr, float *lastCloseness, float distLimit, float angleOffset, bool priority)
|
||||
{
|
||||
@ -1072,7 +1041,6 @@ CPlayerPed::RotatePlayerToTrackTarget(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPlayerPed::FindNextWeaponLockOnTarget(CEntity *previousTarget, bool lookToLeft)
|
||||
{
|
||||
@ -1115,7 +1083,6 @@ CPlayerPed::FindNextWeaponLockOnTarget(CEntity *previousTarget, bool lookToLeft)
|
||||
return true;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPlayerPed::FindWeaponLockOnTarget(void)
|
||||
{
|
||||
@ -1167,7 +1134,6 @@ CPlayerPed::FindWeaponLockOnTarget(void)
|
||||
return true;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::ProcessAnimGroups(void)
|
||||
{
|
||||
@ -1476,7 +1442,6 @@ CPlayerPed::MovementDisabledBecauseOfTargeting(void)
|
||||
return m_pPointGunAt && !CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->IsFlagSet(WEAPONFLAG_CANAIM_WITHARM);
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::PlayerControlZelda(CPad *padUsed)
|
||||
{
|
||||
@ -1952,7 +1917,6 @@ CPlayerPed::ProcessControl(void)
|
||||
UpdateRpHAnim();
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
bool
|
||||
CPlayerPed::DoesPlayerWantNewWeapon(eWeaponType weapon, bool onlyIfSlotIsEmpty)
|
||||
{
|
||||
@ -2036,7 +2000,6 @@ CPlayerPed::PlayIdleAnimations(CPad *padUsed)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::SetNearbyPedsToInteractWithPlayer(void)
|
||||
{
|
||||
@ -2071,7 +2034,6 @@ CPlayerPed::SetNearbyPedsToInteractWithPlayer(void)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::UpdateMeleeAttackers(void)
|
||||
{
|
||||
@ -2114,7 +2076,6 @@ CPlayerPed::UpdateMeleeAttackers(void)
|
||||
&& m_pMeleeList[4] == this && m_pMeleeList[5] == this;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::RemovePedFromMeleeList(CPed *ped)
|
||||
{
|
||||
@ -2127,7 +2088,6 @@ CPlayerPed::RemovePedFromMeleeList(CPed *ped)
|
||||
ped->m_attackTimer = 0;
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
void
|
||||
CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist)
|
||||
{
|
||||
@ -2160,7 +2120,6 @@ CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist)
|
||||
}
|
||||
}
|
||||
|
||||
// --MIAMI: Done
|
||||
int32
|
||||
CPlayerPed::FindMeleeAttackPoint(CPed *victim, CVector &dist, uint32 &endOfAttackOut)
|
||||
{
|
||||
|
||||
@ -29,8 +29,6 @@
|
||||
#include "Clock.h"
|
||||
#include "WaterLevel.h"
|
||||
|
||||
// --MIAMI: File done
|
||||
|
||||
#define MIN_CREATION_DIST 40.0f // not for start of the game (look at the GeneratePedsAtStartOfGame)
|
||||
#define CREATION_RANGE 10.0f // added over the MIN_CREATION_DIST.
|
||||
#define OFFSCREEN_CREATION_MULT 0.5f
|
||||
|
||||
Reference in New Issue
Block a user