8 files changed, 29 insertions, 23 deletions

diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 1f498102..b46bd2da 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -2986,12 +2986,12 @@ CCamera::LoadTrainCamNodes(char const *name)
 	char token[16] = { 0 };
 	char filename[16] = { 0 };
 	uint8 *buf;
-	size_t bufpos = 0;
+	ssize_t bufpos = 0;
 	int field = 0;
 	int tokpos = 0;
 	char c;
 	int i;
-	size_t len;
+	ssize_t len;
 
 	strcpy(filename, name);
 	len = (int)strlen(filename);
diff --git a/src/core/EventList.cpp b/src/core/EventList.cpp
index 8d69ba78..93f72d4e 100644
--- a/src/core/EventList.cpp
+++ b/src/core/EventList.cpp
@@ -120,7 +120,7 @@ CEventList::RegisterEvent(eEventType type, eEventEntity entityType, CEntity *ent
 	}
 
 	if(criminal == FindPlayerPed())
-		ReportCrimeForEvent(type, (uintptr)ent, copsDontCare);
+		ReportCrimeForEvent(type, (intptr)ent, copsDontCare);
 }
 
 void
@@ -198,7 +198,7 @@ CEventList::FindClosestEvent(eEventType type, CVector posn, int32 *event)
 }
 
 void
-CEventList::ReportCrimeForEvent(eEventType type, int32 crimeId, bool copsDontCare)
+CEventList::ReportCrimeForEvent(eEventType type, intptr crimeId, bool copsDontCare)
 {
 	eCrimeType crime;
 	switch(type){
diff --git a/src/core/EventList.h b/src/core/EventList.h
index 8840afc4..4ced3a83 100644
--- a/src/core/EventList.h
+++ b/src/core/EventList.h
@@ -59,7 +59,7 @@ public:
 	static bool GetEvent(eEventType type, int32 *event);
 	static void ClearEvent(int32 event);
 	static bool FindClosestEvent(eEventType type, CVector posn, int32 *event);
-	static void ReportCrimeForEvent(eEventType type, int32, bool);
+	static void ReportCrimeForEvent(eEventType type, intptr, bool);
 };
 
 extern CEvent gaEvent[NUMEVENTS];
\ No newline at end of file
diff --git a/src/core/FileMgr.cpp b/src/core/FileMgr.cpp
index 6e6a8efc..99923ddf 100644
--- a/src/core/FileMgr.cpp
+++ b/src/core/FileMgr.cpp
@@ -240,20 +240,22 @@ CFileMgr::SetDirMyDocuments(void)
 	mychdir(_psGetUserFilesFolder());
 }
 
-size_t
+ssize_t
 CFileMgr::LoadFile(const char *file, uint8 *buf, int unused, const char *mode)
 {
 	int fd;
-	size_t n, len;
+	ssize_t n, len;
 
 	fd = myfopen(file, mode);
 	if(fd == 0)
-		return 0;
+		return -1;
 	len = 0;
 	do{
 		n = myfread(buf + len, 1, 0x4000, fd);
-		if(n < 0)
+#ifndef FIX_BUGS
+		if (n < 0)
 			return -1;
+#endif
 		len += n;
 	}while(n == 0x4000);
 	buf[len] = 0;
@@ -274,13 +276,13 @@ CFileMgr::OpenFileForWriting(const char *file)
 }
 
 size_t
-CFileMgr::Read(int fd, const char *buf, int len)
+CFileMgr::Read(int fd, const char *buf, ssize_t len)
 {
 	return myfread((void*)buf, 1, len, fd);
 }
 
 size_t
-CFileMgr::Write(int fd, const char *buf, int len)
+CFileMgr::Write(int fd, const char *buf, ssize_t len)
 {
 	return myfwrite((void*)buf, 1, len, fd);
 }
diff --git a/src/core/FileMgr.h b/src/core/FileMgr.h
index 4734720e..98a78360 100644
--- a/src/core/FileMgr.h
+++ b/src/core/FileMgr.h
@@ -9,12 +9,12 @@ public:
 	static void ChangeDir(const char *dir);
 	static void SetDir(const char *dir);
 	static void SetDirMyDocuments(void);
