mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 15:30:00 +00:00
a few fixes
This commit is contained in:
parent
03c4a979c8
commit
cf5db73117
|
@ -11,6 +11,7 @@
|
||||||
#include "SurfaceTable.h"
|
#include "SurfaceTable.h"
|
||||||
#include "Weather.h"
|
#include "Weather.h"
|
||||||
#include "PedAttractor.h"
|
#include "PedAttractor.h"
|
||||||
|
#include "Object.h"
|
||||||
|
|
||||||
CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype)
|
CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype)
|
||||||
{
|
{
|
||||||
|
@ -391,8 +392,8 @@ void CCivilianPed::FindNearbyAttractorsSectorList(CPtrList& list, float& minDist
|
||||||
{
|
{
|
||||||
for (CPtrNode* pNode = list.first; pNode != nil; pNode = pNode->next) {
|
for (CPtrNode* pNode = list.first; pNode != nil; pNode = pNode->next) {
|
||||||
CEntity* pEntity = (CEntity*)pNode->item;
|
CEntity* pEntity = (CEntity*)pNode->item;
|
||||||
//if (pEntity->IsObject() && (CObject*)(pEntity)->IsBroken())
|
if (pEntity->IsObject() && (!pEntity->IsStatic() || ((CObject*)pEntity)->bHasBeenDamaged))
|
||||||
//continue;
|
continue;
|
||||||
CBaseModelInfo* pModelInfo = CModelInfo::GetModelInfo(pEntity->GetModelIndex());
|
CBaseModelInfo* pModelInfo = CModelInfo::GetModelInfo(pEntity->GetModelIndex());
|
||||||
for (int i = 0; i < pModelInfo->GetNum2dEffects(); i++) {
|
for (int i = 0; i < pModelInfo->GetNum2dEffects(); i++) {
|
||||||
C2dEffect* pEffect = pModelInfo->Get2dEffect(i);
|
C2dEffect* pEffect = pModelInfo->Get2dEffect(i);
|
||||||
|
|
|
@ -152,9 +152,9 @@ public:
|
||||||
virtual void UpdatePedStateOnDeparture(CPed* pPed) const override
|
virtual void UpdatePedStateOnDeparture(CPed* pPed) const override
|
||||||
{ /*
|
{ /*
|
||||||
if (pPed->m_money > 10)
|
if (pPed->m_money > 10)
|
||||||
pPed->m_money = 0;
|
|
||||||
else
|
|
||||||
pPed->m_money -= 10;
|
pPed->m_money -= 10;
|
||||||
|
else
|
||||||
|
pPed->m_money = 0;
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
CPedPizzaAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float unk8, float unk9, float posdisp, float headdisp) :
|
CPedPizzaAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float unk8, float unk9, float posdisp, float headdisp) :
|
||||||
|
|
Loading…
Reference in a new issue