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

Merge branch 'miami' of github.com:GTAmodding/re3 into miami

Browse Source
This commit is contained in:
aap
2020-06-01 18:05:24 +02:00
parent de1018d7a6 6d3e54369c
commit 25273485d9
25 changed files with 663 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/peds/Ped.cpp
View File

@ -60,6 +60,7 @@
#include "Streaming.h"
#include "PedAttractor.h"
#include "Debug.h"
#include "GameLogic.h"
#define CAN_SEE_ENTITY_ANGLE_THRESHOLD DEGTORAD(60.0f)
@ -16228,6 +16229,12 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
return;
}
if (!someoneExitsFromOurExitDoor || m_nPedType == PEDTYPE_COP && veh->bIsBus) {
#if defined GTAVC_JP_PATCH || defined FIX_BUGS
if (veh->pDriver == this && !IsPlayer() && veh == CGameLogic::pShortCutTaxi) {
m_objective = OBJECTIVE_NONE;
return;
}
#endif
// Again, unused...
// CVector exitPos = GetPositionToOpenCarDoor(veh, optedDoorNode);
bool thereIsRoom = veh->IsRoomForPedToLeaveCar(optedDoorNode, nil);
@ -18669,6 +18676,35 @@ CPed::CanBeDamagedByThisGangMember(CPed* who)
return m_gangFlags & (1 << (uint8)(who->m_nPedType - PEDTYPE_GANG1));
}
void
CPed::Undress(const char* name)
{
int mi = GetModelIndex();
CAnimBlendAssociation* pAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_OUT);
//if (pAnim)
// FinishTalkingOnMobileCB(pAnim, this); // TODO(MIAMI)
DeleteRwObject();
if (m_nPedType == PEDTYPE_PLAYER1)
mi = MI_PLAYER;
CStreaming::RequestSpecialModel(mi, name, STREAMFLAGS_DEPENDENCY | STREAMFLAGS_SCRIPTOWNED);
CWorld::Remove(this);
}
void
CPed::Dress(void)
{
int mi = GetModelIndex();
m_modelIndex = -1;
SetModelIndex(mi);
m_nPedState = PED_IDLE;
m_nLastPedState = PED_NONE;
m_objective = OBJECTIVE_NONE;
m_prevObjective = OBJECTIVE_NONE;
m_nWaitState = WAITSTATE_FALSE;
CWorld::Add(this);
m_headingRate = m_pedStats->m_headingChangeRate;
}
bool
IsPedPointerValid_NotInWorld(CPed* pPed)
{

2
src/peds/Ped.h
View File

@ -916,6 +916,8 @@ public:
void SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float, float, int);
void ClearWaitState(void);
void Undress(const char*);
void Dress(void);
bool HasWeaponSlot(uint8 slot) { return m_weapons[slot].m_eWeaponType != WEAPONTYPE_UNARMED; }
CWeapon& GetWeapon(uint8 slot) { return m_weapons[slot]; }