Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)

This commit is contained in:
erorcun 2020-07-01 15:28:43 +03:00 committed by GitHub
parent 779d4e02a4
commit eda50bc32b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 430 additions and 158 deletions

View File

@ -381,7 +381,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
if (flatSpeed < SQR(0.018f) && CTimer::GetTimeInMilliseconds() - pVehicle->AutoPilot.m_nAntiReverseTimer > 2000){ if (flatSpeed < SQR(0.018f) && CTimer::GetTimeInMilliseconds() - pVehicle->AutoPilot.m_nAntiReverseTimer > 2000){
pVehicle->AutoPilot.m_nTempAction = TEMPACT_REVERSE; pVehicle->AutoPilot.m_nTempAction = TEMPACT_REVERSE;
if (pVehicle->AutoPilot.m_nCarMission != MISSION_NONE && if (pVehicle->AutoPilot.m_nCarMission != MISSION_NONE &&
pVehicle->AutoPilot.m_nCarMission != MISSION_CRUISE || pVehicle->VehicleCreatedBy == RANDOM_VEHICLE) pVehicle->AutoPilot.m_nCarMission != MISSION_CRUISE || pVehicle->VehicleCreatedBy == MISSION_VEHICLE)
pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1500; pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1500;
else else
pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 750; pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 750;
@ -406,7 +406,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 400; pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 400;
} }
} }
if (pVehicle->GetUp().z < 0.7f){ if (pVehicle->GetUp().z < -0.7f){
pVehicle->AutoPilot.m_nTempAction = TEMPACT_WAIT; pVehicle->AutoPilot.m_nTempAction = TEMPACT_WAIT;
pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000; pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000;
} }

View File

