5 files changed, 10 insertions, 10 deletions

diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 7db2124d..53c2b2c2 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -5637,7 +5637,7 @@ CPed::LoadFightData(void)
 
 	CAnimBlendAssociation *animAssoc;
 
-	int bp, buflen;
+	size_t bp, buflen;
 	int lp, linelen;
 
 	buflen = CFileMgr::LoadFile("DATA\\fistfite.dat", work_buff, sizeof(work_buff), "r");
diff --git a/src/peds/PedAttractor.cpp b/src/peds/PedAttractor.cpp
index db5f9e52..d69f2684 100644
--- a/src/peds/PedAttractor.cpp
+++ b/src/peds/PedAttractor.cpp
@@ -137,8 +137,8 @@ void CPedAttractorManager::RemoveIceCreamVanEffects(C2dEffect* pEffect)
 	for (std::vector<CVehicleToEffect>::const_iterator assoc = vVehicleToEffect.cbegin(); assoc != vVehicleToEffect.cend();) {
 		if (assoc->GetVehicle() != pVehicle)
 			return;
-		size_t total = 0;
-		for (size_t j = 0; j < NUM_ATTRACTORS_FOR_ICECREAM_VAN; j++) {
+		int total = 0;
+		for (int j = 0; j < NUM_ATTRACTORS_FOR_ICECREAM_VAN; j++) {
 			if (FindAssociatedAttractor(assoc->GetEffect(j), vIceCreamAttractors))
 				total++;
 		}
@@ -355,13 +355,13 @@ bool CPedAttractor::BroadcastArrival(CPed* pPed)
 bool CPedAttractor::BroadcastDeparture(CPed* pPed)
 {
 	int qid = -1;
-	for (size_t i = 0; i < vWaitingQueue.size(); i++){
+	for (int i = 0; i < vWaitingQueue.size(); i++){
 		if (vWaitingQueue[i] == pPed)
 			qid = i;
 	}
 	if (qid < 0)
 		return false;
-	for (size_t i = qid + 1; i < vWaitingQueue.size(); i++) {
+	for (int i = qid + 1; i < vWaitingQueue.size(); i++) {
 		CVector pos;
 		float heading;
 		float time;
@@ -401,7 +401,7 @@ bool CPedAttractor::BroadcastDeparture(CPed* pPed)
 bool CPedShelterAttractor::BroadcastDeparture(CPed* pPed)
 {
 	int qid = -1;
-	for (size_t i = 0; i < vWaitingQueue.size(); i++) {
+	for (int i = 0; i < vWaitingQueue.size(); i++) {
 		if (vWaitingQueue[i] == pPed)
 			qid = i;
 	}
diff --git a/src/peds/PedAttractor.h b/src/peds/PedAttractor.h
index 563efd3a..85b4327b 100644
--- a/src/peds/PedAttractor.h
+++ b/src/peds/PedAttractor.h
@@ -108,8 +108,8 @@ public:
 	float ComputeDeltaHeading() const;
 	float ComputeDeltaPos() const;
 	void ComputeAttractTime(int32 id, bool, float& time) const;
-	int32 GetNoOfRegisteredPeds() const { return vWaitingQueue.size() + vApproachingQueue.size(); }
-	int32 ComputeFreeSlot() const { return vWaitingQueue.size(); }
+	int32 GetNoOfRegisteredPeds() const { return (int32)(vWaitingQueue.size() + vApproachingQueue.size()); }
+	int32 ComputeFreeSlot() const { return (int32)vWaitingQueue.size(); }
 	bool IsInQueue(CPed*) const;
 	bool RegisterPed(CPed*);
 	bool BroadcastArrival(CPed*);
diff --git a/src/peds/PedStats.cpp b/src/peds/PedStats.cpp
index 06e39039..1f7a95b4 100644
--- a/src/peds/PedStats.cpp
+++ b/src/peds/PedStats.cpp
@@ -47,7 +47,7 @@ CPedStats::LoadPedStats(void)
 	char *buf;
 	char line[256];
 	char name[32];
-	int bp, buflen;
+	size_t bp, buflen;
 	int lp, linelen;
 	int type;
 	float fleeDist, headingChangeRate, attackStrength, defendWeakness;
diff --git a/src/peds/PedType.cpp b/src/peds/PedType.cpp
index 8bf4c6e1..397cd71d 100644
--- a/src/peds/PedType.cpp
+++ b/src/peds/PedType.cpp
@@ -43,7 +43,7 @@ CPedType::LoadPedData(void)
 	char *buf;
 	char line[256];
 	char word[32];
-	int bp, buflen;
+	size_t bp, buflen;
 	int lp, linelen;
 	int type;
 	uint32 flags;