-	static size_t LoadFile(const char *file, uint8 *buf, int unused, const char *mode);
+	static ssize_t LoadFile(const char *file, uint8 *buf, int unused, const char *mode);
 	static int OpenFile(const char *file, const char *mode);
 	static int OpenFile(const char *file) { return OpenFile(file, "rb"); }
 	static int OpenFileForWriting(const char *file);
-	static size_t Read(int fd, const char *buf, int len);
-	static size_t Write(int fd, const char *buf, int len);
+	static size_t Read(int fd, const char *buf, ssize_t len);
+	static size_t Write(int fd, const char *buf, ssize_t len);
 	static bool Seek(int fd, int offset, int whence);
 	static bool ReadLine(int fd, char *buf, int len);
 	static int CloseFile(int fd);
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
index 2c57c066..984b21bb 100644
--- a/src/core/Fire.cpp
+++ b/src/core/Fire.cpp
@@ -43,7 +43,7 @@ CFire::ProcessFire(void)
 	float fDamagePlayer;
 	float fDamagePeds;
 	float fDamageVehicle;
-	int8 nRandNumber;
+	int16 nRandNumber;
 	float fGreen;
 	float fRed;
 	CVector lightpos;
@@ -135,11 +135,10 @@ CFire::ProcessFire(void)
 			CShadows::StoreStaticShadow((uintptr)this, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &lightpos, 7.0f, 0.0f, 0.0f, -7.0f, 0, nRandNumber / 2,
 			                            nRandNumber / 2, 0, 10.0f, 1.0f, 40.0f, 0, 0.0f);
 		}
-		fGreen = nRandNumber / 128;
-		fRed = nRandNumber / 128;
+		fGreen = nRandNumber / 128.f;
+		fRed = nRandNumber / 128.f;
 
-		CPointLights::AddLight(0, m_vecPos, CVector(0.0f, 0.0f, 0.0f),
-			12.0f, fRed, fGreen, 0, 0, 0);
+		CPointLights::AddLight(CPointLights::LIGHT_POINT, m_vecPos, CVector(0.0f, 0.0f, 0.0f), 12.0f, fRed, fGreen, 0, 0, 0);
 	} else {
 		Extinguish();
 	}
diff --git a/src/core/Streaming.h b/src/core/Streaming.h
index ee9183a5..0e2e89be 100644
--- a/src/core/Streaming.h
+++ b/src/core/Streaming.h
@@ -140,7 +140,7 @@ public:
 	static bool RemoveLeastUsedModel(void);
 	static void RemoveAllUnusedModels(void);
 	static void RemoveUnusedModelsInLoadedList(void);
-	static bool RemoveReferencedTxds(size_t mem);
+	static bool RemoveReferencedTxds(size_t mem); // originally signed
 	static int32 GetAvailableVehicleSlot(void);
 	static bool IsTxdUsedByRequestedModels(int32 txdId);
 	static bool AddToLoadedVehiclesList(int32 modelId);
@@ -176,11 +176,11 @@ public:
 	static void DeleteFarAwayRwObjects(const CVector &pos);
 	static void DeleteAllRwObjects(void);
 	static void DeleteRwObjectsAfterDeath(const CVector &pos);
-	static void DeleteRwObjectsBehindCamera(size_t mem);
+	static void DeleteRwObjectsBehindCamera(size_t mem); // originally signed
 	static void DeleteRwObjectsInSectorList(CPtrList &list);
 	static void DeleteRwObjectsInOverlapSectorList(CPtrList &list, int32 x, int32 y);
-	static bool DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, size_t mem);
-	static bool DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, size_t mem);
+	static bool DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, size_t mem); // originally signed
+	static bool DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, size_t mem); // originally signed
 
 	static void LoadScene(const CVector &pos);
 
diff --git a/src/core/common.h b/src/core/common.h
index ffae30bf..50002ab5 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -73,11 +73,16 @@ typedef int16_t int16;
 typedef uint32_t uint32;
 typedef int32_t int32;
 typedef uintptr_t uintptr;
+typedef intptr_t intptr;
 typedef uint64_t uint64;
 typedef int64_t int64;
 // hardcode ucs-2
 typedef uint16_t wchar;
 
+#if defined(_MSC_VER)
+typedef ptrdiff_t ssize_t;
+#endif
+
 #ifndef nil
 #define nil NULL
 #endif