From cf5db7311776c26b4c2710b142a2863e88645965 Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Sat, 16 May 2020 11:22:12 +0300
Subject: [PATCH] a few fixes

---
 src/peds/CivilianPed.cpp | 5 +++--
 src/peds/PedAttractor.h  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index 50b04df3..48785025 100644
--- a/src/peds/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
@@ -11,6 +11,7 @@
 #include "SurfaceTable.h"
 #include "Weather.h"
 #include "PedAttractor.h"
+#include "Object.h"
 
 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) {
 		CEntity* pEntity = (CEntity*)pNode->item;
-		//if (pEntity->IsObject() && (CObject*)(pEntity)->IsBroken())
-			//continue;
+		if (pEntity->IsObject() && (!pEntity->IsStatic() || ((CObject*)pEntity)->bHasBeenDamaged))
+			continue;
 		CBaseModelInfo* pModelInfo = CModelInfo::GetModelInfo(pEntity->GetModelIndex());
 		for (int i = 0; i < pModelInfo->GetNum2dEffects(); i++) {
 			C2dEffect* pEffect = pModelInfo->Get2dEffect(i);
diff --git a/src/peds/PedAttractor.h b/src/peds/PedAttractor.h
index 3408be93..d2ed014e 100644
--- a/src/peds/PedAttractor.h
+++ b/src/peds/PedAttractor.h
@@ -152,9 +152,9 @@ public:
 	virtual void UpdatePedStateOnDeparture(CPed* pPed) const override
 	{ /*
 		if (pPed->m_money > 10)
-			pPed->m_money = 0;
-		else
 			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) :