archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-04 03:50:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes

Browse Source
This commit is contained in:
eray orçunus
2020-09-29 22:53:12 +03:00
parent 1fa852f118
commit f71953077d
35 changed files with 1428 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/peds/CivilianPed.cpp
View File

@ -117,7 +117,7 @@ CCivilianPed::CivilianAI(void)
} else {
SetMoveState(PEDMOVE_WALK);
}
} else if (threatPed->IsPlayer() && IsGangMember() && b158_80) {
} else if (threatPed->IsPlayer() && IsGangMember() && bCanAttackPlayerWithCops) {
SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, m_threatEntity);
} else if (threatPed->IsPlayer() && FindPlayerPed()->m_pWanted->m_CurrentCops != 0) {
@ -203,7 +203,7 @@ CCivilianPed::CivilianAI(void)
CPed *threatPed = (CPed*)m_threatEntity;
if (m_pedStats->m_fear <= 100 - threatPed->m_pedStats->m_temper && threatPed->m_nPedType != PEDTYPE_COP) {
if (threatPed->GetWeapon()->IsTypeMelee() || !GetWeapon()->IsTypeMelee()) {
if (threatPed->IsPlayer() && IsGangMember() && b158_80) {
if (threatPed->IsPlayer() && IsGangMember() && bCanAttackPlayerWithCops) {
SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, m_threatEntity);
} else if (threatPed->IsPlayer() && FindPlayerPed()->m_pWanted->m_CurrentCops != 0) {

2
src/peds/Gangs.cpp
View File

@ -6,6 +6,8 @@
#include "Streaming.h"
#include "Weapon.h"
// --MIAMI: file done
CGangInfo CGangs::Gang[NUM_GANGS];
bool CGangs::GangAttackWithCops[NUM_GANGS];

2
src/peds/Ped.cpp
View File

@ -459,7 +459,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
bCollectBusFare = false;
bBoughtIceCream = false;
bDonePositionOutOfCollision = false;
b158_80 = false;
bCanAttackPlayerWithCops = false;
if (CGeneral::GetRandomNumber() & 3)
bHasACamera = false;

2
src/peds/Ped.h
View File

@ -491,7 +491,7 @@ public:
uint32 bCollectBusFare : 1;
uint32 bBoughtIceCream : 1;
uint32 bDonePositionOutOfCollision : 1;
uint32 b158_80 : 1;
uint32 bCanAttackPlayerWithCops : 1;
// our own flags
uint32 m_ped_flagI80 : 1; // KANGAROO_CHEAT define makes use of this as cheat toggle

7
src/peds/PedChat.cpp
View File

@ -4,7 +4,8 @@
#include "General.h"
#include "Ped.h"
// --MIAMI: Done
// --MIAMI: file done
// Corresponds to ped sounds (from SOUND_PED_DEATH to SOUND_PED_TAXI_CALL)
PedAudioData CommentWaitTime[56] = {
{ 500, 800, 500, 2 },
@ -65,14 +66,12 @@ PedAudioData CommentWaitTime[56] = {
{ 0, 0, 0, 0 }
};
// --MIAMI: Done
bool
CPed::ServiceTalkingWhenDead(void)
{
return m_queuedSound == SOUND_PED_DEATH;
}
// --MIAMI: Done
void
CPed::ServiceTalking(void)
{
@ -102,7 +101,6 @@ CPed::ServiceTalking(void)
}
}
// --MIAMI: Done
void
CPed::Say(uint16 audio)
{
@ -157,7 +155,6 @@ CPed::Say(uint16 audio)
}
}
// --MIAMI: Done
void
CPed::Say(uint16 audio, int32 time)
{

2
src/peds/PedType.cpp
View File

@ -3,6 +3,8 @@
#include "FileMgr.h"
#include "PedType.h"
// --MIAMI: file done
CPedType *CPedType::ms_apPedType[NUM_PEDTYPES];
void

1028
src/peds/Population.cpp
View File

File diff suppressed because it is too large Load Diff

40
src/peds/Population.h
View File

@ -13,23 +13,6 @@ struct PedGroup
int32 models[NUMMODELSPERPEDGROUP];
};
// Don't know the original name
struct RegenerationPoint
{
eLevelName srcLevel; // this and below one may need to be exchanged
eLevelName destLevel;
float x1;
float x2;
float y1;
float y2;
float z1;
float z2;
CVector destPosA;
CVector destPosB;
CVector srcPosA;
CVector srcPosB;
};
class CPopulation
{
public:
@ -39,6 +22,7 @@ public:
static float PedDensityMultiplier;
static uint32 ms_nTotalMissionPeds;
static int32 MaxNumberOfPedsInUse;
static int32 MaxNumberOfPedsInUseInterior;
static uint32 ms_nNumCivMale;
static uint32 ms_nNumCivFemale;
static uint32 ms_nNumCop;
@ -58,9 +42,6 @@ public:
static uint32 ms_nNumGang9;
static uint32 ms_nNumGang7;
static uint32 ms_nNumGang8;
static CVector RegenerationPoint_a;
static CVector RegenerationPoint_b;
static CVector RegenerationForward;
static uint32 ms_nTotalCarPassengerPeds;
static uint32 NumMiamiViceCops;
@ -71,13 +52,12 @@ public:
static void UpdatePedCount(ePedType, bool);
static void DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool);
static CPed *AddPedInCar(CVehicle *car, bool isDriver);
static bool IsPointInSafeZone(CVector *coors);
static void RemovePed(CPed *ent);
static int32 ChooseCivilianOccupation(int32);
static int32 ChooseNextCivilianOccupation(int32);
static void ChooseCivilianCoupleOccupations(int32, int32&, int32&);
static int32 ChoosePolicePedOccupation();
static int32 ChooseGangOccupation(int);
static void FindCollisionZoneForCoors(CVector*, int*, eLevelName*);
static void FindClosestZoneForCoors(CVector*, int*, eLevelName, eLevelName);
static void GeneratePedsAtStartOfGame();
static float PedCreationDistMultiplier();
static CPed *AddPed(ePedType pedType, uint32 mi, CVector const &coors, int32 modifier = 0);
@ -91,6 +71,18 @@ public:
static bool TestSafeForRealObject(CDummyObject*);
static bool IsSkateable(CVector const&);
static bool CanJeerAtStripper(int32 model);
static void RemovePedsIfThePoolGetsFull(void);
static bool IsMale(int32);
static bool IsFemale(int32);
static bool IsSunbather(int32);
static int32 ComputeRandomisedGangSize(void);
static bool CanSolicitPlayerInCar(int32);
static bool CanSolicitPlayerOnFoot(int32);
static bool IsSecurityGuard(ePedType);
static void PlaceGangMembers(ePedType, int32, CVector const&);
static void PlaceGangMembersInFormation(ePedType, int32, CVector const&);
static void PlaceGangMembersInCircle(ePedType, int32, CVector const&);
static void PlaceCouple(ePedType, int32, ePedType, int32, CVector);
static void PlaceMallPedsAsStationaryGroup(CVector const&, int32);
static CPed* AddDeadPedInFrontOfCar(const CVector& pos, CVehicle* pCulprit);
};