@ -34,15 +34,14 @@ CPed *CPhoneInfo::pCallBackPed; // ped who picking up the phone (reset after pic
after 60 seconds of last phone pick-up. after 60 seconds of last phone pick-up.
*/ */
#ifdef TOGGLEABLE_BETA_FEATURES #ifdef PEDS_REPORT_CRIMES_ON_PHONE
CPed* crimeReporters[NUMPHONES] = {}; CPed* crimeReporters[NUMPHONES] = {};
bool bool
isPhoneAvailable(int m_phoneId) isPhoneAvailable(int m_phoneId)
{ {
return gPhoneInfo.m_aPhones[m_phoneId].m_nState == PHONE_STATE_FREE && return crimeReporters[m_phoneId] == nil || !crimeReporters[m_phoneId]->IsPointerValid() || crimeReporters[m_phoneId]->m_objective > OBJECTIVE_IDLE ||
(crimeReporters[m_phoneId] == nil || !crimeReporters[m_phoneId]->IsPointerValid() || !crimeReporters[m_phoneId]->bRunningToPhone || crimeReporters[m_phoneId]->m_objective > OBJECTIVE_IDLE ||
crimeReporters[m_phoneId]->m_nLastPedState != PED_SEEK_POS && crimeReporters[m_phoneId]->m_nLastPedState != PED_SEEK_POS &&
(crimeReporters[m_phoneId]->m_nPedState != PED_MAKE_CALL && crimeReporters[m_phoneId]->m_nPedState != PED_FACE_PHONE && crimeReporters[m_phoneId]->m_nPedState != PED_SEEK_POS)); (crimeReporters[m_phoneId]->m_nPedState != PED_MAKE_CALL && crimeReporters[m_phoneId]->m_nPedState != PED_FACE_PHONE && crimeReporters[m_phoneId]->m_nPedState != PED_SEEK_POS);
} }
#endif #endif
@ -164,11 +163,12 @@ CPhoneInfo::FindNearestFreePhone(CVector *pos)
for (int phoneId = 0; phoneId < m_nMax; phoneId++) { for (int phoneId = 0; phoneId < m_nMax; phoneId++) {
if (gPhoneInfo.m_aPhones[phoneId].m_nState == PHONE_STATE_FREE #ifdef PEDS_REPORT_CRIMES_ON_PHONE
#ifdef TOGGLEABLE_BETA_FEATURES if (isPhoneAvailable(phoneId))
&& isPhoneAvailable(phoneId) #else
if (gPhoneInfo.m_aPhones[phoneId].m_nState == PHONE_STATE_FREE)
#endif #endif
) { {
float phoneDist = (m_aPhones[phoneId].m_vecPos - *pos).Magnitude2D(); float phoneDist = (m_aPhones[phoneId].m_vecPos - *pos).Magnitude2D();
if (phoneDist < nearestPhoneDist) { if (phoneDist < nearestPhoneDist) {
@ -213,8 +213,42 @@ void
CPhoneInfo::Load(uint8 *buf, uint32 size) CPhoneInfo::Load(uint8 *buf, uint32 size)
{ {
INITSAVEBUF INITSAVEBUF
m_nMax = ReadSaveBuf<int32>(buf); int max = ReadSaveBuf<int32>(buf);
m_nScriptPhonesMax = ReadSaveBuf<int32>(buf); int scriptPhonesMax = ReadSaveBuf<int32>(buf);
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
m_nMax = Min(NUMPHONES, max);
m_nScriptPhonesMax = 0;
bool ignoreOtherPhones = false;
// We can do it without touching saves. We'll only load script phones, others are already loaded in Initialise
for (int i = 0; i < 50; i++) {
CPhone phoneToLoad = ReadSaveBuf<CPhone>(buf);
if (ignoreOtherPhones)
continue;
if (i < scriptPhonesMax) {
if (i >= m_nMax) {
assert(0 && "Number of phones used by script exceeds the NUMPHONES or the stored phones in save file. Ignoring some phones");
ignoreOtherPhones = true;
continue;
}
SwapPhone(phoneToLoad.m_vecPos.x, phoneToLoad.m_vecPos.y, i);
m_aPhones[i] = phoneToLoad;
// It's saved as building pool index in save file, convert it to true entity
if (m_aPhones[i].m_pEntity) {
m_aPhones[i].m_pEntity = CPools::GetBuildingPool()->GetSlot((uintptr)m_aPhones[i].m_pEntity - 1);
}
} else
ignoreOtherPhones = true;
}
#else
m_nMax = max;
m_nScriptPhonesMax = scriptPhonesMax;
for (int i = 0; i < NUMPHONES; i++) { for (int i = 0; i < NUMPHONES; i++) {
m_aPhones[i] = ReadSaveBuf<CPhone>(buf); m_aPhones[i] = ReadSaveBuf<CPhone>(buf);
// It's saved as building pool index in save file, convert it to true entity // It's saved as building pool index in save file, convert it to true entity
@ -222,6 +256,7 @@ INITSAVEBUF
m_aPhones[i].m_pEntity = CPools::GetBuildingPool()->GetSlot((uintptr)m_aPhones[i].m_pEntity - 1); m_aPhones[i].m_pEntity = CPools::GetBuildingPool()->GetSlot((uintptr)m_aPhones[i].m_pEntity - 1);
} }
} }
#endif
VALIDATESAVEBUF(size) VALIDATESAVEBUF(size)
} }
@ -259,6 +294,31 @@ CPhoneInfo::SetPhoneMessage_Repeatedly(int phoneId, wchar *msg1, wchar *msg2, wc
} }
} }
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
void
CPhoneInfo::SwapPhone(float xPos, float yPos, int into)
{
// "into" should be in 0 - m_nScriptPhonesMax range
int nearestPhoneId = -1;
CVector pos(xPos, yPos, 0.0f);
float nearestPhoneDist = 1.0f;
for (int phoneId = m_nScriptPhonesMax; phoneId < m_nMax; phoneId++) {
float phoneDistance = (m_aPhones[phoneId].m_vecPos - pos).Magnitude2D();
if (phoneDistance < nearestPhoneDist) {
nearestPhoneDist = phoneDistance;
nearestPhoneId = phoneId;
}
}
m_aPhones[nearestPhoneId].m_nState = PHONE_STATE_MESSAGE_REMOVED;
CPhone oldPhone = m_aPhones[into];
m_aPhones[into] = m_aPhones[nearestPhoneId];
m_aPhones[nearestPhoneId] = oldPhone;
m_nScriptPhonesMax++;
}
#endif
int int
CPhoneInfo::GrabPhone(float xPos, float yPos) CPhoneInfo::GrabPhone(float xPos, float yPos)
{ {
@ -300,6 +360,7 @@ CPhoneInfo::Initialise(void)
CBuilding *building = pool->GetSlot(i); CBuilding *building = pool->GetSlot(i);
if (building) { if (building) {
if (building->GetModelIndex() == MI_PHONEBOOTH1) { if (building->GetModelIndex() == MI_PHONEBOOTH1) {
assert(m_nMax < ARRAY_SIZE(m_aPhones) && "NUMPHONES should be increased");
CPhone *maxPhone = &m_aPhones[m_nMax]; CPhone *maxPhone = &m_aPhones[m_nMax];
maxPhone->m_nState = PHONE_STATE_FREE; maxPhone->m_nState = PHONE_STATE_FREE;
maxPhone->m_vecPos = building->GetPosition(); maxPhone->m_vecPos = building->GetPosition();
@ -317,7 +378,11 @@ CPhoneInfo::Save(uint8 *buf, uint32 *size)
INITSAVEBUF INITSAVEBUF
WriteSaveBuf(buf, m_nMax); WriteSaveBuf(buf, m_nMax);
WriteSaveBuf(buf, m_nScriptPhonesMax); WriteSaveBuf(buf, m_nScriptPhonesMax);
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
for (int phoneId = 0; phoneId < 50; phoneId++) { // We can do it without touching saves
#else
for (int phoneId = 0; phoneId < NUMPHONES; phoneId++) { for (int phoneId = 0; phoneId < NUMPHONES; phoneId++) {
#endif
CPhone* phone = WriteSaveBuf(buf, m_aPhones[phoneId]); CPhone* phone = WriteSaveBuf(buf, m_aPhones[phoneId]);
// Convert entity pointer to building pool index while saving // Convert entity pointer to building pool index while saving

View File

@ -61,6 +61,9 @@ public:
void Initialise(void); void Initialise(void);
void Shutdown(void); void Shutdown(void);
void Update(void); void Update(void);
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
void SwapPhone(float xPos, float yPos, int into);
#endif
}; };
extern CPhoneInfo gPhoneInfo; extern CPhoneInfo gPhoneInfo;
@ -68,7 +71,7 @@ extern CPhoneInfo gPhoneInfo;
void PhonePutDownCB(CAnimBlendAssociation *assoc, void *arg); void PhonePutDownCB(CAnimBlendAssociation *assoc, void *arg);
void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg); void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg);
#ifdef TOGGLEABLE_BETA_FEATURES #ifdef PEDS_REPORT_CRIMES_ON_PHONE
extern CPed *crimeReporters[NUMPHONES]; extern CPed *crimeReporters[NUMPHONES];
bool isPhoneAvailable(int); bool isPhoneAvailable(int);
#endif #endif

View File

@ -3297,7 +3297,12 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
ped->ClearAll(); ped->ClearAll();
int8 path = ScriptParams[1]; int8 path = ScriptParams[1];
if (ScriptParams[1] < 0 || ScriptParams[1] > 7) if (ScriptParams[1] < 0 || ScriptParams[1] > 7)
// Max number GetRandomNumberInRange returns is max-1
#ifdef FIX_BUGS
path = CGeneral::GetRandomNumberInRange(0, 8);
#else
path = CGeneral::GetRandomNumberInRange(0, 7); path = CGeneral::GetRandomNumberInRange(0, 7);
#endif
ped->SetWanderPath(path); ped->SetWanderPath(path);
return 0; return 0;
} }

View File

@ -1688,7 +1688,7 @@ CCam::Process_BehindCar(const CVector &CameraTarget, float TargetOrientation, fl
if(Length < 0.002f) if(Length < 0.002f)
Length = 0.002f; Length = 0.002f;
Beta = CGeneral::GetATanOfXY(TargetCoors.x - Source.x, TargetCoors.y - Source.y); Beta = CGeneral::GetATanOfXY(TargetCoors.x - Source.x, TargetCoors.y - Source.y);
#ifdef TOGGLEABLE_BETA_FEATURES #if 1
// This is completely made up but Bill's cam manipulates an angle before calling this // This is completely made up but Bill's cam manipulates an angle before calling this
// and otherwise calculating Beta doesn't make much sense. // and otherwise calculating Beta doesn't make much sense.
Beta += fBillsBetaOffset; Beta += fBillsBetaOffset;

View File

@ -1217,8 +1217,10 @@ CMenuManager::Draw()
rightText = option.drawFunc(&isOptionDisabled); rightText = option.drawFunc(&isOptionDisabled);
} }
} }
} else } else {
debug("screen:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu, option.screen, option.screenOptionOrder);
assert(0 && "Custom frontend options is borked"); assert(0 && "Custom frontend options is borked");
}
break; break;
#endif #endif
@ -4775,8 +4777,10 @@ CMenuManager::ProcessButtonPresses(void)
} else if (option.type == FEOPTION_GOBACK) { } else if (option.type == FEOPTION_GOBACK) {
goBack = true; goBack = true;
} }
} else } else {
debug("screen:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, option.screen, option.screenOptionOrder);
assert(0 && "Custom frontend options are borked"); assert(0 && "Custom frontend options are borked");
}
break; break;
#endif #endif
@ -4998,8 +5002,10 @@ CMenuManager::ProcessButtonPresses(void)
} }
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0); DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
} }
else else {
debug("screen:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, option.screen, option.screenOptionOrder);
assert(0 && "Custom frontend options are borked"); assert(0 && "Custom frontend options are borked");
}
break; break;
#endif #endif

View File

@ -161,7 +161,11 @@ CWanted::RegisterCrime(eCrimeType type, const CVector &coors, uint32 id, bool po
void void
CWanted::RegisterCrime_Immediately(eCrimeType type, const CVector &coors, uint32 id, bool policeDoesntCare) CWanted::RegisterCrime_Immediately(eCrimeType type, const CVector &coors, uint32 id, bool policeDoesntCare)
{ {
#if defined FIX_SIGNIFICANT_BUGS || defined PEDS_REPORT_CRIMES_ON_PHONE
if (!AddCrimeToQ(type, id, coors, true, policeDoesntCare))
#else
if (!AddCrimeToQ(type, id, coors, false, policeDoesntCare)) if (!AddCrimeToQ(type, id, coors, false, policeDoesntCare))
#endif
ReportCrimeNow(type, coors, policeDoesntCare); ReportCrimeNow(type, coors, policeDoesntCare);
} }
@ -219,6 +223,9 @@ CWanted::ReportCrimeNow(eCrimeType type, const CVector &coors, bool policeDoesnt
chaos *= 0.333f; chaos *= 0.333f;
switch(type){ switch(type){
case CRIME_POSSESSION_GUN: case CRIME_POSSESSION_GUN:
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
m_nChaos += 5.0f*chaos;
#endif
break; break;
case CRIME_HIT_PED: case CRIME_HIT_PED:
m_nChaos += 5.0f*chaos; m_nChaos += 5.0f*chaos;
@ -440,6 +447,30 @@ CWanted::Reset(void)
Initialise(); Initialise();
} }
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
bool
CrimeShouldBeReportedOnPhone(eCrimeType crime)
{
switch (crime) {
case CRIME_POSSESSION_GUN:
case CRIME_HIT_PED:
case CRIME_HIT_COP:
case CRIME_SHOOT_PED:
case CRIME_SHOOT_COP:
case CRIME_STEAL_CAR:
case CRIME_RECKLESS_DRIVING:
case CRIME_RUNOVER_PED:
case CRIME_RUNOVER_COP:
case CRIME_PED_BURNED:
case CRIME_COP_BURNED:
case CRIME_VEHICLE_BURNED:
return true;
default:
return false;
}
}
#endif
void void
CWanted::UpdateCrimesQ(void) CWanted::UpdateCrimesQ(void)
{ {
@ -447,6 +478,9 @@ CWanted::UpdateCrimesQ(void)
CCrimeBeingQd &crime = m_aCrimes[i]; CCrimeBeingQd &crime = m_aCrimes[i];
if (crime.m_nType != CRIME_NONE) { if (crime.m_nType != CRIME_NONE) {
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
if (!CrimeShouldBeReportedOnPhone(crime.m_nType))
#endif
if (CTimer::GetTimeInMilliseconds() > crime.m_nTime + 500 && !crime.m_bReported) { if (CTimer::GetTimeInMilliseconds() > crime.m_nTime + 500 && !crime.m_bReported) {
ReportCrimeNow(crime.m_nType, crime.m_vecPosn, crime.m_bPoliceDoesntCare); ReportCrimeNow(crime.m_nType, crime.m_vecPosn, crime.m_bPoliceDoesntCare);
crime.m_bReported = true; crime.m_bReported = true;

View File

@ -190,7 +190,6 @@ enum Config {
#endif #endif
#define FIX_BUGS // fixes bugs that we've came across during reversing, TODO: use this more #define FIX_BUGS // fixes bugs that we've came across during reversing, TODO: use this more
#define TOGGLEABLE_BETA_FEATURES // toggleable from debug menu. not too many things
#define MORE_LANGUAGES // Add more translations to the game #define MORE_LANGUAGES // Add more translations to the game
#define COMPATIBLE_SAVES // this allows changing structs while keeping saves compatible #define COMPATIBLE_SAVES // this allows changing structs while keeping saves compatible
@ -242,7 +241,7 @@ enum Config {
# define MISSION_REPLAY // mobile feature # define MISSION_REPLAY // mobile feature
#endif #endif
//#define SIMPLIER_MISSIONS // apply simplifications from mobile //#define SIMPLIER_MISSIONS // apply simplifications from mobile
#define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT //#define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
#define SCRIPT_LOG_FILE_LEVEL 1 // 0 == no log, 1 == overwrite every frame, 2 == full log #define SCRIPT_LOG_FILE_LEVEL 1 // 0 == no log, 1 == overwrite every frame, 2 == full log
#ifndef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT #ifndef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
@ -267,6 +266,7 @@ enum Config {
#define VC_PED_PORTS // various ports from VC's CPed, mostly subtle #define VC_PED_PORTS // various ports from VC's CPed, mostly subtle
// #define NEW_WALK_AROUND_ALGORITHM // to make walking around vehicles/objects less awkward // #define NEW_WALK_AROUND_ALGORITHM // to make walking around vehicles/objects less awkward
#define CANCELLABLE_CAR_ENTER #define CANCELLABLE_CAR_ENTER
//#define PEDS_REPORT_CRIMES_ON_PHONE
// Camera // Camera
//#define PS2_CAM_TRANSITION // old way of transitioning between cam modes //#define PS2_CAM_TRANSITION // old way of transitioning between cam modes

View File

@ -484,11 +484,7 @@ DebugMenuPopulate(void)
#ifdef CUSTOM_FRONTEND_OPTIONS #ifdef CUSTOM_FRONTEND_OPTIONS
DebugMenuAddCmd("Debug", "Reload custom frontend options", ReloadFrontendOptions); DebugMenuAddCmd("Debug", "Reload custom frontend options", ReloadFrontendOptions);
#endif #endif
#ifdef TOGGLEABLE_BETA_FEATURES
DebugMenuAddVarBool8("Debug", "Toggle popping heads on headshot", &CPed::bPopHeadsOnHeadshot, nil); DebugMenuAddVarBool8("Debug", "Toggle popping heads on headshot", &CPed::bPopHeadsOnHeadshot, nil);
DebugMenuAddVarBool8("Debug", "Toggle peds running to phones to report crimes", &CPed::bMakePedsRunToPhonesToReportCrimes, nil);
#endif
DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start); DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop); DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);

View File

@ -68,9 +68,11 @@ int8 RegisterNewOption(int screen)
{ {
numCustomFrontendOptions++; numCustomFrontendOptions++;
if (numCustomFrontendOptions == 1) if (numCustomFrontendOptions == 1)
customFrontendOptions = (FrontendOption*)malloc(numCustomFrontendOptions * sizeof(FrontendOption)); customFrontendOptions = (FrontendOption*)malloc(5 * sizeof(FrontendOption));
else else if (numCustomFrontendOptions % 5 == 1)
customFrontendOptions = (FrontendOption*)realloc(customFrontendOptions, numCustomFrontendOptions * sizeof(FrontendOption)); customFrontendOptions = (FrontendOption*)realloc(customFrontendOptions, (numCustomFrontendOptions + 4) * sizeof(FrontendOption));
assert(customFrontendOptions != nil && "Custom frontend options can't be allocated");
uint8 nth = GetNumberOfMenuOptions(screen); uint8 nth = GetNumberOfMenuOptions(screen);
if (optionCursor < 0) { if (optionCursor < 0) {

View File

@ -10,6 +10,30 @@
#include "Vehicle.h" #include "Vehicle.h"
#include "SurfaceTable.h" #include "SurfaceTable.h"
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
eCrimeType
EventTypeToCrimeType(eEventType event)
{
eCrimeType crime;
switch (event) {
case EVENT_ASSAULT: crime = CRIME_HIT_PED; break;
case EVENT_RUN_REDLIGHT: crime = CRIME_RUN_REDLIGHT; break;
case EVENT_ASSAULT_POLICE: crime = CRIME_HIT_COP; break;
case EVENT_GUNSHOT: crime = CRIME_POSSESSION_GUN; break;
case EVENT_STEAL_CAR: crime = CRIME_STEAL_CAR; break;
case EVENT_HIT_AND_RUN: crime = CRIME_RUNOVER_PED; break;
case EVENT_HIT_AND_RUN_COP: crime = CRIME_RUNOVER_COP; break;
case EVENT_SHOOT_PED: crime = CRIME_SHOOT_PED; break;
case EVENT_SHOOT_COP: crime = CRIME_SHOOT_COP; break;
case EVENT_PED_SET_ON_FIRE: crime = CRIME_PED_BURNED; break;
case EVENT_COP_SET_ON_FIRE: crime = CRIME_COP_BURNED; break;
case EVENT_CAR_SET_ON_FIRE: crime = CRIME_VEHICLE_BURNED; break;
default: crime = CRIME_NONE; break;
}
return crime;
}
#endif
CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype) CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype)
{ {
SetModelIndex(mi); SetModelIndex(mi);
@ -113,25 +137,20 @@ CCivilianPed::CivilianAI(void)
investigateDeadPed = false; investigateDeadPed = false;
} }
#ifdef TOGGLEABLE_BETA_FEATURES #ifdef PEDS_REPORT_CRIMES_ON_PHONE
eCrimeType crime = (((CPed*)m_pEventEntity)->m_ped_flagI40 ? int32 eventId = CheckForPlayerCrimes((CPed*)m_pEventEntity);
(((CPed*)m_pEventEntity)->m_nPedType == PEDTYPE_COP ? CRIME_RUNOVER_COP : CRIME_RUNOVER_PED) : eCrimeType crime = (eventId == -1 ? CRIME_NONE : EventTypeToCrimeType(gaEvent[eventId].type));
(((CPed*)m_pEventEntity)->m_nPedType == PEDTYPE_COP ? CRIME_SHOOT_COP : CRIME_SHOOT_PED)); bool eligibleToReport = crime != CRIME_NONE && m_pedStats->m_fear <= m_pedStats->m_lawfulness && m_pedStats->m_temper <= m_pedStats->m_fear;
bool eligibleToReport = bMakePedsRunToPhonesToReportCrimes && killerOfDeadPed && killerOfDeadPed->IsPed() && ((CPed*)killerOfDeadPed)->IsPlayer() &&
m_pedStats->m_fear <= m_pedStats->m_lawfulness && m_pedStats->m_temper <= m_pedStats->m_fear;
if (IsGangMember() || !eligibleToReport || !RunToReportCrime(crime)) if (IsGangMember() || !eligibleToReport || !RunToReportCrime(crime))
#endif #endif
if (investigateDeadPed) if (investigateDeadPed)
SetInvestigateEvent(EVENT_DEAD_PED, CVector2D(m_pEventEntity->GetPosition()), 1.0f, 20000, 0.0f); SetInvestigateEvent(EVENT_DEAD_PED, CVector2D(m_pEventEntity->GetPosition()), 1.0f, 20000, 0.0f);
} else { } else {
#ifdef TOGGLEABLE_BETA_FEATURES #ifdef PEDS_REPORT_CRIMES_ON_PHONE
CEntity* killerOfDeadPed = ((CPed*)m_pEventEntity)->m_threatEntity; int32 eventId = CheckForPlayerCrimes((CPed*)m_pEventEntity);
eCrimeType crime = (((CPed*)m_pEventEntity)->m_ped_flagI40 ? eCrimeType crime = (eventId == -1 ? CRIME_NONE : EventTypeToCrimeType(gaEvent[eventId].type));
(((CPed*)m_pEventEntity)->m_nPedType == PEDTYPE_COP ? CRIME_RUNOVER_COP : CRIME_RUNOVER_PED) : bool eligibleToReport = crime != CRIME_NONE && m_pedStats->m_fear <= m_pedStats->m_lawfulness && m_pedStats->m_temper <= m_pedStats->m_fear;
(((CPed*)m_pEventEntity)->m_nPedType == PEDTYPE_COP ? CRIME_SHOOT_COP : CRIME_SHOOT_PED));
bool eligibleToReport = bMakePedsRunToPhonesToReportCrimes && killerOfDeadPed && killerOfDeadPed->IsPed() && ((CPed*)killerOfDeadPed)->IsPlayer() &&
m_pedStats->m_fear <= m_pedStats->m_lawfulness && m_pedStats->m_temper <= m_pedStats->m_fear;
if(!eligibleToReport || !RunToReportCrime(crime)) if(!eligibleToReport || !RunToReportCrime(crime))
#endif #endif
{ {
@ -165,22 +184,48 @@ CCivilianPed::CivilianAI(void)
} }
} }
} else { } else {
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
bool youShouldRunEventually = false;
bool dontGoToPhone = false;
#endif
if (m_threatEntity && m_threatEntity->IsPed()) { if (m_threatEntity && m_threatEntity->IsPed()) {
CPed *threatPed = (CPed*)m_threatEntity; CPed *threatPed = (CPed*)m_threatEntity;
if (m_pedStats->m_fear <= 100 - threatPed->m_pedStats->m_temper && threatPed->m_nPedType != PEDTYPE_COP) { if (m_pedStats->m_fear <= 100 - threatPed->m_pedStats->m_temper && threatPed->m_nPedType != PEDTYPE_COP) {
if (threatPed->GetWeapon(m_currentWeapon).IsTypeMelee() || !GetWeapon()->IsTypeMelee()) { if (threatPed->GetWeapon(m_currentWeapon).IsTypeMelee() || !GetWeapon()->IsTypeMelee()) {
if (threatPed->IsPlayer() && FindPlayerPed()->m_pWanted->m_CurrentCops != 0) { if (threatPed->IsPlayer() && FindPlayerPed()->m_pWanted->m_CurrentCops != 0) {
if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS) { if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS) {
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
dontGoToPhone = true;
#endif
SetFindPathAndFlee(m_threatEntity, 10000); SetFindPathAndFlee(m_threatEntity, 10000);
} }
} else { } else {
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
dontGoToPhone = true;
#endif
SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, m_threatEntity); SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, m_threatEntity);
} }
} }
} else { } else {
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
youShouldRunEventually = true;
#else
SetFindPathAndFlee(m_threatEntity, 10000, true);
#endif
}
}
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
if (!dontGoToPhone) {
int32 eventId = CheckForPlayerCrimes(nil);
eCrimeType crime = (eventId == -1 ? CRIME_NONE : EventTypeToCrimeType(gaEvent[eventId].type));
bool eligibleToReport = crime != CRIME_NONE && m_pedStats->m_fear <= m_pedStats->m_lawfulness;
if ((!eligibleToReport || !RunToReportCrime(crime)) && youShouldRunEventually) {
SetFindPathAndFlee(m_threatEntity, 10000, true); SetFindPathAndFlee(m_threatEntity, 10000, true);
} }
} }
#endif
} }
} }
@ -217,15 +262,18 @@ CCivilianPed::ProcessControl(void)
if (Seek()) { if (Seek()) {
if ((m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA) && m_pNextPathNode) { if ((m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA) && m_pNextPathNode) {
m_pNextPathNode = nil; m_pNextPathNode = nil;
#ifdef TOGGLEABLE_BETA_FEATURES #ifdef PEDS_REPORT_CRIMES_ON_PHONE
} else if (bRunningToPhone && m_objective < OBJECTIVE_FLEE_TILL_SAFE) { } else if (bRunningToPhone && m_objective < OBJECTIVE_FLEE_TILL_SAFE) {
if (!isPhoneAvailable(m_phoneId)) { if (!isPhoneAvailable(m_phoneId)) {
RestorePreviousState(); RestorePreviousState();
if (crimeReporters[m_phoneId] == this)
crimeReporters[m_phoneId] = nil; crimeReporters[m_phoneId] = nil;
m_phoneId = -1; m_phoneId = -1;
bRunningToPhone = false; bRunningToPhone = false;
} else { } else {
crimeReporters[m_phoneId] = this; crimeReporters[m_phoneId] = this;
m_facePhoneStart = true;
m_nPedState = PED_FACE_PHONE; m_nPedState = PED_FACE_PHONE;
} }
#else #else

View File

@ -118,9 +118,8 @@ void *CPed::operator new(size_t sz, int handle) { return CPools::GetPedPool()->N
void CPed::operator delete(void *p, size_t sz) { CPools::GetPedPool()->Delete((CPed*)p); } void CPed::operator delete(void *p, size_t sz) { CPools::GetPedPool()->Delete((CPed*)p); }
void CPed::operator delete(void *p, int handle) { CPools::GetPedPool()->Delete((CPed*)p); } void CPed::operator delete(void *p, int handle) { CPools::GetPedPool()->Delete((CPed*)p); }
#ifdef TOGGLEABLE_BETA_FEATURES #ifdef DEBUGMENU
bool CPed::bPopHeadsOnHeadshot = false; bool CPed::bPopHeadsOnHeadshot = false;
bool CPed::bMakePedsRunToPhonesToReportCrimes = false;
#endif #endif
CPed::~CPed(void) CPed::~CPed(void)
@ -683,7 +682,7 @@ CPed::RemoveBodyPart(PedNode nodeId, int8 direction)
if(!IsClumpSkinned(GetClump())) if(!IsClumpSkinned(GetClump()))
#endif #endif
{ {
#ifdef TOGGLEABLE_BETA_FEATURES #ifdef DEBUGMENU
if (bPopHeadsOnHeadshot || nodeId != PED_HEAD) if (bPopHeadsOnHeadshot || nodeId != PED_HEAD)
#else #else
if (nodeId != PED_HEAD) if (nodeId != PED_HEAD)
@ -2014,18 +2013,19 @@ CPed::SortPeds(CPed **list, int min, int max)
void void
CPed::BuildPedLists(void) CPed::BuildPedLists(void)
{ {
if ((CTimer::GetFrameCounter() + (m_randomSeed % 256)) % 16) { if ((CTimer::GetFrameCounter() + m_randomSeed) % 16) {
for(int i = 0; i < ARRAY_SIZE(m_nearPeds); ) { for(int i = 0; i < ARRAY_SIZE(m_nearPeds); ) {
bool removePed = false;
if (m_nearPeds[i]) { if (m_nearPeds[i]) {
if (m_nearPeds[i]->IsPointerValid()) { if (m_nearPeds[i]->IsPointerValid()) {
float distSqr = (GetPosition() - m_nearPeds[i]->GetPosition()).MagnitudeSqr2D(); float distSqr = (GetPosition() - m_nearPeds[i]->GetPosition()).MagnitudeSqr2D();
if (distSqr < 900.0f) { if (distSqr > 900.0f)
i++; removePed = true;
continue; } else
removePed = true;
} }
} if (removePed) {
// If we arrive here, the ped we're checking isn't "near", so we should remove it. // If we arrive here, the ped we're checking isn't "near", so we should remove it.
for (int j = i; j < ARRAY_SIZE(m_nearPeds) - 1; j++) { for (int j = i; j < ARRAY_SIZE(m_nearPeds) - 1; j++) {
m_nearPeds[j] = m_nearPeds[j + 1]; m_nearPeds[j] = m_nearPeds[j + 1];
@ -3078,47 +3078,106 @@ CPed::CheckAroundForPossibleCollisions(void)
} }
} }
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
void
ReportPhonePickUpCB(CAnimBlendAssociation* assoc, void* arg)
{
CPed* ped = (CPed*)arg;
ped->m_nMoveState = PEDMOVE_STILL;
CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_IDLE_STANCE, 8.0f);
if (assoc->blendAmount > 0.5f && ped) {
CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_PHONE_TALK, 8.0f);
}
}
void
ReportPhonePutDownCB(CAnimBlendAssociation* assoc, void* arg)
{
assoc->flags |= ASSOC_DELETEFADEDOUT;
assoc->blendDelta = -1000.0f;
CPed* ped = (CPed*)arg;
if (ped->m_phoneId != -1 && crimeReporters[ped->m_phoneId] == ped) {
crimeReporters[ped->m_phoneId] = nil;
gPhoneInfo.m_aPhones[ped->m_phoneId].m_nState = PHONE_STATE_FREE;
ped->m_phoneId = -1;
}
if (assoc->blendAmount > 0.5f)
ped->bUpdateAnimHeading = true;
ped->SetWanderPath(CGeneral::GetRandomNumber() & 7);
}
#endif
bool bool
CPed::MakePhonecall(void) CPed::MakePhonecall(void)
{ {
#ifdef TOGGLEABLE_BETA_FEATURES #ifdef PEDS_REPORT_CRIMES_ON_PHONE
if (bMakePedsRunToPhonesToReportCrimes)
if (!IsPlayer() && CTimer::GetTimeInMilliseconds() > m_phoneTalkTimer - 7000 && bRunningToPhone) { if (!IsPlayer() && CTimer::GetTimeInMilliseconds() > m_phoneTalkTimer - 7000 && bRunningToPhone) {
FindPlayerPed()->m_pWanted->RegisterCrime_Immediately(m_crimeToReportOnPhone, GetPosition(), FindPlayerPed()->m_pWanted->RegisterCrime_Immediately(m_crimeToReportOnPhone, GetPosition(),
(m_crimeToReportOnPhone == CRIME_POSSESSION_GUN ? (uintptr)m_threatEntity : (uintptr)((CPed*)m_pEventEntity)->m_threatEntity), false); (m_crimeToReportOnPhone == CRIME_POSSESSION_GUN ? (uintptr)m_threatEntity : (uintptr)m_victimOfPlayerCrime), false);
if (m_crimeToReportOnPhone != CRIME_POSSESSION_GUN)
FindPlayerPed()->m_pWanted->SetWantedLevelNoDrop(1);
bRunningToPhone = false; bRunningToPhone = false;
} }
#endif #endif
if (CTimer::GetTimeInMilliseconds() <= m_phoneTalkTimer) if (CTimer::GetTimeInMilliseconds() <= m_phoneTalkTimer)
return false; return false;
SetIdle(); #ifdef PEDS_REPORT_CRIMES_ON_PHONE
gPhoneInfo.m_aPhones[m_phoneId].m_nState = PHONE_STATE_FREE; CAnimBlendAssociation* talkAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_TALK);
#ifdef TOGGLEABLE_BETA_FEATURES if (talkAssoc && talkAssoc->blendAmount > 0.5f) {
crimeReporters[m_phoneId] = nil; CAnimBlendAssociation* endAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_OUT, 8.0f);
endAssoc->flags &= ~ASSOC_DELETEFADEDOUT;
endAssoc->SetFinishCallback(ReportPhonePutDownCB, this);
}
#endif #endif
SetIdle();
gPhoneInfo.m_aPhones[m_phoneId].m_nState = PHONE_STATE_FREE;
#ifndef PEDS_REPORT_CRIMES_ON_PHONE
m_phoneId = -1; m_phoneId = -1;
#endif
// Because SetWanderPath is now done async in ReportPhonePutDownCB
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
return false;
#else
return true; return true;
#endif
} }
bool bool
CPed::FacePhone(void) CPed::FacePhone(void)
{ {
// FIX: This function was broken since it's left unused early in development. // This function was broken since it's left unused early in development.
#ifdef FIX_BUGS #ifdef PEDS_REPORT_CRIMES_ON_PHONE
float phoneDir = CGeneral::GetRadianAngleBetweenPoints( float phoneDir = CGeneral::GetRadianAngleBetweenPoints(
gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.x, gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.y, gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.x, gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.y,
GetPosition().x, GetPosition().y); GetPosition().x, GetPosition().y);
SetLookFlag(phoneDir, false); if (m_facePhoneStart) {
bool turnDone = TurnBody(); m_lookTimer = 0;
if (turnDone) { SetLookFlag(phoneDir, true);
SetIdle(); m_lookTimer = CTimer::GetTimeInMilliseconds() + 3000;
ClearLookFlag(); m_facePhoneStart = false;
m_phoneTalkTimer = CTimer::GetTimeInMilliseconds() + 10000;
} }
return turnDone;
if (bIsLooking && TurnBody()) {
ClearLookFlag();
SetIdle();
m_phoneTalkTimer = CTimer::GetTimeInMilliseconds() + 10000;
CAnimBlendAssociation* assoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_IN, 4.0f);
assoc->SetFinishCallback(ReportPhonePickUpCB, this);
return true;
}
return false;
#else #else
float currentRot = RADTODEG(m_fRotationCur); float currentRot = RADTODEG(m_fRotationCur);
float phoneDir = CGeneral::GetRadianAngleBetweenPoints( float phoneDir = CGeneral::GetRadianAngleBetweenPoints(
@ -3165,6 +3224,63 @@ CPed::CheckForDeadPeds(void)
return nil; return nil;
} }
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
// returns event id, parameter is optional
int32
CPed::CheckForPlayerCrimes(CPed *victim)
{
int i;
float dist;
float mindist = 60.0f;
CPlayerPed *player = FindPlayerPed();
int32 victimRef = (victim ? CPools::GetPedRef(victim) : 0);
int event = -1;
for (i = 0; i < NUMEVENTS; i++) {
if (gaEvent[i].type == EVENT_NULL || gaEvent[i].type > EVENT_CAR_SET_ON_FIRE)
continue;
// those are already handled in game, also DEAD_PED isn't registered alone, most of the time there is SHOOT_PED etc.
if (gaEvent[i].type == EVENT_DEAD_PED || gaEvent[i].type == EVENT_GUNSHOT || gaEvent[i].type == EVENT_EXPLOSION)
continue;
if (victim && gaEvent[i].entityRef != victimRef)
continue;
if (gaEvent[i].criminal != player)
continue;
dist = (GetPosition() - gaEvent[i].posn).Magnitude();
if (dist < mindist) {
mindist = dist;
event = i;
}
}
if (event != -1) {
if (victim) {
m_victimOfPlayerCrime = victim;
} else {
switch (gaEvent[event].entityType) {
case EVENT_ENTITY_PED:
m_victimOfPlayerCrime = CPools::GetPed(gaEvent[event].entityRef);
break;
case EVENT_ENTITY_VEHICLE:
m_victimOfPlayerCrime = CPools::GetVehicle(gaEvent[event].entityRef);
break;
case EVENT_ENTITY_OBJECT:
m_victimOfPlayerCrime = CPools::GetObject(gaEvent[event].entityRef);
break;
default:
break;
}
}
}
return event;
}
#endif
bool bool
CPed::CheckForExplosions(CVector2D &area) CPed::CheckForExplosions(CVector2D &area)
{ {
@ -4542,6 +4658,14 @@ CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump)
wanted->RegisterCrime_Immediately(CRIME_SPEEDING, GetPosition(), (uintptr)this, false); wanted->RegisterCrime_Immediately(CRIME_SPEEDING, GetPosition(), (uintptr)this, false);
} }
} }
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
else if (reason->IsVehicle()) {
if (veh->pDriver && veh->pDriver->IsPlayer()) {
CWanted* wanted = FindPlayerPed()->m_pWanted;
wanted->RegisterCrime(CRIME_RECKLESS_DRIVING, GetPosition(), (uintptr)this, false);
}
}
#endif
} }
void void
@ -5384,11 +5508,6 @@ CPed::CollideWithPed(CPed *collideWith)
SetDirectionToWalkAroundObject(collideWith); SetDirectionToWalkAroundObject(collideWith);
} }
} else { } else {
#ifdef VC_PED_PORTS
if (FindPlayerPed() != m_pedInObjective
|| m_objective != OBJECTIVE_KILL_CHAR_ANY_MEANS && m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT
|| collideWith == m_pedInObjective) {
#endif
if (weAreMissionChar || m_pedStats->m_fear <= 100 - collideWith->m_pedStats->m_temper if (weAreMissionChar || m_pedStats->m_fear <= 100 - collideWith->m_pedStats->m_temper
|| (collideWith->IsPlayer() || collideWith->m_nMoveState == PEDMOVE_NONE || collideWith->m_nMoveState == PEDMOVE_STILL) && || (collideWith->IsPlayer() || collideWith->m_nMoveState == PEDMOVE_NONE || collideWith->m_nMoveState == PEDMOVE_STILL) &&
(!collideWith->IsPlayer() || ((CPlayerPed*)collideWith)->m_fMoveSpeed <= 1.0f)) { (!collideWith->IsPlayer() || ((CPlayerPed*)collideWith)->m_fMoveSpeed <= 1.0f)) {
@ -5398,47 +5517,6 @@ CPed::CollideWithPed(CPed *collideWith)
} else { } else {
SetEvasiveStep(collideWith, 2); SetEvasiveStep(collideWith, 2);
} }
#ifdef VC_PED_PORTS
} else if (collideWith->m_nMoveState != PEDMOVE_STILL && GetWeapon()->IsTypeMelee()
&& collideWith->m_pedInObjective == m_pedInObjective) {
int colliderIsAtPlayerSafePosID = -1;
int weAreAtPlayerSafePosID = -1;
for (int i = 0; i < ARRAY_SIZE(((CPlayerPed*)m_pedInObjective)->m_pPedAtSafePos); i++) {
CPed *pedAtSafePos = ((CPlayerPed*)m_pedInObjective)->m_pPedAtSafePos[i];
if (pedAtSafePos == this) {
weAreAtPlayerSafePosID = i;
} else if (pedAtSafePos == collideWith) {
colliderIsAtPlayerSafePosID = i;
}
}
bool weAreCloserToTargetThenCollider = false;
if ((GetPosition() - m_vecSeekPos).MagnitudeSqr2D() < (collideWith->GetPosition() - m_vecSeekPos).MagnitudeSqr2D())
weAreCloserToTargetThenCollider = true;
if (weAreAtPlayerSafePosID <= 0 || weAreCloserToTargetThenCollider) {
if (!weAreCloserToTargetThenCollider) {
int time = 300;
SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &time);
m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + time;
}
} else if (colliderIsAtPlayerSafePosID <= 0) {
if (collideWith->m_pedInObjective == FindPlayerPed()) {
// VC specific
// ((CPlayerPed*)m_pedInObjective)->RemovePedFromMeleeList(this);
int time = 500;
SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &time);
m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + time;
}
} else {
int time = 300;
SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &time);
m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + time;
}
} else {
SetDirectionToWalkAroundObject(collideWith);
}
#endif
} }
} else { } else {
if (m_pedStats->m_temper <= m_pedStats->m_fear if (m_pedStats->m_temper <= m_pedStats->m_fear
@ -5452,12 +5530,20 @@ CPed::CollideWithPed(CPed *collideWith)
} else { } else {
TurnBody(); TurnBody();
SetAttack(collideWith); SetAttack(collideWith);
#ifdef VC_PED_PORTS
m_fRotationCur = 0.3f + m_fRotationCur;
m_fRotationDest = m_fRotationCur;
#endif
} }
m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(250, 450); m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(250, 450);
} }
} }
} else { } else {
#ifdef VC_PED_PORTS
if (m_pedInObjective && (collideWith == m_pedInObjective || collideWith->m_pedInObjective == m_pedInObjective) && CTimer::GetTimeInMilliseconds() > m_nPedStateTimer) {
#else
if (m_pedInObjective && collideWith == m_pedInObjective && CTimer::GetTimeInMilliseconds() > m_nPedStateTimer) { if (m_pedInObjective && collideWith == m_pedInObjective && CTimer::GetTimeInMilliseconds() > m_nPedStateTimer) {
#endif
if (heLooksToUs) { if (heLooksToUs) {
SetEvasiveStep(collideWith, 1); SetEvasiveStep(collideWith, 1);
m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 3000; m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 3000;
@ -5466,7 +5552,11 @@ CPed::CollideWithPed(CPed *collideWith)
if (m_pedStats != collideWith->m_pedStats) { if (m_pedStats != collideWith->m_pedStats) {
if (collideWith->m_pedStats->m_fear <= 100 - m_pedStats->m_temper) { if (collideWith->m_pedStats->m_fear <= 100 - m_pedStats->m_temper
#ifdef VC_PED_PORTS
|| collideWith->IsPlayer() || CTimer::GetTimeInMilliseconds() < m_nPedStateTimer
#endif
) {
if (collideWith->IsPlayer()) { if (collideWith->IsPlayer()) {
// He's on our right side // He's on our right side
@ -5476,16 +5566,19 @@ CPed::CollideWithPed(CPed *collideWith)
m_fRotationCur += m_headingRate; m_fRotationCur += m_headingRate;
} else { } else {
// He's on our right side // He's on our right side
if (DotProduct(posDiff, GetRight()) <= 0.0f) if (DotProduct(posDiff, collideWith->GetRight()) <= 0.0f)
m_fRotationCur -= m_headingRate; collideWith->m_fRotationCur -= collideWith->m_headingRate;
else else
m_fRotationCur += m_headingRate; collideWith->m_fRotationCur += collideWith->m_headingRate;
} }
} else { } else {
SetLookFlag(collideWith, false); SetLookFlag(collideWith, false);
TurnBody(); TurnBody();
animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT_PPUNCH, 8.0f); animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT_PPUNCH, 8.0f);
animAssoc->flags |= ASSOC_FADEOUTWHENDONE; animAssoc->flags |= ASSOC_FADEOUTWHENDONE;
#ifdef VC_PED_PORTS
m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 2000;
#endif
if (!heIsMissionChar) { if (!heIsMissionChar) {
CVector2D posDiff2D(posDiff); CVector2D posDiff2D(posDiff);
int direction = collideWith->GetLocalDirection(posDiff2D); int direction = collideWith->GetLocalDirection(posDiff2D);
@ -8423,10 +8516,6 @@ CPed::KillPedWithCar(CVehicle *car, float impulse)
if (car->pDriver) { if (car->pDriver) {
CEventList::RegisterEvent((m_nPedType == PEDTYPE_COP ? EVENT_HIT_AND_RUN_COP : EVENT_HIT_AND_RUN), EVENT_ENTITY_PED, this, car->pDriver, 1000); CEventList::RegisterEvent((m_nPedType == PEDTYPE_COP ? EVENT_HIT_AND_RUN_COP : EVENT_HIT_AND_RUN), EVENT_ENTITY_PED, this, car->pDriver, 1000);
#ifdef TOGGLEABLE_BETA_FEATURES
if (bMakePedsRunToPhonesToReportCrimes)
m_ped_flagI40 = true;
#endif
} }
ePedPieceTypes pieceToDamage; ePedPieceTypes pieceToDamage;
@ -8966,7 +9055,11 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
return; return;
if (!ped->EnteringCar()) { if (!ped->EnteringCar()) {
#ifdef VC_PED_PORTS
if (ped->m_nPedState != PED_DRIVING)
#endif
ped->QuitEnteringCar(); ped->QuitEnteringCar();
return; return;
} }
if (ped->m_fHealth == 0.0f) { if (ped->m_fHealth == 0.0f) {
@ -10558,7 +10651,11 @@ CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
return; return;
if (!ped->EnteringCar()) { if (!ped->EnteringCar()) {
#ifdef VC_PED_PORTS
if (ped->m_nPedState != PED_DRIVING)
#endif
ped->QuitEnteringCar(); ped->QuitEnteringCar();
return; return;
} }
@ -11589,16 +11686,21 @@ CPed::PedStaggerCB(CAnimBlendAssociation* animAssoc, void* arg)
*/ */
} }
// It's "CPhoneInfo::ProcessNearestFreePhone" in PC IDB, but it's not true, someone made it up. // It's "CPhoneInfo::ProcessNearestFreePhone" in PC IDB but that's not true, someone made it up.
bool bool
CPed::RunToReportCrime(eCrimeType crimeToReport) CPed::RunToReportCrime(eCrimeType crimeToReport)
{ {
#ifdef TOGGLEABLE_BETA_FEATURES #ifdef PEDS_REPORT_CRIMES_ON_PHONE
if (!bMakePedsRunToPhonesToReportCrimes) if (bRunningToPhone) {
if (!isPhoneAvailable(m_phoneId)) {
m_phoneId = -1;
bIsRunning = false;
ClearSeek(); // clears bRunningToPhone
return false; return false;
}
if (bRunningToPhone)
return true; return true;
}
#else #else
// They changed true into false to make this function unusable. So running to phone actually starts but first frame after that cancels it. // They changed true into false to make this function unusable. So running to phone actually starts but first frame after that cancels it.
if (m_nPedState == PED_SEEK_POS) if (m_nPedState == PED_SEEK_POS)
@ -11612,11 +11714,13 @@ CPed::RunToReportCrime(eCrimeType crimeToReport)
return false; return false;
CPhone *phone = &gPhoneInfo.m_aPhones[phoneId]; CPhone *phone = &gPhoneInfo.m_aPhones[phoneId];
#ifndef PEDS_REPORT_CRIMES_ON_PHONE
if (phone->m_nState != PHONE_STATE_FREE) if (phone->m_nState != PHONE_STATE_FREE)
return false; return false;
#endif
bRunningToPhone = true; bRunningToPhone = true;
SetSeek(phone->m_pEntity->GetPosition() - phone->m_pEntity->GetForward(), 1.3f); // original: phone.m_vecPos, 0.3f SetSeek(phone->m_pEntity->GetMatrix() * -phone->m_pEntity->GetForward(), 1.0f); // original: phone.m_vecPos, 0.3f
SetMoveState(PEDMOVE_RUN); SetMoveState(PEDMOVE_RUN);
bIsRunning = true; // not there in original bIsRunning = true; // not there in original
m_phoneId = phoneId; m_phoneId = phoneId;
@ -13672,6 +13776,11 @@ CPed::SetSeekCar(CVehicle *car, uint32 doorNode)
if (m_nPedState == PED_SEEK_CAR) if (m_nPedState == PED_SEEK_CAR)
return; return;
#ifdef VC_PED_PORTS
if (!CanSetPedState() || m_nPedState == PED_DRIVING)
return;
#endif
SetStoredState(); SetStoredState();
m_pSeekTarget = car; m_pSeekTarget = car;
m_pSeekTarget->RegisterReference((CEntity**) &m_pSeekTarget); m_pSeekTarget->RegisterReference((CEntity**) &m_pSeekTarget);
@ -13789,14 +13898,13 @@ CPed::SetDirectionToWalkAroundObject(CEntity *obj)
if (m_nMoveState == PEDMOVE_NONE || m_nMoveState == PEDMOVE_STILL) if (m_nMoveState == PEDMOVE_NONE || m_nMoveState == PEDMOVE_STILL)
return; return;
#ifdef TOGGLEABLE_BETA_FEATURES #ifndef PEDS_REPORT_CRIMES_ON_PHONE
if (!bMakePedsRunToPhonesToReportCrimes)
#endif
if (CharCreatedBy != MISSION_CHAR && obj->GetModelIndex() == MI_PHONEBOOTH1) { if (CharCreatedBy != MISSION_CHAR && obj->GetModelIndex() == MI_PHONEBOOTH1) {
bool isRunning = m_nMoveState == PEDMOVE_RUN || m_nMoveState == PEDMOVE_SPRINT; bool isRunning = m_nMoveState == PEDMOVE_RUN || m_nMoveState == PEDMOVE_SPRINT;
SetFindPathAndFlee(obj, 5000, !isRunning); SetFindPathAndFlee(obj, 5000, !isRunning);
return; return;
} }
#endif
CVector2D adjustedColMin(objColMin.x - 0.35f, objColMin.y - 0.35f); CVector2D adjustedColMin(objColMin.x - 0.35f, objColMin.y - 0.35f);
CVector2D adjustedColMax(objColMax.x + 0.35f, objColMax.y + 0.35f); CVector2D adjustedColMax(objColMax.x + 0.35f, objColMax.y + 0.35f);

View File

@ -385,9 +385,8 @@ public:
#ifdef PED_SKIN #ifdef PED_SKIN
uint32 bDontAcceptIKLookAts : 1; // TODO: find uses of this uint32 bDontAcceptIKLookAts : 1; // TODO: find uses of this
#endif #endif
// our own flags uint32 m_ped_flagI40 : 1;
uint32 m_ped_flagI40 : 1; // bMakePedsRunToPhonesToReportCrimes makes use of this as runover by car indicator uint32 m_ped_flagI80 : 1; // originally unused, KANGAROO_CHEAT define makes use of this as cheat toggle
uint32 m_ped_flagI80 : 1; // KANGAROO_CHEAT define makes use of this as cheat toggle
uint8 CharCreatedBy; uint8 CharCreatedBy;
eObjective m_objective; eObjective m_objective;
@ -454,6 +453,10 @@ public:
float m_distanceToCountSeekDone; float m_distanceToCountSeekDone;
bool bRunningToPhone; bool bRunningToPhone;
int16 m_phoneId; int16 m_phoneId;
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
bool m_facePhoneStart;
CEntity *m_victimOfPlayerCrime;
#endif
eCrimeType m_crimeToReportOnPhone; eCrimeType m_crimeToReportOnPhone;
uint32 m_phoneTalkTimer; uint32 m_phoneTalkTimer;
CAccident *m_lastAccident; CAccident *m_lastAccident;
@ -588,6 +591,9 @@ public:
bool MakePhonecall(void); bool MakePhonecall(void);
bool FacePhone(void); bool FacePhone(void);
CPed *CheckForDeadPeds(void); CPed *CheckForDeadPeds(void);
#ifdef PEDS_REPORT_CRIMES_ON_PHONE
int32 CheckForPlayerCrimes(CPed *victim = nil);
#endif
bool CheckForExplosions(CVector2D &area); bool CheckForExplosions(CVector2D &area);
CPed *CheckForGunShots(void); CPed *CheckForGunShots(void);
PointBlankNecessity CheckForPointBlankPeds(CPed*); PointBlankNecessity CheckForPointBlankPeds(CPed*);
@ -872,9 +878,8 @@ public:
static bool bPedCheat3; static bool bPedCheat3;
static CVector2D ms_vec2DFleePosition; static CVector2D ms_vec2DFleePosition;
#ifdef TOGGLEABLE_BETA_FEATURES #ifdef DEBUGMENU
static bool bPopHeadsOnHeadshot; static bool bPopHeadsOnHeadshot;
static bool bMakePedsRunToPhonesToReportCrimes;
#endif #endif
#ifndef MASTER #ifndef MASTER

View File

@ -874,7 +874,7 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim,
if ( victim->IsPed() && ((CPed*)shooter)->m_nPedType != ((CPed*)victim)->m_nPedType || ((CPed*)shooter)->m_nPedType == PEDTYPE_PLAYER2 ) if ( victim->IsPed() && ((CPed*)shooter)->m_nPedType != ((CPed*)victim)->m_nPedType || ((CPed*)shooter)->m_nPedType == PEDTYPE_PLAYER2 )
{ {
CPed *victimPed = (CPed *)victim; CPed *victimPed = (CPed *)victim;
if ( !victimPed->OnGround() && victim != shooter ) if ( !victimPed->DyingOrDead() && victim != shooter )
{ {
if ( victimPed->DoesLOSBulletHitPed(*point) ) if ( victimPed->DoesLOSBulletHitPed(*point) )
{ {