From 1dc6fbda1fbd9a731eb20b3ef71c3dda989e511e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Wed, 22 Jul 2020 14:56:28 +0300
Subject: 64-bit on Windows

---
 src/audio/oal/aldlist.cpp    |  3 ++-
 src/audio/oal/stream.cpp     |  9 ++++++++-
 src/control/Replay.cpp       |  4 ++--
 src/core/Camera.cpp          |  6 +++---
 src/core/Directory.cpp       |  3 ++-
 src/core/FileMgr.cpp         | 12 +++++------
 src/core/FileMgr.h           |  6 +++---
 src/core/Frontend.cpp        |  2 +-
 src/core/Pad.cpp             |  2 +-
 src/core/Streaming.cpp       | 27 ++++++++++++++++---------
 src/core/Streaming.h         | 12 +++++------
 src/core/common.h            |  4 ++++
 src/peds/Ped.cpp             |  2 +-
 src/peds/PedStats.cpp        |  2 +-
 src/peds/PedType.cpp         |  2 +-
 src/render/Fluff.cpp         |  2 +-
 src/rw/NodeName.cpp          |  2 +-
 src/rw/VisibilityPlugins.cpp |  4 ++--
 src/rw/VisibilityPlugins.h   |  6 +++---
 src/skel/crossplatform.h     |  2 +-
 src/skel/glfw/glfw.cpp       |  2 +-
 src/skel/win/win.cpp         | 47 +++++++++++++++++++++++++++++++++++---------
 src/skel/win/win.h           |  8 ++++++--
 src/text/Text.cpp            | 18 +++++++++--------
 src/text/Text.h              |  8 ++++----
 src/weapons/WeaponInfo.cpp   |  2 +-
 26 files changed, 127 insertions(+), 70 deletions(-)

(limited to 'src')

diff --git a/src/audio/oal/aldlist.cpp b/src/audio/oal/aldlist.cpp
index 3e86b1d7..881418c1 100644
--- a/src/audio/oal/aldlist.cpp
+++ b/src/audio/oal/aldlist.cpp
@@ -27,6 +27,7 @@
 #ifndef _WIN32
 #define _stricmp strcasecmp
 #define _strnicmp strncasecmp
+#define _strdup strdup
 #endif
 
 #ifdef AUDIO_OAL
@@ -71,7 +72,7 @@ ALDeviceList::ALDeviceList()
 					if ((bNewName) && (actualDeviceName != NULL) && (strlen(actualDeviceName) > 0)) {
 						ALDEVICEINFO ALDeviceInfo;
 						ALDeviceInfo.bSelected = true;
-						ALDeviceInfo.strDeviceName = actualDeviceName;
+						ALDeviceInfo.strDeviceName = _strdup(actualDeviceName);
 						alcGetIntegerv(device, ALC_MAJOR_VERSION, sizeof(int), &ALDeviceInfo.iMajorVersion);
 						alcGetIntegerv(device, ALC_MINOR_VERSION, sizeof(int), &ALDeviceInfo.iMinorVersion);
 
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index 34518f54..5639bd12 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -5,7 +5,11 @@
 #include "sampman.h"
 
 #ifdef _WIN32
+
+// TODO: This is due to version difference of 32-bit libmpg123 and 64-bit libmpg123, fix it
+#ifndef _WIN64
 typedef long ssize_t;
+#endif
 #pragma comment( lib, "libsndfile-1.lib" )
 #pragma comment( lib, "libmpg123.lib" )
 #else
@@ -166,8 +170,11 @@ public:
 		
 		size_t size;
 		int err = mpg123_read(m_pMH, (unsigned char *)buffer, GetBufferSize(), &size);
+#if defined(__LP64__) || defined(_WIN64)
+		assert("We can't handle audio files more then 2 GB yet :shrug:" && (size < UINT32_MAX));
+#endif
 		if (err != MPG123_OK && err != MPG123_DONE) return 0;
-		return size;
+		return (uint32)size;
 	}
 };
 
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index cb9df508..8276f94a 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -1454,7 +1454,7 @@ void CReplay::StreamAllNecessaryCarsAndPeds(void)
 	for (int slot = 0; slot < NUM_REPLAYBUFFERS; slot++) {
 		if (BufferStatus[slot] == REPLAYBUFFER_UNUSED)
 			continue;
-		for (int offset = 0; Buffers[slot][offset] != REPLAYPACKET_END; offset += FindSizeOfPacket(Buffers[slot][offset])) {
+		for (size_t offset = 0; Buffers[slot][offset] != REPLAYPACKET_END; offset += FindSizeOfPacket(Buffers[slot][offset])) {
 			switch (Buffers[slot][offset]) {
 			case REPLAYPACKET_VEHICLE:
 				CStreaming::RequestModel(((tVehicleUpdatePacket*)&Buffers[slot][offset])->mi, 0);
@@ -1476,7 +1476,7 @@ void CReplay::FindFirstFocusCoordinate(CVector *coord)
 	for (int slot = 0; slot < NUM_REPLAYBUFFERS; slot++) {
 		if (BufferStatus[slot] == REPLAYBUFFER_UNUSED)
 			continue;
-		for (int offset = 0; Buffers[slot][offset] != REPLAYPACKET_END; offset += FindSizeOfPacket(Buffers[slot][offset])) {
+		for (size_t offset = 0; Buffers[slot][offset] != REPLAYPACKET_END; offset += FindSizeOfPacket(Buffers[slot][offset])) {
 			if (Buffers[slot][offset] == REPLAYPACKET_GENERAL) {
 				*coord = ((tGeneralPacket*)&Buffers[slot][offset])->player_pos;
 				return;
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 44749fd7..c253d00f 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -2978,15 +2978,15 @@ CCamera::LoadTrainCamNodes(char const *name)
 	char token[16] = { 0 };
 	char filename[16] = { 0 };
 	uint8 *buf;
-	int bufpos = 0;
+	size_t bufpos = 0;
 	int field = 0;
 	int tokpos = 0;
 	char c;
 	int i;
-	int len;
+	size_t len;
 
 	strcpy(filename, name);
-	len = strlen(filename);
+	len = (int)strlen(filename);
 	filename[len] = '.';
 	filename[len+1] = 'd';
 	filename[len+2] = 'a';
diff --git a/src/core/Directory.cpp b/src/core/Directory.cpp
index cc4d65d8..05344065 100644
--- a/src/core/Directory.cpp
+++ b/src/core/Directory.cpp
@@ -30,7 +30,8 @@ CDirectory::ReadDirFile(const char *filename)
 bool
 CDirectory::WriteDirFile(const char *filename)
 {
-	int fd, n;
+	int fd;
+	size_t n;
 	fd = CFileMgr::OpenFileForWriting(filename);
 	n = CFileMgr::Write(fd, (char*)entries, numEntries*sizeof(DirectoryInfo));
 	CFileMgr::CloseFile(fd);
diff --git a/src/core/FileMgr.cpp b/src/core/FileMgr.cpp
index 1939c861..8dbc6894 100644
--- a/src/core/FileMgr.cpp
+++ b/src/core/FileMgr.cpp
@@ -163,7 +163,7 @@ myfgets(char *buf, int len, int fd)
 	return buf;
 }
 
-static int
+static size_t
 myfread(void *buf, size_t elt, size_t n, int fd)
 {
 	if(myfiles[fd].isText){
@@ -184,7 +184,7 @@ myfread(void *buf, size_t elt, size_t n, int fd)
 	return fread(buf, elt, n, myfiles[fd].file);
 }
 
-static int
+static size_t
 myfwrite(void *buf, size_t elt, size_t n, int fd)
 {
 	if(myfiles[fd].isText){
@@ -265,11 +265,11 @@ CFileMgr::SetDirMyDocuments(void)
 	mychdir(_psGetUserFilesFolder());
 }
 
-int
+size_t
 CFileMgr::LoadFile(const char *file, uint8 *buf, int unused, const char *mode)
 {
 	int fd;
-	int n, len;
+	size_t n, len;
 
 	fd = myfopen(file, mode);
 	if(fd == 0)
@@ -298,13 +298,13 @@ CFileMgr::OpenFileForWriting(const char *file)
 	return OpenFile(file, "wb");
 }
 
-int
+size_t
 CFileMgr::Read(int fd, const char *buf, int len)
 {
 	return myfread((void*)buf, 1, len, fd);
 }
 
-int
+size_t
 CFileMgr::Write(int fd, const char *buf, int len)
 {
 	return myfwrite((void*)buf, 1, len, fd);
diff --git a/src/core/FileMgr.h b/src/core/FileMgr.h
index 1d0faf50..0ad9daa7 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 int LoadFile(const char *file, uint8 *buf, int unused, const char *mode);
+	static size_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 int Read(int fd, const char *buf, int len);
-	static int Write(int fd, const char *buf, int len);
+	static size_t Read(int fd, const char *buf, int len);
+	static size_t Write(int fd, const char *buf, int 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/Frontend.cpp b/src/core/Frontend.cpp
index 6e4e8917..95d5f6e6 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -2604,7 +2604,7 @@ CMenuManager::DrawPlayerSetupScreen()
 		char nameTemp[256];
 		for (m_pSelectedSkin = m_pSkinListHead.nextSkin; m_pSelectedSkin; m_pSelectedSkin = m_pSelectedSkin->nextSkin) {
 			// Drop extension
-			int oldLength = strlen(m_pSelectedSkin->skinNameDisplayed);
+			int oldLength = (int)strlen(m_pSelectedSkin->skinNameDisplayed);
 			m_pSelectedSkin->skinNameDisplayed[oldLength - 4] = '\0';
 			m_pSelectedSkin->skinNameOriginal[oldLength - 4] = '\0';
 
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 851625d2..944d7b2c 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -2634,7 +2634,7 @@ void CPad::ResetCheats(void)
 
 char *CPad::EditString(char *pStr, int32 nSize)
 {
-	int32 pos = strlen(pStr);
+	int32 pos = (int32)strlen(pStr);
 
 	// letters
 	for ( int32 i = 0; i < ('Z' - 'A' + 1); i++ )
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index b701f43f..6b652a6a 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -45,7 +45,7 @@ int32 CStreaming::ms_oldSectorX;
 int32 CStreaming::ms_oldSectorY;
 int32 CStreaming::ms_streamingBufferSize;
 int8 *CStreaming::ms_pStreamingBuffer[2];
-int32 CStreaming::ms_memoryUsed;
+size_t CStreaming::ms_memoryUsed;
 CStreamingChannel CStreaming::ms_channel[2];
 int32 CStreaming::ms_channelError;
 int32 CStreaming::ms_numVehiclesLoaded;
@@ -62,7 +62,7 @@ uint16 CStreaming::ms_loadedGangCars;
 int32 CStreaming::ms_imageOffsets[NUMCDIMAGES];
 int32 CStreaming::ms_lastImageRead;
 int32 CStreaming::ms_imageSize;
-uint32 CStreaming::ms_memoryAvailable;
+size_t CStreaming::ms_memoryAvailable;
 
 int32 desiredNumVehiclesLoaded = 12;
 
@@ -202,14 +202,19 @@ CStreaming::Init2(void)
 	// PC only, figure out how much memory we got
 #ifdef GTA_PC
 #define MB (1024*1024)
-	extern unsigned long _dwMemAvailPhys;
+
+	extern size_t _dwMemAvailPhys;
 	ms_memoryAvailable = (_dwMemAvailPhys - 10*MB)/2;
 	if(ms_memoryAvailable < 50*MB)
 		ms_memoryAvailable = 50*MB;
-	desiredNumVehiclesLoaded = (ms_memoryAvailable/MB - 50)/3 + 12;
+	desiredNumVehiclesLoaded = (int32)((ms_memoryAvailable / MB - 50) / 3 + 12);
 	if(desiredNumVehiclesLoaded > MAXVEHICLESLOADED)
 		desiredNumVehiclesLoaded = MAXVEHICLESLOADED;
+#if defined(__LP64__) || defined(_WIN64)
+	debug("Memory allocated to Streaming is %lluMB", ms_memoryAvailable/MB);
+#else
 	debug("Memory allocated to Streaming is %dMB", ms_memoryAvailable/MB);
+#endif
 #undef MB
 #endif
 
@@ -1085,7 +1090,7 @@ CStreaming::RemoveAllUnusedModels(void)
 }
 
 bool
-CStreaming::RemoveReferencedTxds(int32 mem)
+CStreaming::RemoveReferencedTxds(size_t mem)
 {
 	CStreamingInfo *si;
 	int streamId;
@@ -2201,7 +2206,7 @@ CStreaming::DeleteRwObjectsAfterDeath(const CVector &pos)
 }
 
 void
-CStreaming::DeleteRwObjectsBehindCamera(int32 mem)
+CStreaming::DeleteRwObjectsBehindCamera(size_t mem)
 {
 	int ix, iy;
 	int x, y;
@@ -2382,7 +2387,7 @@ CStreaming::DeleteRwObjectsInOverlapSectorList(CPtrList &list, int32 x, int32 y)
 }
 
 bool
-CStreaming::DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, int32 mem)
+CStreaming::DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, size_t mem)
 {
 	CPtrNode *node;
 	CEntity *e;
@@ -2403,7 +2408,7 @@ CStreaming::DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, int32 mem)
 }
 
 bool
-CStreaming::DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, int32 mem)
+CStreaming::DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, size_t mem)
 {
 	CPtrNode *node;
 	CEntity *e;
@@ -2430,7 +2435,7 @@ CStreaming::MakeSpaceFor(int32 size)
 	// the code still happens to work in that case because ms_memoryAvailable is unsigned
 	// but it's not nice....
 
-	while((uint32)ms_memoryUsed >= ms_memoryAvailable - size)
+	while(ms_memoryUsed >= ms_memoryAvailable - size)
 		if(!RemoveLeastUsedModel()){
 			DeleteRwObjectsBehindCamera(ms_memoryAvailable - size);
 			return;
@@ -2492,7 +2497,11 @@ CStreaming::UpdateForAnimViewer(void)
 	if (CStreaming::ms_channelError == -1) {
 		CStreaming::AddModelsToRequestList(CVector(0.0f, 0.0f, 0.0f));
 		CStreaming::LoadRequestedModels();
+#if defined(__LP64__) || defined(_WIN64)
+		sprintf(gString, "Requested %d, memory size %lluK\n", CStreaming::ms_numModelsRequested, 2 * CStreaming::ms_memoryUsed);
+#else
 		sprintf(gString, "Requested %d, memory size %dK\n", CStreaming::ms_numModelsRequested, 2 * CStreaming::ms_memoryUsed);
+#endif
 	}
 	else {
 		CStreaming::RetryLoadFile(CStreaming::ms_channelError);
diff --git a/src/core/Streaming.h b/src/core/Streaming.h
index 84434769..0b2ff124 100644
--- a/src/core/Streaming.h
+++ b/src/core/Streaming.h
@@ -86,7 +86,7 @@ public:
 	static int32 ms_oldSectorY;
 	static int32 ms_streamingBufferSize;
 	static int8 *ms_pStreamingBuffer[2];
-	static int32 ms_memoryUsed;
+	static size_t ms_memoryUsed;
 	static CStreamingChannel ms_channel[2];
 	static int32 ms_channelError;
 	static int32 ms_numVehiclesLoaded;
@@ -103,7 +103,7 @@ public:
 	static int32 ms_imageOffsets[NUMCDIMAGES];
 	static int32 ms_lastImageRead;
 	static int32 ms_imageSize;
-	static uint32 ms_memoryAvailable;
+	static size_t ms_memoryAvailable;
 
 	static void Init(void);
 	static void Init2(void);
@@ -140,7 +140,7 @@ public:
 	static bool RemoveLeastUsedModel(void);
 	static void RemoveAllUnusedModels(void);
 	static void RemoveUnusedModelsInLoadedList(void);
-	static bool RemoveReferencedTxds(int32 mem);
+	static bool RemoveReferencedTxds(size_t mem);
 	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(int32 mem);
+	static void DeleteRwObjectsBehindCamera(size_t mem);
 	static void DeleteRwObjectsInSectorList(CPtrList &list);
 	static void DeleteRwObjectsInOverlapSectorList(CPtrList &list, int32 x, int32 y);
-	static bool DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, int32 mem);
-	static bool DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, int32 mem);
+	static bool DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, size_t mem);
+	static bool DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, size_t mem);
 
 	static void LoadScene(const CVector &pos);
 
diff --git a/src/core/common.h b/src/core/common.h
index 4bf1aebd..17a186d0 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -17,7 +17,11 @@
 
 #if defined _WIN32 && defined WITHD3D
 #include <windows.h>
+#ifndef USE_D3D9
 #include <d3d8types.h>
+#else
+#include <d3d9types.h>
+#endif
 #endif
 
 #include <rwcore.h>
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index e134ac5d..4d83f5aa 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -4839,7 +4839,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/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;
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index da29daec..f86801bf 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -614,7 +614,7 @@ void CScrollBar::Update()
 			break;
 		}
 
-		m_MessageLength = strlen(m_pMessage);
+		m_MessageLength = (uint32)strlen(m_pMessage);
 		m_MessageCurrentChar = 0;
 	}
 
diff --git a/src/rw/NodeName.cpp b/src/rw/NodeName.cpp
index d62884f7..ad4acffb 100644
--- a/src/rw/NodeName.cpp
+++ b/src/rw/NodeName.cpp
@@ -51,7 +51,7 @@ RwInt32
 NodeNameStreamGetSize(const void *object, RwInt32 offsetInObject, RwInt32 sizeInObject)
 {
 	// game checks for null pointer on node name extension but that really happen
-	return rwstrlen(NODENAMEEXT(object));
+	return (RwInt32)rwstrlen(NODENAMEEXT(object));
 }
 
 bool
diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp
index 22edcb68..f6a9c3b5 100644
--- a/src/rw/VisibilityPlugins.cpp
+++ b/src/rw/VisibilityPlugins.cpp
@@ -797,12 +797,12 @@ CVisibilityPlugins::FrameCopyConstructor(void *dst, const void *src, int32, int3
 }
 
 void
-CVisibilityPlugins::SetFrameHierarchyId(RwFrame *frame, int32 id)
+CVisibilityPlugins::SetFrameHierarchyId(RwFrame *frame, uintptr id)
 {
 	FRAMEEXT(frame)->id = id;
 }
 
-int32
+uintptr
 CVisibilityPlugins::GetFrameHierarchyId(RwFrame *frame)
 {
 	return FRAMEEXT(frame)->id;
diff --git a/src/rw/VisibilityPlugins.h b/src/rw/VisibilityPlugins.h
index b367d7ee..dd02f2e1 100644
--- a/src/rw/VisibilityPlugins.h
+++ b/src/rw/VisibilityPlugins.h
@@ -103,10 +103,10 @@ public:
 	struct FrameExt
 	{
 		// BUG: this is abused to hold a pointer by SetClumpModelInfo
-		int32 id;
+		uintptr id;
 	};
-	static void SetFrameHierarchyId(RwFrame *frame, int32 id);
-	static int32 GetFrameHierarchyId(RwFrame *frame);
+	static void SetFrameHierarchyId(RwFrame *frame, uintptr id);
+	static uintptr GetFrameHierarchyId(RwFrame *frame);
 
 	static void *FrameConstructor(void *object, int32 offset, int32 len);
 	static void *FrameDestructor(void *object, int32 offset, int32 len);
diff --git a/src/skel/crossplatform.h b/src/skel/crossplatform.h
index a21877c1..678d3ec4 100644
--- a/src/skel/crossplatform.h
+++ b/src/skel/crossplatform.h
@@ -4,7 +4,7 @@
 // Functions that's different on glfw and win but have same signature, should be located on platform.h.
 
 #ifdef _WIN32
-// This only has <windef.h> as Win header.
+// This only has <windef.h> as Windows header, which is lighter (as long as WITHWINDOWS isn't defined / <Windows.h> isn't included).
 #include "win.h"
 extern DWORD _dwOperatingSystemVersion;
 #else
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 630b3345..47dc9e4c 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -63,7 +63,7 @@ static psGlobalType PsGlobal;
 #undef MAKEPOINTS
 #define MAKEPOINTS(l)		(*((POINTS /*FAR*/ *)&(l)))
 
-unsigned long _dwMemAvailPhys;
+size_t _dwMemAvailPhys;
 RwUInt32 gGameState;
 
 #ifdef _WIN32
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 9795bde9..9fde9d32 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -19,7 +19,12 @@
 
 #pragma warning( push )
 #pragma warning( disable : 4005)
+
+#ifdef USE_D3D9
+#include <d3d9.h>
+#else
 #include <d3d8.h>
+#endif
 #include <ddraw.h>
 #include <dinput.h>
 #include <DShow.h>
@@ -27,7 +32,9 @@
 
 #define WM_GRAPHNOTIFY	WM_USER+13
 
+#ifndef USE_D3D9
 #pragma comment( lib, "d3d8.lib" )
+#endif
 #pragma comment( lib, "ddraw.lib" )
 #pragma comment( lib, "Winmm.lib" )
 #pragma comment( lib, "dxguid.lib" )
@@ -102,7 +109,7 @@ IMediaSeeking *pMS = nil;
 
 DWORD dwDXVersion;
 SIZE_T _dwMemTotalPhys;
-SIZE_T _dwMemAvailPhys;
+size_t _dwMemAvailPhys;
 SIZE_T _dwMemTotalVirtual;
 SIZE_T _dwMemAvailVirtual;
 DWORD _dwMemTotalVideo;
@@ -449,6 +456,16 @@ DWORD GetDXVersion()
 	dwDXVersion = 0x700;
 	pDD7->Release();
 
+#ifdef USE_D3D9
+	HINSTANCE hD3D9DLL = LoadLibrary("D3D9.DLL");
+	if (hD3D9DLL != nil) {
+		FreeLibrary(hDDrawDLL);
+		FreeLibrary(hD3D9DLL);
+
+		dwDXVersion = 0x900;
+		return dwDXVersion;
+	}
+#endif
 
 	//-------------------------------------------------------------------------
 	// DirectX 8.0 Checks
@@ -498,6 +515,7 @@ DWORD GetDXVersion()
 /*
  *****************************************************************************
  */
+#ifndef _WIN64
 static char cpuvendor[16] = "UnknownVendr";
 __declspec(naked)  const char * _psGetCpuVendr()
 {
@@ -571,6 +589,7 @@ void _psPrintCpuInfo()
 	if ( FeaturesEx & 0x80000000 )
 		debug("with 3DNow");
 }
+#endif
 
 /*
  *****************************************************************************
@@ -646,9 +665,9 @@ psInitialize(void)
 	
 	gGameState = GS_START_UP;
 	TRACE("gGameState = GS_START_UP");
-	
+#ifndef _WIN64
 	_psPrintCpuInfo();
-	
+#endif
 	OSVERSIONINFO verInfo;
 	verInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 	
@@ -1284,8 +1303,11 @@ RwBool IsForegroundApp()
 
 UINT GetBestRefreshRate(UINT width, UINT height, UINT depth)
 {
+#ifdef USE_D3D9
+	LPDIRECT3D9 d3d = Direct3DCreate9(D3D_SDK_VERSION);
+#else
 	LPDIRECT3D8 d3d = Direct3DCreate8(D3D_SDK_VERSION);
-	
+#endif
 	ASSERT(d3d != nil);
 	
 	UINT refreshRate = INT_MAX;
@@ -1298,14 +1320,21 @@ UINT GetBestRefreshRate(UINT width, UINT height, UINT depth)
 	else
 		format = D3DFMT_R5G6B5;
 	
+#ifdef USE_D3D9
+	UINT modeCount = d3d->GetAdapterModeCount(GcurSel, format);
+#else
 	UINT modeCount = d3d->GetAdapterModeCount(GcurSel);
-	
+#endif
+
 	for ( UINT i = 0; i < modeCount; i++ )
 	{
 		D3DDISPLAYMODE mode;
 		
+#ifdef USE_D3D9
+		d3d->EnumAdapterModes(GcurSel, format, i, &mode);
+#else
 		d3d->EnumAdapterModes(GcurSel, i, &mode);
-		
+#endif	
 		if ( mode.Width == width && mode.Height == height && mode.Format == format )
 		{
 			if ( mode.RefreshRate == 0 )
@@ -1599,7 +1628,7 @@ CommandLineToArgv(RwChar *cmdLine, RwInt32 *argCount)
 	RwInt32 i, len;
 	RwChar *res, *str, **aptr;
 
-	len = strlen(cmdLine);
+	len = (int)strlen(cmdLine);
 
 	/* 
 	 * Count the number of arguments...
@@ -1687,11 +1716,11 @@ void InitialiseLanguage()
 {
 	WORD primUserLCID	= PRIMARYLANGID(GetSystemDefaultLCID());
 	WORD primSystemLCID = PRIMARYLANGID(GetUserDefaultLCID());
-	WORD primLayout		= PRIMARYLANGID((DWORD)GetKeyboardLayout(0));
+	WORD primLayout		= PRIMARYLANGID((DWORD_PTR)GetKeyboardLayout(0));
 	
 	WORD subUserLCID	= SUBLANGID(GetSystemDefaultLCID());
 	WORD subSystemLCID	= SUBLANGID(GetUserDefaultLCID());
-	WORD subLayout		= SUBLANGID((DWORD)GetKeyboardLayout(0));
+	WORD subLayout		= SUBLANGID((DWORD_PTR)GetKeyboardLayout(0));
 	
 	if (   primUserLCID	  == LANG_GERMAN
 		|| primSystemLCID == LANG_GERMAN
diff --git a/src/skel/win/win.h b/src/skel/win/win.h
index 444e0760..d19c4e0e 100644
--- a/src/skel/win/win.h
+++ b/src/skel/win/win.h
@@ -9,8 +9,12 @@
 #endif /* (!defined(RSREGSETBREAKALLOC)) */
 
 #ifndef _INC_WINDOWS
-#define _X86_
-#include <windef.h>
+	#ifdef _WIN64
+		#define _AMD64_
+	#else
+		#define _X86_
+	#endif
+	#include <windef.h>
 #endif
 
 enum eWinVersion
diff --git a/src/text/Text.cpp b/src/text/Text.cpp
index c9e22a84..1f6cda89 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -23,8 +23,8 @@ CText::Load(void)
 {
 	uint8 *filedata;
 	char filename[32], type[4];
-	int length;
-	int offset, sectlen;
+	intptr_t offset, length;
+	size_t sectlen;
 
 	Unload();
 	filedata = new uint8[0x40000];
@@ -176,12 +176,13 @@ CText::UpperCase(wchar *s)
 
 
 void
-CKeyArray::Load(uint32 length, uint8 *data, int *offset)
+CKeyArray::Load(size_t length, uint8 *data, intptr_t *offset)
 {
-	uint32 i;
+	size_t i;
 	uint8 *rawbytes;
 
-	numEntries = length / sizeof(CKeyEntry);
+	// You can make numEntries size_t if you want to exceed 32-bit boundaries, everything else should be ready.
+	numEntries = (int)(length / sizeof(CKeyEntry));
 	entries = new CKeyEntry[numEntries];
 	rawbytes = (uint8*)entries;
 
@@ -255,12 +256,13 @@ CKeyArray::Search(const char *key)
 
 
 void
-CData::Load(uint32 length, uint8 *data, int *offset)
+CData::Load(size_t length, uint8 *data, intptr_t *offset)
 {
-	uint32 i;
+	size_t i;
 	uint8 *rawbytes;
 
-	numChars = length / sizeof(wchar);
+	// You can make numChars size_t if you want to exceed 32-bit boundaries, everything else should be ready.
+	numChars = (int)(length / sizeof(wchar));
 	chars = new wchar[numChars];
 	rawbytes = (uint8*)chars;
 
diff --git a/src/text/Text.h b/src/text/Text.h
index bd6544d2..4be9b6e6 100644
--- a/src/text/Text.h
+++ b/src/text/Text.h
@@ -26,11 +26,11 @@ class CKeyArray
 {
 public:
 	CKeyEntry *entries;
-	int numEntries;
+	int numEntries;	// You can make this size_t if you want to exceed 32-bit boundaries, everything else should be ready.
 
 	CKeyArray(void) : entries(nil), numEntries(0) {}
 	~CKeyArray(void) { Unload(); }
-	void Load(uint32 length, uint8 *data, int *offset);
+	void Load(size_t length, uint8 *data, intptr_t *offset);
 	void Unload(void);
 	void Update(wchar *chars);
 	CKeyEntry *BinarySearch(const char *key, CKeyEntry *entries, int16 low, int16 high);
@@ -45,11 +45,11 @@ class CData
 {
 public:
 	wchar *chars;
-	int numChars;
+	int numChars; // You can make this size_t if you want to exceed 32-bit boundaries, everything else should be ready.
 
 	CData(void) : chars(nil), numChars(0) {}
 	~CData(void) { Unload(); }
-	void Load(uint32 length, uint8 *data, int *offset);
+	void Load(size_t length, uint8 *data, intptr_t *offset);
 	void Unload(void);
 };
 
diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp
index c4ab75d2..93370a18 100644
--- a/src/weapons/WeaponInfo.cpp
+++ b/src/weapons/WeaponInfo.cpp
@@ -64,7 +64,7 @@ CWeaponInfo::LoadWeaponData(void)
 	CAnimBlendAssociation *animAssoc;
 	AnimationId animId;
 
-	int bp, buflen;
+	size_t bp, buflen;
 	int lp, linelen;
 		
 	CFileMgr::SetDir("DATA");
-- 
cgit v1.2.3


From 7e32c603fc0f9a7ec0f3fc1ab224b3b20c769eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Thu, 23 Jul 2020 00:31:06 +0300
Subject: New math wrappers from miami

---
 src/core/General.h      | 2 +-
 src/core/Radar.cpp      | 6 +++---
 src/math/maths.h        | 2 ++
 src/peds/Ped.cpp        | 2 +-
 src/render/Renderer.cpp | 8 ++++----
 5 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/core/General.h b/src/core/General.h
index 7ffa99de..dde43c0f 100644
--- a/src/core/General.h
+++ b/src/core/General.h
@@ -108,7 +108,7 @@ public:
 		if (angle >= TWOPI)
 			angle -= TWOPI;
 
-		return (int)floorf(angle / DEGTORAD(45.0f));
+		return (int)Floor(angle / DEGTORAD(45.0f));
 	}
 
 	// Unlike usual string comparison functions, these don't care about greater or lesser
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 9406f1bd..05002a3f 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -746,8 +746,8 @@ void CRadar::DrawRadarMap()
 	DrawRadarMask();
 
 	// top left ist (0, 0)
-	int x = floorf((vec2DRadarOrigin.x - RADAR_MIN_X) / RADAR_TILE_SIZE);
-	int y = ceilf((RADAR_NUM_TILES - 1) - (vec2DRadarOrigin.y - RADAR_MIN_Y) / RADAR_TILE_SIZE);
+	int x = Floor((vec2DRadarOrigin.x - RADAR_MIN_X) / RADAR_TILE_SIZE);
+	int y = Ceil((RADAR_NUM_TILES - 1) - (vec2DRadarOrigin.y - RADAR_MIN_Y) / RADAR_TILE_SIZE);
 	StreamRadarSections(x, y);
 
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
@@ -1251,7 +1251,7 @@ void CRadar::Shutdown()
 
 void CRadar::StreamRadarSections(const CVector &posn)
 {
-	StreamRadarSections(floorf((2000.0f + posn.x) / 500.0f), ceilf(7.0f - (2000.0f + posn.y) / 500.0f));
+	StreamRadarSections(Floor((2000.0f + posn.x) / 500.0f), Ceil(7.0f - (2000.0f + posn.y) / 500.0f));
 }
 
 void CRadar::StreamRadarSections(int32 x, int32 y)
diff --git a/src/math/maths.h b/src/math/maths.h
index 51b0ef10..8d68bf64 100644
--- a/src/math/maths.h
+++ b/src/math/maths.h
@@ -15,3 +15,5 @@ inline float Sqrt(float x) { return sqrtf(x); }
 inline float RecipSqrt(float x, float y) { return x/Sqrt(y); }
 inline float RecipSqrt(float x) { return RecipSqrt(1.0f, x); }
 inline float Pow(float x, float y) { return powf(x, y); }
+inline float Floor(float x) { return floorf(x); }
+inline float Ceil(float x) { return ceilf(x); }
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 4d83f5aa..f52b373e 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -9349,7 +9349,7 @@ CPed::ProcessControl(void)
 								m_collidingEntityWhileFleeing = collidingEnt;
 								m_collidingEntityWhileFleeing->RegisterReference((CEntity **) &m_collidingEntityWhileFleeing);
 
-								uint8 currentDir = floorf((PI + m_fRotationCur) / DEGTORAD(45.0f));
+								uint8 currentDir = Floor((PI + m_fRotationCur) / DEGTORAD(45.0f));
 								uint8 nextDir;
 								ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode, currentDir, &nextDir);
 
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index d02ecec5..88d412c9 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -857,9 +857,9 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
 
 	// prestep x1 and x2 to next integer y
 	deltaA = CalcNewDelta(&poly[a1], &poly[a2]);
-	xA = deltaA * (ceilf(poly[a1].y) - poly[a1].y) + poly[a1].x;
+	xA = deltaA * (Ceil(poly[a1].y) - poly[a1].y) + poly[a1].x;
 	deltaB = CalcNewDelta(&poly[b1], &poly[b2]);
-	xB = deltaB * (ceilf(poly[b1].y) - poly[b1].y) + poly[b1].x;
+	xB = deltaB * (Ceil(poly[b1].y) - poly[b1].y) + poly[b1].x;
 
 	if(y != yend){
 		if(deltaB < 0.0f && (int)xB < xstart)
@@ -904,7 +904,7 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
 						xstart = poly[b1].x;
 				}while(y == (int)poly[b2].y);
 				deltaB = CalcNewDelta(&poly[b1], &poly[b2]);
-				xB = deltaB * (ceilf(poly[b1].y) - poly[b1].y) + poly[b1].x;
+				xB = deltaB * (Ceil(poly[b1].y) - poly[b1].y) + poly[b1].x;
 				if(deltaB < 0.0f && (int)xB < xstart)
 					xstart = xB;
 			}
@@ -940,7 +940,7 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
 						xend = poly[a1].x;
 				}while(y == (int)poly[a2].y);
 				deltaA = CalcNewDelta(&poly[a1], &poly[a2]);
-				xA = deltaA * (ceilf(poly[a1].y) - poly[a1].y) + poly[a1].x;
+				xA = deltaA * (Ceil(poly[a1].y) - poly[a1].y) + poly[a1].x;
 				if(deltaA >= 0.0f && (int)xA > xend)
 					xend = xA;
 			}
-- 
cgit v1.2.3


From bcb2b7a534d6ed38c2109bfff253cfd7b3ca0ca1 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Thu, 23 Jul 2020 16:14:26 +0300
Subject: Add ps2 audio paths

---
 src/audio/sampman.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/core/config.h   |  1 +
 src/rw/RwMatFX.cpp  |  6 ++--
 3 files changed, 102 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index 391e884b..8c909af7 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -220,6 +220,103 @@ extern uint32 BankStartOffset[MAX_SAMPLEBANKS];
 
 static char StreamedNameTable[][25]=
 {
+#ifdef PS2_AUDIO
+	"AUDIO\\MUSIC\\HEAD.VB",
+	"AUDIO\\MUSIC\\CLASS.VB",
+	"AUDIO\\MUSIC\\KJAH.VB",
+	"AUDIO\\MUSIC\\RISE.VB",
+	"AUDIO\\MUSIC\\LIPS.VB",
+	"AUDIO\\MUSIC\\GAME.VB",
+	"AUDIO\\MUSIC\\MSX.VB",
+	"AUDIO\\MUSIC\\FLASH.VB",
+	"AUDIO\\MUSIC\\CHAT.VB",
+	"AUDIO\\MUSIC\\HEAD.VB",
+	"AUDIO\\MUSIC\\POLICE.VB",
+	"AUDIO\\MUSIC\\CITY.VB",
+	"AUDIO\\MUSIC\\WATER.VB",
+	"AUDIO\\MUSIC\\COMOPEN.VB",
+	"AUDIO\\MUSIC\\SUBOPEN.VB",
+	"AUDIO\\OTHER\\JB.VB",
+	"AUDIO\\OTHER\\BET.VB",
+	"AUDIO\\LUIGI\\L1_LG.VB",
+	"AUDIO\\LUIGI\\L2_DSB.VB",
+	"AUDIO\\LUIGI\\L3_DM.VB",
+	"AUDIO\\LUIGI\\L4_PAP.VB",
+	"AUDIO\\LUIGI\\L5_TFB.VB",
+	"AUDIO\\JOEY\\J0_DM2.VB",
+	"AUDIO\\JOEY\\J1_LFL.VB",
+	"AUDIO\\JOEY\\J2_KCL.VB",
+	"AUDIO\\JOEY\\J3_VH.VB",
+	"AUDIO\\JOEY\\J4_ETH.VB",
+	"AUDIO\\JOEY\\J5_DST.VB",
+	"AUDIO\\JOEY\\J6_TBJ.VB",
+	"AUDIO\\TONI\\T1_TOL.VB",
+	"AUDIO\\TONI\\T2_TPU.VB",
+	"AUDIO\\TONI\\T3_MAS.VB",
+	"AUDIO\\TONI\\T4_TAT.VB",
+	"AUDIO\\TONI\\T5_BF.VB",
+	"AUDIO\\SAL\\S0_MAS.VB",
+	"AUDIO\\SAL\\S1_PF.VB",
+	"AUDIO\\SAL\\S2_CTG.VB",
+	"AUDIO\\SAL\\S3_RTC.VB",
+	"AUDIO\\SAL\\S5_LRQ.VB",
+	"AUDIO\\EBALL\\S4_BDBA.VB",
+	"AUDIO\\EBALL\\S4_BDBB.VB",
+	"AUDIO\\SAL\\S2_CTG2.VB",
+	"AUDIO\\SAL\\S4_BDBD.VB",
+	"AUDIO\\SAL\\S5_LRQB.VB",
+	"AUDIO\\SAL\\S5_LRQC.VB",
+	"AUDIO\\ASUKA\\A1_SSO.VB",
+	"AUDIO\\ASUKA\\A2_PP.VB",
+	"AUDIO\\ASUKA\\A3_SS.VB",
+	"AUDIO\\ASUKA\\A4_PDR.VB",
+	"AUDIO\\ASUKA\\A5_K2FT.VB",
+	"AUDIO\\KENJI\\K1_KBO.VB",
+	"AUDIO\\KENJI\\K2_GIS.VB",
+	"AUDIO\\KENJI\\K3_DS.VB",
+	"AUDIO\\KENJI\\K4_SHI.VB",
+	"AUDIO\\KENJI\\K5_SD.VB",
+	"AUDIO\\RAY\\R0_PDR2.VB",
+	"AUDIO\\RAY\\R1_SW.VB",
+	"AUDIO\\RAY\\R2_AP.VB",
+	"AUDIO\\RAY\\R3_ED.VB",
+	"AUDIO\\RAY\\R4_GF.VB",
+	"AUDIO\\RAY\\R5_PB.VB",
+	"AUDIO\\RAY\\R6_MM.VB",
+	"AUDIO\\LOVE\\D1_STOG.VB",
+	"AUDIO\\LOVE\\D2_KK.VB",
+	"AUDIO\\LOVE\\D3_ADO.VB",
+	"AUDIO\\LOVE\\D5_ES.VB",
+	"AUDIO\\LOVE\\D7_MLD.VB",
+	"AUDIO\\LOVE\\D4_GTA.VB",
+	"AUDIO\\LOVE\\D4_GTA2.VB",
+	"AUDIO\\LOVE\\D6_STS.VB",
+	"AUDIO\\ASUKA\\A6_BAIT.VB",
+	"AUDIO\\ASUKA\\A7_ETG.VB",
+	"AUDIO\\ASUKA\\A8_PS.VB",
+	"AUDIO\\ASUKA\\A9_ASD.VB",
+	"AUDIO\\SHOP\\K4_SHI2.VB",
+	"AUDIO\\OTHER\\C1_TEX.VB",
+	"AUDIO\\PHONE\\EL_PH1.VB",
+	"AUDIO\\PHONE\\EL_PH2.VB",
+	"AUDIO\\PHONE\\EL_PH3.VB",
+	"AUDIO\\PHONE\\EL_PH4.VB",
+	"AUDIO\\PHONE\\YD_PH1.VB",
+	"AUDIO\\PHONE\\YD_PH2.VB",
+	"AUDIO\\PHONE\\YD_PH3.VB",
+	"AUDIO\\PHONE\\YD_PH4.VB",
+	"AUDIO\\PHONE\\HD_PH1.VB",
+	"AUDIO\\PHONE\\HD_PH2.VB",
+	"AUDIO\\PHONE\\HD_PH3.VB",
+	"AUDIO\\PHONE\\HD_PH4.VB",
+	"AUDIO\\PHONE\\HD_PH5.VB",
+	"AUDIO\\PHONE\\MT_PH1.VB",
+	"AUDIO\\PHONE\\MT_PH2.VB",
+	"AUDIO\\PHONE\\MT_PH3.VB",
+	"AUDIO\\PHONE\\MT_PH4.VB",
+	"AUDIO\\MUSIC\\MISCOM.VB",
+	"AUDIO\\MUSIC\\END.VB",
+#else
 	"AUDIO\\HEAD.WAV",
 	"AUDIO\\CLASS.WAV",
 	"AUDIO\\KJAH.WAV",
@@ -315,6 +412,7 @@ static char StreamedNameTable[][25]=
 	"AUDIO\\MT_PH4.MP3",
 	"AUDIO\\MISCOM.WAV",
 	"AUDIO\\END.MP3",
+#endif
 	"AUDIO\\lib_a1.WAV",
 	"AUDIO\\lib_a2.WAV",
 	"AUDIO\\lib_a.WAV",
diff --git a/src/core/config.h b/src/core/config.h
index 9dd25064..2f11a84b 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -278,3 +278,4 @@ enum Config {
 
 // Audio
 #define AUDIO_CACHE // cache sound lengths to speed up the cold boot
+//#define PS2_AUDIO   // changes audio paths for cutscenes and radio to PS2 paths, needs vbdec to support VB with MSS
\ No newline at end of file
diff --git a/src/rw/RwMatFX.cpp b/src/rw/RwMatFX.cpp
index 3533eb24..a128ff1a 100644
--- a/src/rw/RwMatFX.cpp
+++ b/src/rw/RwMatFX.cpp
@@ -51,9 +51,9 @@ extern "C" {
 	extern int MatFXAtomicDataOffset;
 
 	void _rpMatFXD3D8AtomicMatFXEnvRender(RxD3D8InstanceData* inst, int flags, int sel, RwTexture* texture, RwTexture* envMap);
-    void _rpMatFXD3D8AtomicMatFXRenderBlack(RxD3D8InstanceData *inst);
-    void _rpMatFXD3D8AtomicMatFXBumpMapRender(RxD3D8InstanceData *inst, int flags, RwTexture *texture, RwTexture *bumpMap, RwTexture *envMap);
-    void _rpMatFXD3D8AtomicMatFXDualPassRender(RxD3D8InstanceData *inst, int flags, RwTexture *texture, RwTexture *dualTexture);
+	void _rpMatFXD3D8AtomicMatFXRenderBlack(RxD3D8InstanceData *inst);
+	void _rpMatFXD3D8AtomicMatFXBumpMapRender(RxD3D8InstanceData *inst, int flags, RwTexture *texture, RwTexture *bumpMap, RwTexture *envMap);
+	void _rpMatFXD3D8AtomicMatFXDualPassRender(RxD3D8InstanceData *inst, int flags, RwTexture *texture, RwTexture *dualTexture);
 }
 
 
-- 
cgit v1.2.3


From 15918feb8eca09c38d7a40d67cca10cecc4affdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Fri, 24 Jul 2020 20:43:51 +0300
Subject: 90% fixes, 10% skel refactoring

---
 src/control/Garages.cpp  |  3 +++
 src/core/Pad.cpp         | 18 ++++++++++++++++--
 src/core/Streaming.cpp   | 12 ++----------
 src/skel/crossplatform.h | 30 +++++++++++++++++++++++-------
 src/skel/glfw/glfw.cpp   | 13 +++++++++++--
 src/skel/platform.h      |  4 ++++
 src/skel/win/win.h       | 25 ++-----------------------
 src/vehicles/CarGen.cpp  |  9 +++++++--
 8 files changed, 68 insertions(+), 46 deletions(-)

(limited to 'src')

diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index 2b7c31c8..33675ecf 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -141,6 +141,9 @@ void CGarages::Init(void)
 	MessageStartTime = 0;
 	PlayerInGarage = false;
 	BombsAreFree = false;
+#ifdef FIX_BUGS
+	RespraysAreFree = false;
+#endif
 	CarsCollected = 0;
 	BankVansCollected = 0;
 	PoliceCarsCollected = 0;
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 944d7b2c..7df548aa 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -8,6 +8,7 @@
 
 #include "common.h"
 #include "crossplatform.h"
+#include "platform.h"
 #ifdef XINPUT
 #include <xinput.h>
 #pragma comment( lib, "Xinput9_1_0.lib" )
@@ -544,9 +545,9 @@ CMouseControllerState CMousePointerStateHelper::GetMouseSetUp()
 
 void CPad::UpdateMouse()
 {
+#if defined RW_D3D9 || defined RWLIBS
 	if ( IsForegroundApp() )
 	{
-#if defined RW_D3D9 || defined RWLIBS
 		if ( PSGLOBAL(mouse) == nil )
 			_InputInitialiseMouse();
 
@@ -583,7 +584,10 @@ void CPad::UpdateMouse()
 			OldMouseControllerState = NewMouseControllerState;
 			NewMouseControllerState = PCTempMouseControllerState;
 		}
+	}
 #else
+	if ( IsForegroundApp() && PSGLOBAL(cursorIsInWindow) )
+	{
 		double xpos = 1.0f, ypos;
 		glfwGetCursorPos(PSGLOBAL(window), &xpos, &ypos);
 		if (xpos == 0.f)
@@ -621,8 +625,8 @@ void CPad::UpdateMouse()
 
 		OldMouseControllerState = NewMouseControllerState;
 		NewMouseControllerState = PCTempMouseControllerState;
-#endif
 	}
+#endif
 }
 
 CControllerState CPad::ReconcileTwoControllersInput(CControllerState const &State1, CControllerState const &State2)
@@ -1072,6 +1076,13 @@ void CPad::UpdatePads(void)
 #else
 	CapturePad(0);
 #endif
+
+	// Improve keyboard input latency part 1
+#ifdef FIX_BUGS
+	OldKeyState = NewKeyState;
+	NewKeyState = TempKeyState;
+#endif
+
 #ifdef DETECT_PAD_INPUT_SWITCH
 	if (GetPad(0)->PCTempJoyState.CheckForInput())
 		IsAffectedByController = true;
@@ -1101,8 +1112,11 @@ void CPad::UpdatePads(void)
 	GetPad(1)->OldState.Clear();
 #endif
 
+	// Improve keyboard input latency part 2
+#ifndef FIX_BUGS
 	OldKeyState = NewKeyState;
 	NewKeyState = TempKeyState;
+#endif
 }
 
 void CPad::ProcessPCSpecificStuff(void)
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 6b652a6a..40189844 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -210,11 +210,7 @@ CStreaming::Init2(void)
 	desiredNumVehiclesLoaded = (int32)((ms_memoryAvailable / MB - 50) / 3 + 12);
 	if(desiredNumVehiclesLoaded > MAXVEHICLESLOADED)
 		desiredNumVehiclesLoaded = MAXVEHICLESLOADED;
-#if defined(__LP64__) || defined(_WIN64)
-	debug("Memory allocated to Streaming is %lluMB", ms_memoryAvailable/MB);
-#else
-	debug("Memory allocated to Streaming is %dMB", ms_memoryAvailable/MB);
-#endif
+	debug("Memory allocated to Streaming is %zuMB", ms_memoryAvailable/MB); // original modifier was %d
 #undef MB
 #endif
 
@@ -2497,11 +2493,7 @@ CStreaming::UpdateForAnimViewer(void)
 	if (CStreaming::ms_channelError == -1) {
 		CStreaming::AddModelsToRequestList(CVector(0.0f, 0.0f, 0.0f));
 		CStreaming::LoadRequestedModels();
-#if defined(__LP64__) || defined(_WIN64)
-		sprintf(gString, "Requested %d, memory size %lluK\n", CStreaming::ms_numModelsRequested, 2 * CStreaming::ms_memoryUsed);
-#else
-		sprintf(gString, "Requested %d, memory size %dK\n", CStreaming::ms_numModelsRequested, 2 * CStreaming::ms_memoryUsed);
-#endif
+		sprintf(gString, "Requested %d, memory size %zuK\n", CStreaming::ms_numModelsRequested, 2 * CStreaming::ms_memoryUsed); // original modifier was %d
 	}
 	else {
 		CStreaming::RetryLoadFile(CStreaming::ms_channelError);
diff --git a/src/skel/crossplatform.h b/src/skel/crossplatform.h
index 678d3ec4..066570be 100644
--- a/src/skel/crossplatform.h
+++ b/src/skel/crossplatform.h
@@ -3,19 +3,34 @@
 // This is the common include for platform/renderer specific skeletons(glfw.cpp, win.cpp etc.) and using cross platform things (like Windows directories wrapper, platform specific global arrays etc.) 
 // Functions that's different on glfw and win but have same signature, should be located on platform.h.
 
+enum eWinVersion
+{
+    OS_WIN95 = 0,
+    OS_WIN98,
+    OS_WINNT,
+    OS_WIN2000,
+    OS_WINXP,
+};
+
 #ifdef _WIN32
-// This only has <windef.h> as Windows header, which is lighter (as long as WITHWINDOWS isn't defined / <Windows.h> isn't included).
+
+// As long as WITHWINDOWS isn't defined / <Windows.h> isn't included, include <windef.h>, which is lighter.
+#ifndef _INC_WINDOWS
+    #ifdef _WIN64
+        #define _ARM64_
+    #else
+        #define _X86_
+    #endif
+    #include <windef.h>
+#endif
+#if defined RW_D3D9 || defined RWLIBS
 #include "win.h"
+#endif
 extern DWORD _dwOperatingSystemVersion;
+
 #else
 char *strupr(char *str);
 char *strlwr(char *str);
-enum {
-	OS_WIN98,
-	OS_WIN2000,
-	OS_WINNT,
-	OS_WINXP,
-};
 
 enum {
 	LANG_OTHER,
@@ -42,6 +57,7 @@ typedef struct
     RwBool		fullScreen;
     RwV2d		lastMousePos;
     double      mouseWheel; // glfw doesn't cache it
+    bool        cursorIsInWindow;
     RwInt8        joy1id;
     RwInt8        joy2id;
 }
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 47dc9e4c..a1170c61 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -278,6 +278,7 @@ psInitialize(void)
 	RsGlobal.ps = &PsGlobal;
 	
 	PsGlobal.fullScreen = FALSE;
+	PsGlobal.cursorIsInWindow = TRUE;
 	
 	PsGlobal.joy1id	= -1;
 	PsGlobal.joy2id	= -1;
@@ -786,6 +787,7 @@ void keypressCB(GLFWwindow* window, int key, int scancode, int action, int mods)
 void resizeCB(GLFWwindow* window, int width, int height);
 void scrollCB(GLFWwindow* window, double xoffset, double yoffset);
 void cursorCB(GLFWwindow* window, double xpos, double ypos);
+void cursorEnterCB(GLFWwindow* window, int entered);
 void joysChangeCB(int jid, int event);
 
 bool IsThisJoystickBlacklisted(int i)
@@ -821,9 +823,10 @@ void _InputInitialiseJoys()
 	}
 }
 
-void _InputInitialiseMouse()
+long _InputInitialiseMouse()
 {
 	glfwSetInputMode(PSGLOBAL(window), GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
+	return 0;
 }
 
 void psPostRWinit(void)
@@ -835,6 +838,7 @@ void psPostRWinit(void)
 	glfwSetWindowSizeCallback(PSGLOBAL(window), resizeCB);
 	glfwSetScrollCallback(PSGLOBAL(window), scrollCB);
 	glfwSetCursorPosCallback(PSGLOBAL(window), cursorCB);
+	glfwSetCursorEnterCallback(PSGLOBAL(window), cursorEnterCB);
 	glfwSetJoystickCallback(joysChangeCB);
 
 	_InputInitialiseJoys();
@@ -1340,13 +1344,18 @@ _InputTranslateShiftKeyUpDown(RsKeyCodes *rs) {
 	RsKeyboardEventHandler(rshiftStatus ? rsKEYDOWN : rsKEYUP, &(*rs = rsRSHIFT));
 }
 
-// TODO this only works in frontend(and luckily only frontend use this), maybe because of glfw knows that mouse pos is > 32000 in game??
+// TODO this only works in frontend(and luckily only frontend use this). Fun fact: if I get pos manually in game, glfw reports that it's > 32000
 void
 cursorCB(GLFWwindow* window, double xpos, double ypos) {
 	FrontEndMenuManager.m_nMouseTempPosX = xpos;
 	FrontEndMenuManager.m_nMouseTempPosY = ypos;
 }
 
+void
+cursorEnterCB(GLFWwindow* window, int entered) {
+	PSGLOBAL(cursorIsInWindow) = !!entered;
+}
+
 /*
  *****************************************************************************
  */
diff --git a/src/skel/platform.h b/src/skel/platform.h
index cbb1be28..0f314b9d 100644
--- a/src/skel/platform.h
+++ b/src/skel/platform.h
@@ -1,6 +1,8 @@
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
+// Functions that's different on glfw/win etc. but have same signature (but if a function only used in win.cpp you can keep in win.h)
+
 #include "rwcore.h"
 #include "skeleton.h"
 
@@ -35,6 +37,8 @@ extern RwBool psInstallFileSystem(void);
 extern RwBool psNativeTextureSupport(void);
 
 extern void _InputTranslateShiftKeyUpDown(RsKeyCodes* rs);
+extern long _InputInitialiseMouse(); // returns HRESULT on Windows actually
+extern void _InputInitialiseJoys();
 
 extern void HandleExit();
 
diff --git a/src/skel/win/win.h b/src/skel/win/win.h
index d19c4e0e..4b2001f8 100644
--- a/src/skel/win/win.h
+++ b/src/skel/win/win.h
@@ -1,5 +1,5 @@
 
-// DON'T include directly. crossplatform.h includes this if you're on Windows.
+// DON'T include directly. crossplatform.h includes this if you're using D3D9 backend(win.cpp).
 
 #if (!defined(_PLATFORM_WIN_H))
 #define _PLATFORM_WIN_H
@@ -8,25 +8,6 @@
 #define RSREGSETBREAKALLOC(_name) /* No op */
 #endif /* (!defined(RSREGSETBREAKALLOC)) */
 
-#ifndef _INC_WINDOWS
-	#ifdef _WIN64
-		#define _AMD64_
-	#else
-		#define _X86_
-	#endif
-	#include <windef.h>
-#endif
-
-enum eWinVersion
-{
-	OS_WIN95 = 0,
-	OS_WIN98,
-	OS_WINNT,
-	OS_WIN2000,
-	OS_WINXP,
-};
-
-
 #ifdef __DINPUT_INCLUDED__
 /* platform specfic global data */
 typedef struct
@@ -87,14 +68,12 @@ extern "C"
 {
 #endif                          /* __cplusplus */
 
-#ifdef __DINPUT_INCLUDED__
 extern LRESULT      CALLBACK
 MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
 
+#ifdef __DINPUT_INCLUDED__
 HRESULT _InputInitialise();
-HRESULT _InputInitialiseMouse();
 HRESULT CapturePad(RwInt32 padID);
-void _InputInitialiseJoys();
 void _InputAddJoyStick(LPDIRECTINPUTDEVICE8 lpDevice, INT num);
 HRESULT _InputAddJoys();
 HRESULT _InputGetMouseState(DIMOUSESTATE2 *state);
diff --git a/src/vehicles/CarGen.cpp b/src/vehicles/CarGen.cpp
index cb21b918..dd727e2b 100644
--- a/src/vehicles/CarGen.cpp
+++ b/src/vehicles/CarGen.cpp
@@ -28,7 +28,7 @@ void CCarGenerator::SwitchOff()
 
 void CCarGenerator::SwitchOn()
 {
-	m_nUsesRemaining = -1;
+	m_nUsesRemaining = 255;
 	m_nTimer = CalcNextGen();
 	++CTheCarGenerators::CurrentActiveCount;
 }
@@ -110,8 +110,13 @@ void CCarGenerator::DoInternalProcessing()
 			m_nVehicleHandle = CPools::GetVehiclePool()->GetIndex(pCar);
 		}
 	}
-	if (m_nUsesRemaining < -1) /* I don't think this is a correct comparasion */
+#ifdef FIX_BUGS
+	if (m_nUsesRemaining != 0)
 		--m_nUsesRemaining;
+#else
+	if (m_nUsesRemaining < -1)
+		--m_nUsesRemaining;
+#endif
 	m_nTimer = CalcNextGen();
 	if (m_nUsesRemaining == 0)
 		--CTheCarGenerators::CurrentActiveCount;
-- 
cgit v1.2.3


From b5b64ca35127043014dad742c79d61a11c64f78a Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Fri, 24 Jul 2020 23:28:55 +0200
Subject: fixed hanim for 64 bit

---
 src/animation/AnimBlendClumpData.h |  2 +-
 src/animation/FrameUpdate.cpp      |  6 +++---
 src/animation/RpAnimBlend.cpp      |  2 +-
 src/core/common.h                  |  1 +
 src/entities/Entity.cpp            |  2 +-
 src/fakerw/rphanim.h               | 12 ++++++++++--
 6 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/animation/AnimBlendClumpData.h b/src/animation/AnimBlendClumpData.h
index 5c511ab8..fc74b42d 100644
--- a/src/animation/AnimBlendClumpData.h
+++ b/src/animation/AnimBlendClumpData.h
@@ -18,7 +18,7 @@ struct AnimBlendFrameData
 #ifdef PED_SKIN
 	union {
 		RwFrame *frame;
-		RpHAnimStdKeyFrame *hanimFrame;
+		RpHAnimStdInterpFrame *hanimFrame;
 	};
 	int32 nodeID;
 #else
diff --git a/src/animation/FrameUpdate.cpp b/src/animation/FrameUpdate.cpp
index a3a2013a..6e5501cb 100644
--- a/src/animation/FrameUpdate.cpp
+++ b/src/animation/FrameUpdate.cpp
@@ -236,7 +236,7 @@ FrameUpdateCallBackSkinned(AnimBlendFrameData *frame, void *arg)
 	CVector vec, pos(0.0f, 0.0f, 0.0f);
 	CQuaternion q, rot(0.0f, 0.0f, 0.0f, 0.0f);
 	float totalBlendAmount = 0.0f;
-	RpHAnimStdKeyFrame *xform = frame->hanimFrame;
+	RpHAnimStdInterpFrame *xform = frame->hanimFrame;
 	CAnimBlendNode **node;
 	AnimBlendFrameUpdateData *updateData = (AnimBlendFrameUpdateData*)arg;
 
@@ -297,7 +297,7 @@ FrameUpdateCallBackWithVelocityExtractionSkinned(AnimBlendFrameData *frame, void
 	float curx = 0.0f, cury = 0.0f;
 	float endx = 0.0f, endy = 0.0f;
 	bool looped = false;
-	RpHAnimStdKeyFrame *xform = frame->hanimFrame;
+	RpHAnimStdInterpFrame *xform = frame->hanimFrame;
 	CAnimBlendNode **node;
 	AnimBlendFrameUpdateData *updateData = (AnimBlendFrameUpdateData*)arg;
 
@@ -383,7 +383,7 @@ FrameUpdateCallBackWith3dVelocityExtractionSkinned(AnimBlendFrameData *frame, vo
 	CVector cur(0.0f, 0.0f, 0.0f);
 	CVector end(0.0f, 0.0f, 0.0f);
 	bool looped = false;
-	RpHAnimStdKeyFrame *xform = frame->hanimFrame;
+	RpHAnimStdInterpFrame *xform = frame->hanimFrame;
 	CAnimBlendNode **node;
 	AnimBlendFrameUpdateData *updateData = (AnimBlendFrameUpdateData*)arg;
 
diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp
index be70ad66..dcb656ee 100644
--- a/src/animation/RpAnimBlend.cpp
+++ b/src/animation/RpAnimBlend.cpp
@@ -170,7 +170,7 @@ RpAnimBlendClumpInitSkinned(RpClump *clump)
 	for(i = 0; i < numBones; i++){
 		frames[i].nodeID = HIERNODEID(hier, i);
 		frames[i].resetPos = boneTab[i];
-		frames[i].hanimFrame = (RpHAnimStdKeyFrame*)rpHANIMHIERARCHYGETINTERPFRAME(hier, i);
+		frames[i].hanimFrame = (RpHAnimStdInterpFrame*)rpHANIMHIERARCHYGETINTERPFRAME(hier, i);
 	}
 	clumpData->ForAllFrames(FrameInitCBskin, nil);
 	clumpData->frames[0].flag |= AnimBlendFrameData::VELOCITY_EXTRACTION;
diff --git a/src/core/common.h b/src/core/common.h
index 17a186d0..ebb3acb0 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -41,6 +41,7 @@
 #define HIERNODEINFO(hier) ((hier)->pNodeInfo)
 #define HIERNODEID(hier, i) ((hier)->pNodeInfo[i].nodeID)
 #define HANIMFRAME(anim, i) ((RwUInt8*)(anim)->pFrames + (i)*(anim)->interpInfo->keyFrameSize)
+#define RpHAnimStdInterpFrame RpHAnimStdKeyFrame
 #endif
 
 #ifdef RWHALFPIXEL
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 0319c7ea..5e3204b2 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -579,7 +579,7 @@ CEntity::UpdateRpHAnim(void)
 	char buf[256];
 	if(this == (CEntity*)FindPlayerPed())
 	for(i = 0; i < hier->numNodes; i++){
-		RpHAnimStdKeyFrame *kf = (RpHAnimStdKeyFrame*)rpHANIMHIERARCHYGETINTERPFRAME(hier, i);
+		RpHAnimStdInterpFrame *kf = (RpHAnimStdInterpFrame*)rpHANIMHIERARCHYGETINTERPFRAME(hier, i);
 		sprintf(buf, "%6.3f %6.3f %6.3f %6.3f  %6.3f %6.3f %6.3f  %d %s",
 			kf->q.imag.x, kf->q.imag.y, kf->q.imag.z, kf->q.real,
 			kf->t.x, kf->t.y, kf->t.z,
diff --git a/src/fakerw/rphanim.h b/src/fakerw/rphanim.h
index 6ece8306..63059800 100644
--- a/src/fakerw/rphanim.h
+++ b/src/fakerw/rphanim.h
@@ -17,7 +17,15 @@ struct RpHAnimStdKeyFrame
 	RtQuat           q;
 	RwV3d            t;
 };
-
+// same story, this one only exists in later RW versions
+// but we need it for 64 bit builds because offset and size differs!
+struct RpHAnimStdInterpFrame
+{
+	RpHAnimStdKeyFrame *keyFrame1;
+	RpHAnimStdKeyFrame *keyFrame2;
+	RtQuat           q;
+	RwV3d            t;
+};
 
 enum RpHAnimHierarchyFlag
 {
@@ -56,7 +64,7 @@ RwBool RpHAnimHierarchyUpdateMatrices(RpHAnimHierarchy *hierarchy);
 #define rpHANIMHIERARCHYGETINTERPFRAME( hierarchy, nodeIndex )    \
         ( (void *)( ( (RwUInt8 *)&(hierarchy->interpolator[1]) +                \
                       ((nodeIndex) *                               \
-                       hierarchy->interpolator->currentAnimKeyFrameSize) ) ) )
+                       hierarchy->interpolator->currentInterpKeyFrameSize) ) ) )
 
 
 RpHAnimAnimation *RpHAnimAnimationCreate(RwInt32 typeID, RwInt32 numFrames, RwInt32 flags, RwReal duration);
-- 
cgit v1.2.3


From 199d57b16c80e51ace23e1640a1c92c3ebca0314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Sat, 25 Jul 2020 15:13:27 +0300
Subject: Fix/change some Windows define

---
 src/core/Game.cpp        |  2 +-
 src/skel/crossplatform.h | 10 +++------
 src/skel/win/win.cpp     | 56 ++++++++++++++++++++++++------------------------
 src/skel/win/win.h       |  3 ---
 4 files changed, 32 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index f6275133..0d839dfa 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -365,7 +365,7 @@ bool CGame::Initialise(const char* datFile)
 	CStreaming::LoadInitialPeds();
 	CStreaming::RequestBigBuildings(LEVEL_GENERIC);
 	CStreaming::LoadAllRequestedModels(false);
-	printf("Streaming uses %dK of its memory", CStreaming::ms_memoryUsed / 1024);
+	printf("Streaming uses %zuK of its memory", CStreaming::ms_memoryUsed / 1024); // original modifier was %d
 	LoadingScreen("Loading the Game", "Load animations", GetRandomSplashScreen());
 	CAnimManager::LoadAnimFiles();
 	CPed::Initialise();
diff --git a/src/skel/crossplatform.h b/src/skel/crossplatform.h
index 066570be..268eedff 100644
--- a/src/skel/crossplatform.h
+++ b/src/skel/crossplatform.h
@@ -14,14 +14,10 @@ enum eWinVersion
 
 #ifdef _WIN32
 
-// As long as WITHWINDOWS isn't defined / <Windows.h> isn't included, include <windef.h>, which is lighter.
+// As long as WITHWINDOWS isn't defined / <Windows.h> isn't included, we only need type definitions so let's include <IntSafe.h>.
+// NOTE: It's perfectly fine to include <Windows.h> here, but it can increase build size and time in *some* conditions, and maybe substantially in future if we'll use crossplatform.h more.
 #ifndef _INC_WINDOWS
-    #ifdef _WIN64
-        #define _ARM64_
-    #else
-        #define _X86_
-    #endif
-    #include <windef.h>
+    #include <IntSafe.h>
 #endif
 #if defined RW_D3D9 || defined RWLIBS
 #include "win.h"
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 9fde9d32..5c5c7ece 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -309,34 +309,6 @@ psNativeTextureSupport(void)
 	return RwD3D8DeviceSupportsDXTTexture();
 }
 
-/*
- *****************************************************************************
- */
-static BOOL
-InitApplication(HANDLE instance)
-{
-	/*
-	 * Perform any necessary MS Windows application initialization. Basically,
-	 * this means registering the window class for this application.
-	 */
-
-	WNDCLASS windowClass;
-
-	windowClass.style = CS_BYTEALIGNWINDOW;
-	windowClass.lpfnWndProc = (WNDPROC) MainWndProc;
-	windowClass.cbClsExtra = 0;
-	windowClass.cbWndExtra = 0;
-	windowClass.hInstance = (HINSTANCE)instance;
-	windowClass.hIcon = nil;
-	windowClass.hCursor = LoadCursor(nil, IDC_ARROW);
-	windowClass.hbrBackground = nil;
-	windowClass.lpszMenuName = NULL;
-	windowClass.lpszClassName = AppClassName;
-
-	return RegisterClass(&windowClass);
-}
-
-
 /*
  *****************************************************************************
  */
@@ -1292,6 +1264,34 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
 }
 
 
+/*
+ *****************************************************************************
+ */
+static BOOL
+InitApplication(HANDLE instance)
+{
+	/*
+	 * Perform any necessary MS Windows application initialization. Basically,
+	 * this means registering the window class for this application.
+	 */
+
+	WNDCLASS windowClass;
+
+	windowClass.style = CS_BYTEALIGNWINDOW;
+	windowClass.lpfnWndProc = (WNDPROC)MainWndProc;
+	windowClass.cbClsExtra = 0;
+	windowClass.cbWndExtra = 0;
+	windowClass.hInstance = (HINSTANCE)instance;
+	windowClass.hIcon = nil;
+	windowClass.hCursor = LoadCursor(nil, IDC_ARROW);
+	windowClass.hbrBackground = nil;
+	windowClass.lpszMenuName = NULL;
+	windowClass.lpszClassName = AppClassName;
+
+	return RegisterClass(&windowClass);
+}
+
+
 /*
  *****************************************************************************
  */
diff --git a/src/skel/win/win.h b/src/skel/win/win.h
index 4b2001f8..be840898 100644
--- a/src/skel/win/win.h
+++ b/src/skel/win/win.h
@@ -68,9 +68,6 @@ extern "C"
 {
 #endif                          /* __cplusplus */
 
-extern LRESULT      CALLBACK
-MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
-
 #ifdef __DINPUT_INCLUDED__
 HRESULT _InputInitialise();
 HRESULT CapturePad(RwInt32 padID);
-- 
cgit v1.2.3


From 3856b932dd068384e28cf6c6c813199e322211bb Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sat, 25 Jul 2020 20:25:34 +0200
Subject: Disable cache for openal for now

---
 src/core/config.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/core/config.h b/src/core/config.h
index 2f11a84b..04d54831 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -277,5 +277,7 @@ enum Config {
 #define FREE_CAM		// Rotating cam
 
 // Audio
+#ifndef AUDIO_OAL // is not working yet for openal
 #define AUDIO_CACHE // cache sound lengths to speed up the cold boot
+#endif
 //#define PS2_AUDIO   // changes audio paths for cutscenes and radio to PS2 paths, needs vbdec to support VB with MSS
\ No newline at end of file
-- 
cgit v1.2.3


From b0414c84b9f6afb90626cf8088d7162d27b3bf4f Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sat, 25 Jul 2020 22:04:59 +0200
Subject: Small fixes for linux build

---
 src/fakerw/fake.cpp              | 23 +++++++++++++++++------
 src/modelinfo/VehicleModelInfo.h |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index ef5f361f..457a6b51 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -855,12 +855,23 @@ RpSkin *RpSkinGeometryGetSkin( RpGeometry *geometry ) { return Skin::get(geometr
 RpAtomic *RpSkinAtomicSetHAnimHierarchy( RpAtomic *atomic, RpHAnimHierarchy *hierarchy ) { Skin::setHierarchy(atomic, hierarchy); return atomic; }
 RpHAnimHierarchy *RpSkinAtomicGetHAnimHierarchy( const RpAtomic *atomic ) { return Skin::getHierarchy(atomic); }
 
-
-
-
-
-RwImage *RtBMPImageWrite(RwImage * image, const RwChar * imageName) { rw::writeBMP(image, imageName); return image; }
-RwImage *RtBMPImageRead(const RwChar * imageName) { return rw::readBMP(imageName); }
+RwImage *
+RtBMPImageWrite(RwImage *image, const RwChar *imageName)
+{
+	char *r = (char *)alloca(strlen((char *)imageName) + 2);
+	// Use default path(and pass error handling to librw) if we can't find any match
+	if(!casepath((char *)imageName, r)) r = (char *)imageName;
+	rw::writeBMP(image, r);
+	return image;
+}
+RwImage *
+RtBMPImageRead(const RwChar *imageName)
+{
+	char *r = (char *)alloca(strlen((char *)imageName) + 2);
+	// Use default path(and pass error handling to librw) if we can't find any match
+	if(!casepath((char *)imageName, r)) r = (char *)imageName;
+	return rw::readBMP(r);
+}
 
 #include "rtquat.h"
 
diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h
index 468ce96d..e6ba576d 100644
--- a/src/modelinfo/VehicleModelInfo.h
+++ b/src/modelinfo/VehicleModelInfo.h
@@ -137,7 +137,7 @@ public:
 	void SetVehicleComponentFlags(RwFrame *frame, uint32 flags);
 	void PreprocessHierarchy(void);
 	void GetWheelPosn(int32 n, CVector &pos);
-	CVector &GetFrontSeatPosn(void) { return m_positions[m_vehicleType == VEHICLE_TYPE_BOAT ? BOAT_POS_FRONTSEAT : CAR_POS_FRONTSEAT]; };
+	const CVector &GetFrontSeatPosn(void) { return m_vehicleType == VEHICLE_TYPE_BOAT ? m_positions[BOAT_POS_FRONTSEAT] : m_positions[CAR_POS_FRONTSEAT]; }
 
 	int32 ChooseComponent(void);
 	int32 ChooseSecondComponent(void);
-- 
cgit v1.2.3


From 40c09d28f7491d158a8b8a81806d4b84cdf0e031 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sat, 25 Jul 2020 22:38:42 +0200
Subject: fix windows build, don't use crossplatform

---
 src/fakerw/fake.cpp | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index 457a6b51..6524e87c 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -858,19 +858,37 @@ RpHAnimHierarchy *RpSkinAtomicGetHAnimHierarchy( const RpAtomic *atomic ) { retu
 RwImage *
 RtBMPImageWrite(RwImage *image, const RwChar *imageName)
 {
-	char *r = (char *)alloca(strlen((char *)imageName) + 2);
-	// Use default path(and pass error handling to librw) if we can't find any match
-	if(!casepath((char *)imageName, r)) r = (char *)imageName;
+#ifndef _WIN32
+	char *r = nil;
+	FILE *valid = fopen((char *)imageName, "r");
+	if(!valid) {
+		char *r = (char *)alloca(strlen((char *)imageName) + 2);
+		// Use default path(and pass error handling to librw) if we can't find any match
+		if(!casepath((char *)imageName, r)) r = (char *)imageName;
+	} else
+		fclose(valid);
 	rw::writeBMP(image, r);
+#else
+	rw::writeBMP(image, imageName);
+#endif
 	return image;
 }
 RwImage *
 RtBMPImageRead(const RwChar *imageName)
 {
-	char *r = (char *)alloca(strlen((char *)imageName) + 2);
-	// Use default path(and pass error handling to librw) if we can't find any match
-	if(!casepath((char *)imageName, r)) r = (char *)imageName;
+#ifndef _WIN32
+	char *r = nil;
+	FILE *valid = fopen((char *)imageName, "r");
+	if(!valid) {
+		r = (char *)alloca(strlen((char *)imageName) + 2);
+		// Use default path(and pass error handling to librw) if we can't find any match
+		if(!casepath((char *)imageName, r)) r = (char *)imageName;
+	} else
+		fclose(valid);
 	return rw::readBMP(r);
+#else
+	return rw::readBMP(imageName);
+#endif
 }
 
 #include "rtquat.h"
-- 
cgit v1.2.3


From 98ec7bdaf9047a16a27048202bcebf3fc1ef97d2 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sun, 26 Jul 2020 00:11:13 +0200
Subject: Provide more memory for casepath's arg

---
 src/audio/oal/stream.cpp   | 2 +-
 src/core/CdStreamPosix.cpp | 4 ++--
 src/core/FileMgr.cpp       | 4 ++--
 src/fakerw/fake.cpp        | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index 5639bd12..1ffe941e 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -205,7 +205,7 @@ CStream::CStream(char *filename, ALuint &source, ALuint (&buffers)[NUM_STREAMBUF
 #if !defined(_WIN32)
 	FILE *test = fopen(filename, "r");
 	if (!test) {
-		char *r = (char*)alloca(strlen(filename) + 2);
+		char *r = (char*)alloca(strlen(filename) + 4);
 		if (casepath(filename, r))
 		{
 		    strcpy(m_aFilename, r);
diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp
index 4d6bcdab..073ba909 100644
--- a/src/core/CdStreamPosix.cpp
+++ b/src/core/CdStreamPosix.cpp
@@ -189,7 +189,7 @@ GetGTA3ImgSize(void)
     realpath(gImgNames[0], path);
     if (stat(path, &statbuf) == -1) {
 		// Try case-insensitivity
-		char *r = (char*)alloca(strlen(gImgNames[0]) + 2);
+		char *r = (char*)alloca(strlen(gImgNames[0]) + 4);
 		if (casepath(gImgNames[0], r))
 		{
 			realpath(r, path);
@@ -460,7 +460,7 @@ CdStreamAddImage(char const *path)
 
 	// Fix case sensitivity and backslashes.
 	if (gImgFiles[gNumImages] == -1) {
-		char *r = (char*)alloca(strlen(path) + 2);
+		char *r = (char*)alloca(strlen(path) + 4);
 		if (casepath(path, r))
 		{
 		    gImgFiles[gNumImages] = open(r, _gdwCdStreamFlags);
diff --git a/src/core/FileMgr.cpp b/src/core/FileMgr.cpp
index 8dbc6894..618874fa 100644
--- a/src/core/FileMgr.cpp
+++ b/src/core/FileMgr.cpp
@@ -37,7 +37,7 @@ static myFILE myfiles[NUMFILES];
 // Case-insensitivity on linux (from https://github.com/OneSadCookie/fcaseopen)
 void mychdir(char const *path)
 {
-    char *r = (char*)alloca(strlen(path) + 2);
+    char *r = (char*)alloca(strlen(path) + 4);
     if (casepath(path, r))
     {
         chdir(r);
@@ -88,7 +88,7 @@ found:
 // Be case-insensitive on linux (from https://github.com/OneSadCookie/fcaseopen/)
 #if !defined(_WIN32)
 	if (!myfiles[fd].file) {
-		char *r = (char*)alloca(strlen(newPath) + 2);
+		char *r = (char*)alloca(strlen(newPath) + 4);
 		if (casepath(newPath, r))
 		{
 		    myfiles[fd].file = fopen(r, realmode);
diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index 6524e87c..d4417a7f 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -379,7 +379,7 @@ RwStream *RwStreamOpen(RwStreamType type, RwStreamAccessType accessType, const v
 		FILE* first = fopen((char*)pData, "r");
 		char *r;
 		if (!first) {
-			r = (char*)alloca(strlen((char*)pData) + 2);
+			r = (char*)alloca(strlen((char*)pData) + 4);
 			// Use default path(and pass error handling to librw) if we can't find any match
 			if (!casepath((char*)pData, r))
 				r = (char*)pData;
@@ -862,7 +862,7 @@ RtBMPImageWrite(RwImage *image, const RwChar *imageName)
 	char *r = nil;
 	FILE *valid = fopen((char *)imageName, "r");
 	if(!valid) {
-		char *r = (char *)alloca(strlen((char *)imageName) + 2);
+		char *r = (char *)alloca(strlen((char *)imageName) + 4);
 		// Use default path(and pass error handling to librw) if we can't find any match
 		if(!casepath((char *)imageName, r)) r = (char *)imageName;
 	} else
@@ -880,7 +880,7 @@ RtBMPImageRead(const RwChar *imageName)
 	char *r = nil;
 	FILE *valid = fopen((char *)imageName, "r");
 	if(!valid) {
-		r = (char *)alloca(strlen((char *)imageName) + 2);
+		r = (char *)alloca(strlen((char *)imageName) + 4);
 		// Use default path(and pass error handling to librw) if we can't find any match
 		if(!casepath((char *)imageName, r)) r = (char *)imageName;
 	} else
-- 
cgit v1.2.3


From e2d56f00dd24293a715efe636a52327a92b7f007 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sun, 26 Jul 2020 23:40:26 +0200
Subject: heli fixes

---
 src/vehicles/Heli.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index 4966a228..2316cbef 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -266,7 +266,9 @@ CHeli::ProcessControl(void)
 		if(fTargetDist > targetHeight)
 			m_heliStatus = HELI_STATUS_CHASE_PLAYER;
 		}
-		// fall through, BUG?
+#ifdef FIX_BUGS
+		break;
+#endif
 	case HELI_STATUS_CHASE_PLAYER:{
 		float targetHeight;
 		if(m_heliType == HELI_TYPE_CATALINA)
@@ -457,7 +459,7 @@ CHeli::ProcessControl(void)
 		else if (searchLightDist < 40.0f)
 			m_fSearchLightIntensity = 1.0f;
 		else
-			m_fSearchLightIntensity = 1.0f - (40.0f - searchLightDist) / 40.0f;
+			m_fSearchLightIntensity = 1.0f - (40.0f - searchLightDist) / (60.0f-40.0f);
 
 		if (m_fSearchLightIntensity < 0.9f || sq(FindPlayerCoors().x - m_fSearchLightX) + sq(FindPlayerCoors().y - m_fSearchLightY) > sq(7.0f))
 			m_nShootTimer = CTimer::GetTimeInMilliseconds();
@@ -796,11 +798,11 @@ GenerateHeli(bool catalina)
 		heliPos = CVector(-224.0f, 201.0f, 83.0f);
 	else{
 		heliPos = FindPlayerCoors();
-		float angle = (float)(CGeneral::GetRandomNumber() & 0xFF)/0xFF * 6.28f;
+		float angle = (float)(CGeneral::GetRandomNumber() & 0xFF)/0x100 * 6.28f;
 		heliPos.x += 250.0f*Sin(angle);
 		heliPos.y += 250.0f*Cos(angle);
 		if(heliPos.x < -2000.0f || heliPos.x > 2000.0f || heliPos.y < -2000.0f || heliPos.y > 2000.0f){
-			// directly above player
+			heliPos = FindPlayerCoors();
 			heliPos.x -= 250.0f*Sin(angle);
 			heliPos.y -= 250.0f*Cos(angle);
 		}
@@ -811,6 +813,7 @@ GenerateHeli(bool catalina)
 		heli->GetMatrix().SetRotateZOnly(DEGTORAD(270.0f));	// game actually uses 3.14 here
 
 	heli->SetStatus(STATUS_ABANDONED);
+	heli->bIsLocked = true;
 
 	int id = -1;
 	bool found = false;
@@ -938,7 +941,7 @@ CHeli::UpdateHelis(void)
 				CatalinaHasBeenShotDown = true;
 
 			CStats::HelisDestroyed++;
-			CStats::PeopleKilledByOthers += 2;
+			CStats::PeopleKilledByPlayer += 2;
 			CStats::PedsKilledOfThisType[PEDTYPE_COP] += 2;
 			CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 250;
 			pos = CWorld::Players[CWorld::PlayerInFocus].m_pPed->GetPosition();
@@ -956,7 +959,7 @@ CHeli::UpdateHelis(void)
 
 				TheCamera.CamShake(0.4f, pHelis[i]->GetPosition().x, pHelis[i]->GetPosition().y, pHelis[i]->GetPosition().z);
 
-				CVector pos = pHelis[i]->GetPosition() - 2.5f*pHelis[i]->GetUp();
+				CVector pos = pHelis[i]->GetPosition() - 2.5f*pHelis[i]->GetForward();
 				CExplosion::AddExplosion(nil, nil, EXPLOSION_HELI, pos, 0);
 			}else
 				pHelis[i]->m_fAngularSpeed *= 1.03f;
@@ -972,7 +975,7 @@ CHeli::UpdateHelis(void)
 				pHelis[i]->m_heliStatus = HELI_STATUS_FLY_AWAY;
 		}
 
-	// Remove all helis if in a tunnel
+	// Remove all helis if in a tunnel or under water
 	if(FindPlayerCoors().z < - 2.0f)
 		for(i = 0; i < NUM_HELIS; i++)
 			if(pHelis[i] && pHelis[i]->m_heliStatus != HELI_STATUS_SHOT_DOWN)
@@ -1017,7 +1020,7 @@ CHeli::TestBulletCollision(CVector *line0, CVector *line1, CVector *bulletPos, i
 			float distToHeli = (pHelis[i]->GetPosition() - *line0).Magnitude();
 			CVector line = (*line1 - *line0);
 			float lineLength = line.Magnitude();
-			*bulletPos = *line0 + line*Max(1.0f, distToHeli-5.0f);
+			*bulletPos = *line0 + line*Max(1.0f, distToHeli-5.0f)/lineLength;
 
 			pHelis[i]->m_nBulletDamage += damage;
 
-- 
cgit v1.2.3


From 2e8048d0feacbfb5a8e3d75be8d00b3f8d45c3be Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Mon, 27 Jul 2020 15:38:12 +0200
Subject: collision fixes

---
 src/core/Collision.cpp  | 174 ++++++++++++++++++++++++++----------------------
 src/core/Collision.h    |  32 ++++++---
 src/core/FileLoader.cpp |  10 +--
 src/core/SurfaceTable.h |  10 +++
 src/core/config.h       |   1 +
 src/render/Glass.cpp    |  16 ++---
 6 files changed, 142 insertions(+), 101 deletions(-)

(limited to 'src')

diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index 3244d0b9..99be816f 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -395,7 +395,7 @@ CCollision::TestVerticalLineBox(const CColLine &line, const CColBox &box)
 }
 
 bool
-CCollision::TestLineTriangle(const CColLine &line, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane)
+CCollision::TestLineTriangle(const CColLine &line, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane)
 {
 	float t;
 	CVector normal;
@@ -410,9 +410,9 @@ CCollision::TestLineTriangle(const CColLine &line, const CVector *verts, const C
 	// find point of intersection
 	CVector p = line.p0 + (line.p1-line.p0)*t;
 
-	const CVector &va = verts[tri.a];
-	const CVector &vb = verts[tri.b];
-	const CVector &vc = verts[tri.c];
+	const CVector &va = verts[tri.a].Get();
+	const CVector &vb = verts[tri.b].Get();
+	const CVector &vc = verts[tri.c].Get();
 	CVector2D vec1, vec2, vec3, vect;
 
 	// We do the test in 2D. With the plane direction we
@@ -505,15 +505,16 @@ CCollision::TestLineSphere(const CColLine &line, const CColSphere &sph)
 
 bool
 CCollision::TestSphereTriangle(const CColSphere &sphere,
-	const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane)
+	const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane)
 {
 	// If sphere and plane don't intersect, no collision
-	if(Abs(plane.CalcPoint(sphere.center)) > sphere.radius)
+	float planedist = plane.CalcPoint(sphere.center);
+	if(Abs(planedist) > sphere.radius)
 		return false;
 
-	const CVector &va = verts[tri.a];
-	const CVector &vb = verts[tri.b];
-	const CVector &vc = verts[tri.c];
+	const CVector &va = verts[tri.a].Get();
+	const CVector &vb = verts[tri.b].Get();
+	const CVector &vc = verts[tri.c].Get();
 
 	// calculate two orthogonal basis vectors for the triangle
 	CVector vec2 = vb - va;
@@ -537,23 +538,29 @@ CCollision::TestSphereTriangle(const CColSphere &sphere,
 
 	int testcase = insideAB + insideAC + insideBC;
 	float dist = 0.0f;
-	if(testcase == 1){
+	switch(testcase){
+	case 1:
 		// closest to a vertex
 		if(insideAB) dist = (sphere.center - vc).Magnitude();
 		else if(insideAC) dist = (sphere.center - vb).Magnitude();
 		else if(insideBC) dist = (sphere.center - va).Magnitude();
 		else assert(0);
-	}else if(testcase == 2){
+		break;
+	case 2:
 		// closest to an edge
+		// looks like original game as DistToLine manually inlined
 		if(!insideAB) dist = DistToLine(&va, &vb, &sphere.center);
 		else if(!insideAC) dist = DistToLine(&va, &vc, &sphere.center);
 		else if(!insideBC) dist = DistToLine(&vb, &vc, &sphere.center);
 		else assert(0);
-	}else if(testcase == 3){
+		break;
+	case 3:
 		// center is in triangle
-		return true;
-	}else
-		assert(0);	// front fell off
+		dist = Abs(planedist);
+		break;
+	default:
+		assert(0);
+	}
 
 	return dist < sphere.radius;
 }
@@ -572,21 +579,24 @@ CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColMod
 	if(!TestLineBox(newline, model.boundingBox))
 		return false;
 
-	for(i = 0; i < model.numSpheres; i++)
-		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH)
-			if(TestLineSphere(newline, model.spheres[i]))
-				return true;
+	for(i = 0; i < model.numSpheres; i++){
+		if(ignoreSeeThrough && IsSeeThrough(model.spheres[i].surface)) continue;
+		if(TestLineSphere(newline, model.spheres[i]))
+			return true;
+	}
 
-	for(i = 0; i < model.numBoxes; i++)
-		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH)
-			if(TestLineBox(newline, model.boxes[i]))
-				return true;
+	for(i = 0; i < model.numBoxes; i++){
+		if(ignoreSeeThrough && IsSeeThrough(model.boxes[i].surface)) continue;
+		if(TestLineBox(newline, model.boxes[i]))
+			return true;
+	}
 
 	CalculateTrianglePlanes(&model);
-	for(i = 0; i < model.numTriangles; i++)
-		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH)
-			if(TestLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i]))
-				return true;
+	for(i = 0; i < model.numTriangles; i++){
+		if(ignoreSeeThrough && IsSeeThrough(model.triangles[i].surface)) continue;
+		if(TestLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i]))
+			return true;
+	}
 
 	return false;
 }
@@ -861,16 +871,16 @@ CCollision::ProcessLineSphere(const CColLine &line, const CColSphere &sphere, CC
 
 bool
 CCollision::ProcessVerticalLineTriangle(const CColLine &line,
-	const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane,
+	const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane,
 	CColPoint &point, float &mindist, CStoredCollPoly *poly)
 {
 	float t;
 	CVector normal;
 
 	const CVector &p0 = line.p0;
-	const CVector &va = verts[tri.a];
-	const CVector &vb = verts[tri.b];
-	const CVector &vc = verts[tri.c];
+	const CVector &va = verts[tri.a].Get();
+	const CVector &vb = verts[tri.b].Get();
+	const CVector &vc = verts[tri.c].Get();
 
 	// early out bound rect test
 	if(p0.x < va.x && p0.x < vb.x && p0.x < vc.x) return false;
@@ -935,6 +945,7 @@ CCollision::ProcessVerticalLineTriangle(const CColLine &line,
 	if(CrossProduct2D(vec2-vec1, vect-vec1) < 0.0f) return false;
 	if(CrossProduct2D(vec3-vec1, vect-vec1) > 0.0f) return false;
 	if(CrossProduct2D(vec3-vec2, vect-vec2) < 0.0f) return false;
+	if(t >= mindist) return false;
 	point.point = p;
 	point.normal = normal;
 	point.surfaceA = 0;
@@ -960,16 +971,12 @@ CCollision::IsStoredPolyStillValidVerticalLine(const CVector &pos, float z, CCol
 		return false;
 
 	// maybe inlined?
-	CColTriangle tri;
-	tri.a = 0;
-	tri.b = 1;
-	tri.c = 2;
 	CColTrianglePlane plane;
-	plane.Set(poly->verts, tri);
+	plane.Set(poly->verts[0], poly->verts[1], poly->verts[2]);
 
-	const CVector &va = poly->verts[tri.a];
-	const CVector &vb = poly->verts[tri.b];
-	const CVector &vc = poly->verts[tri.c];
+	const CVector &va = poly->verts[0];
+	const CVector &vb = poly->verts[1];
+	const CVector &vc = poly->verts[2];
 	CVector p0 = pos;
 	CVector p1(pos.x, pos.y, z);
 
@@ -1034,7 +1041,7 @@ CCollision::IsStoredPolyStillValidVerticalLine(const CVector &pos, float z, CCol
 
 bool
 CCollision::ProcessLineTriangle(const CColLine &line ,
-	const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane,
+	const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane,
 	CColPoint &point, float &mindist)
 {
 	float t;
@@ -1053,9 +1060,9 @@ CCollision::ProcessLineTriangle(const CColLine &line ,
 	// find point of intersection
 	CVector p = line.p0 + (line.p1-line.p0)*t;
 
-	const CVector &va = verts[tri.a];
-	const CVector &vb = verts[tri.b];
-	const CVector &vc = verts[tri.c];
+	const CVector &va = verts[tri.a].Get();
+	const CVector &vb = verts[tri.b].Get();
+	const CVector &vc = verts[tri.c].Get();
 	CVector2D vec1, vec2, vec3, vect;
 
 	switch(plane.dir){
@@ -1101,6 +1108,7 @@ CCollision::ProcessLineTriangle(const CColLine &line ,
 	if(CrossProduct2D(vec2-vec1, vect-vec1) < 0.0f) return false;
 	if(CrossProduct2D(vec3-vec1, vect-vec1) > 0.0f) return false;
 	if(CrossProduct2D(vec3-vec2, vect-vec2) < 0.0f) return false;
+	if(t >= mindist) return false;
 	point.point = p;
 	point.normal = normal;
 	point.surfaceA = 0;
@@ -1113,7 +1121,7 @@ CCollision::ProcessLineTriangle(const CColLine &line ,
 
 bool
 CCollision::ProcessSphereTriangle(const CColSphere &sphere,
-	const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane,
+	const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane,
 	CColPoint &point, float &mindistsq)
 {
 	// If sphere and plane don't intersect, no collision
@@ -1122,9 +1130,9 @@ CCollision::ProcessSphereTriangle(const CColSphere &sphere,
 	if(Abs(planedist) > sphere.radius || distsq > mindistsq)
 		return false;
 
-	const CVector &va = verts[tri.a];
-	const CVector &vb = verts[tri.b];
-	const CVector &vc = verts[tri.c];
+	const CVector &va = verts[tri.a].Get();
+	const CVector &vb = verts[tri.b].Get();
+	const CVector &vc = verts[tri.c].Get();
 
 	// calculate two orthogonal basis vectors for the triangle
 	CVector normal;
@@ -1151,25 +1159,31 @@ CCollision::ProcessSphereTriangle(const CColSphere &sphere,
 	int testcase = insideAB + insideAC + insideBC;
 	float dist = 0.0f;
 	CVector p;
-	if(testcase == 1){
+	switch(testcase){
+	case 1:
 		// closest to a vertex
 		if(insideAB) p = vc;
 		else if(insideAC) p = vb;
 		else if(insideBC) p = va;
 		else assert(0);
 		dist = (sphere.center - p).Magnitude();
-	}else if(testcase == 2){
+		break;
+	case 2:
 		// closest to an edge
+		// looks like original game as DistToLine manually inlined
 		if(!insideAB) dist = DistToLine(&va, &vb, &sphere.center, p);
 		else if(!insideAC) dist = DistToLine(&va, &vc, &sphere.center, p);
 		else if(!insideBC) dist = DistToLine(&vb, &vc, &sphere.center, p);
 		else assert(0);
-	}else if(testcase == 3){
+		break;
+	case 3:
 		// center is in triangle
 		dist = Abs(planedist);
 		p = sphere.center - normal*planedist;
-	}else
-		assert(0);	// front fell off
+		break;
+	default:
+		assert(0);
+	}
 
 	if(dist >= sphere.radius || dist*dist >= mindistsq)
 		return false;
@@ -1203,18 +1217,21 @@ CCollision::ProcessLineOfSight(const CColLine &line,
 		return false;
 
 	float coldist = mindist;
-	for(i = 0; i < model.numSpheres; i++)
-		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH)
-			ProcessLineSphere(newline, model.spheres[i], point, coldist);
+	for(i = 0; i < model.numSpheres; i++){
+		if(ignoreSeeThrough && IsSeeThrough(model.spheres[i].surface)) continue;
+		ProcessLineSphere(newline, model.spheres[i], point, coldist);
+	}
 
-	for(i = 0; i < model.numBoxes; i++)
-		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH)
-			ProcessLineBox(newline, model.boxes[i], point, coldist);
+	for(i = 0; i < model.numBoxes; i++){
+		if(ignoreSeeThrough && IsSeeThrough(model.boxes[i].surface)) continue;
+		ProcessLineBox(newline, model.boxes[i], point, coldist);
+	}
 
 	CalculateTrianglePlanes(&model);
-	for(i = 0; i < model.numTriangles; i++)
-		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH)
-			ProcessLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist);
+	for(i = 0; i < model.numTriangles; i++){
+		if(ignoreSeeThrough && IsSeeThrough(model.triangles[i].surface)) continue;
+		ProcessLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist);
+	}
 
 	if(coldist < mindist){
 		point.point = matrix * point.point;
@@ -1243,24 +1260,27 @@ CCollision::ProcessVerticalLine(const CColLine &line,
 		return false;
 
 	float coldist = mindist;
-	for(i = 0; i < model.numSpheres; i++)
-		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH)
-			ProcessLineSphere(newline, model.spheres[i], point, coldist);
+	for(i = 0; i < model.numSpheres; i++){
+		if(ignoreSeeThrough && IsSeeThrough(model.spheres[i].surface)) continue;
+		ProcessLineSphere(newline, model.spheres[i], point, coldist);
+	}
 
-	for(i = 0; i < model.numBoxes; i++)
-		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH)
-			ProcessLineBox(newline, model.boxes[i], point, coldist);
+	for(i = 0; i < model.numBoxes; i++){
+		if(ignoreSeeThrough && IsSeeThrough(model.boxes[i].surface)) continue;
+		ProcessLineBox(newline, model.boxes[i], point, coldist);
+	}
 
 	CalculateTrianglePlanes(&model);
 	TempStoredPoly.valid = false;
-	for(i = 0; i < model.numTriangles; i++)
-		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH)
-			ProcessVerticalLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist, &TempStoredPoly);
+	for(i = 0; i < model.numTriangles; i++){
+		if(ignoreSeeThrough && IsSeeThrough(model.triangles[i].surface)) continue;
+		ProcessVerticalLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist, &TempStoredPoly);
+	}
 
 	if(coldist < mindist){
 		point.point = matrix * point.point;
 		point.normal = Multiply3x3(matrix, point.normal);
-		if(poly && TempStoredPoly.valid){
+		if(TempStoredPoly.valid && poly){
 			*poly = TempStoredPoly;
 			poly->verts[0] = matrix * poly->verts[0];
 			poly->verts[1] = matrix * poly->verts[1];
@@ -1959,7 +1979,7 @@ CColLine::Set(const CVector &p0, const CVector &p1)
 }
 
 void
-CColTriangle::Set(const CVector *, int a, int b, int c, uint8 surf, uint8 piece)
+CColTriangle::Set(const CompressedVector *, int a, int b, int c, uint8 surf, uint8 piece)
 {
 	this->a = a;
 	this->b = b;
@@ -1968,12 +1988,8 @@ CColTriangle::Set(const CVector *, int a, int b, int c, uint8 surf, uint8 piece)
 }
 
 void
-CColTrianglePlane::Set(const CVector *v, CColTriangle &tri)
+CColTrianglePlane::Set(const CVector &va, const CVector &vb, const CVector &vc)
 {
-	const CVector &va = v[tri.a];
-	const CVector &vb = v[tri.b];
-	const CVector &vc = v[tri.c];
-
 	normal = CrossProduct(vc-va, vb-va);
 	normal.Normalise();
 	dist = DotProduct(normal, va);
@@ -2063,7 +2079,7 @@ CColModel::GetLinkPtr(void)
 void
 CColModel::GetTrianglePoint(CVector &v, int i) const
 {
-	v = vertices[i];
+	v = vertices[i].Get();
 }
 
 CColModel&
@@ -2142,7 +2158,7 @@ CColModel::operator=(const CColModel &other)
 		if(vertices)
 			RwFree(vertices);
 		if(numVerts){
-			vertices = (CVector*)RwMalloc(numVerts*sizeof(CVector));
+			vertices = (CompressedVector*)RwMalloc(numVerts*sizeof(CompressedVector));
 			for(i = 0; i < numVerts; i++)
 				vertices[i] = other.vertices[i];
 		}
diff --git a/src/core/Collision.h b/src/core/Collision.h
index 895f012a..d988f0c2 100644
--- a/src/core/Collision.h
+++ b/src/core/Collision.h
@@ -10,6 +10,19 @@
 #define MAX_COLLISION_POINTS 32
 #endif
 
+struct CompressedVector
+{
+#ifdef COMPRESSED_COL_VECTORS
+	int16 x, y, z;
+	CVector Get(void) const { return CVector(x, y, z)/128.0f; };
+	void Set(float x, float y, float z) { this->x = x*128.0f; this->y = y*128.0f; this->z = z*128.0f; };
+#else
+	float x, y, z;
+	CVector Get(void) const { return CVector(x, y, z); };
+	void Set(float x, float y, float z) { this->x = x; this->y = y; this->z = z; };
+#endif
+};
+
 struct CColSphere
 {
 	CVector center;
@@ -51,7 +64,7 @@ struct CColTriangle
 	uint16 c;
 	uint8 surface;
 
-	void Set(const CVector *v, int a, int b, int c, uint8 surf, uint8 piece);
+	void Set(const CompressedVector *v, int a, int b, int c, uint8 surf, uint8 piece);
 };
 
 struct CColTrianglePlane
@@ -60,7 +73,8 @@ struct CColTrianglePlane
 	float dist;
 	uint8 dir;
 
-	void Set(const CVector *v, CColTriangle &tri);
+	void Set(const CVector &va, const CVector &vb, const CVector &vc);
+	void Set(const CompressedVector *v, CColTriangle &tri) { Set(v[tri.a].Get(), v[tri.b].Get(), v[tri.c].Get()); }
 	void GetNormal(CVector &n) const { n = normal; }
 	float CalcPoint(const CVector &v) const { return DotProduct(normal, v) - dist; };
 };
@@ -94,11 +108,11 @@ struct CColModel
 	int16 numBoxes;
 	int16 numTriangles;
 	int32 level;
-	bool ownsCollisionVolumes;
+	bool ownsCollisionVolumes;	// missing on PS2
 	CColSphere *spheres;
 	CColLine *lines;
 	CColBox *boxes;
-	CVector *vertices;
+	CompressedVector *vertices;
 	CColTriangle *triangles;
 	CColTrianglePlane *trianglePlanes;
 
@@ -136,18 +150,18 @@ public:
 	static bool TestSphereBox(const CColSphere &sph, const CColBox &box);
 	static bool TestLineBox(const CColLine &line, const CColBox &box);
 	static bool TestVerticalLineBox(const CColLine &line, const CColBox &box);
-	static bool TestLineTriangle(const CColLine &line, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane);
+	static bool TestLineTriangle(const CColLine &line, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane);
 	static bool TestLineSphere(const CColLine &line, const CColSphere &sph);
-	static bool TestSphereTriangle(const CColSphere &sphere, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane);
+	static bool TestSphereTriangle(const CColSphere &sphere, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane);
 	static bool TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough);
 
 	static bool ProcessSphereSphere(const CColSphere &s1, const CColSphere &s2, CColPoint &point, float &mindistsq);
 	static bool ProcessSphereBox(const CColSphere &sph, const CColBox &box, CColPoint &point, float &mindistsq);
 	static bool ProcessLineBox(const CColLine &line, const CColBox &box, CColPoint &point, float &mindist);
-	static bool ProcessVerticalLineTriangle(const CColLine &line, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindist, CStoredCollPoly *poly);
-	static bool ProcessLineTriangle(const CColLine &line , const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindist);
+	static bool ProcessVerticalLineTriangle(const CColLine &line, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindist, CStoredCollPoly *poly);
+	static bool ProcessLineTriangle(const CColLine &line , const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindist);
 	static bool ProcessLineSphere(const CColLine &line, const CColSphere &sphere, CColPoint &point, float &mindist);
-	static bool ProcessSphereTriangle(const CColSphere &sph, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindistsq);
+	static bool ProcessSphereTriangle(const CColSphere &sph, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindistsq);
 	static bool ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough);
 	static bool ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, CStoredCollPoly *poly);
 	static int32 ProcessColModels(const CMatrix &matrixA, CColModel &modelA, const CMatrix &matrixB, CColModel &modelB, CColPoint *spherepoints, CColPoint *linepoints, float *linedists);
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 63be2e7b..b4da1a5e 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -264,12 +264,12 @@ CFileLoader::LoadCollisionModel(uint8 *buf, CColModel &model, char *modelname)
 	int32 numVertices = *(int16*)buf;
 	buf += 4;
 	if(numVertices > 0){
-		model.vertices = (CVector*)RwMalloc(numVertices*sizeof(CVector));
+		model.vertices = (CompressedVector*)RwMalloc(numVertices*sizeof(CompressedVector));
 		for(i = 0; i < numVertices; i++){
-			model.vertices[i] = *(CVector*)buf;
-			if(Abs(model.vertices[i].x) >= 256.0f ||
-			   Abs(model.vertices[i].y) >= 256.0f ||
-			   Abs(model.vertices[i].z) >= 256.0f)
+			model.vertices[i].Set(*(float*)buf, *(float*)(buf+4), *(float*)(buf+8));
+			if(Abs(*(float*)buf) >= 256.0f ||
+			   Abs(*(float*)(buf+4)) >= 256.0f ||
+			   Abs(*(float*)(buf+8)) >= 256.0f)
 				printf("%s:Collision volume too big\n", modelname);
 			buf += 12;
 		}
diff --git a/src/core/SurfaceTable.h b/src/core/SurfaceTable.h
index 25b5e57d..1f16843d 100644
--- a/src/core/SurfaceTable.h
+++ b/src/core/SurfaceTable.h
@@ -54,6 +54,16 @@ enum
 
 struct CColPoint;
 
+inline bool
+IsSeeThrough(uint8 surfType)
+{
+	switch(surfType)
+	case SURFACE_GLASS:
+	case SURFACE_TRANSPARENT_CLOTH:
+		return true;
+	return false;
+}
+
 class CSurfaceTable
 {
 	static float ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS];
diff --git a/src/core/config.h b/src/core/config.h
index 04d54831..8972e7b7 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -158,6 +158,7 @@ enum Config {
 #if defined GTA_PS2
 #	define GTA_PS2_STUFF
 #	define RANDOMSPLASH
+#	define COMPRESSED_COL_VECTORS
 #elif defined GTA_PC
 #	define GTA3_1_1_PATCH
 //#	define GTA3_STEAM_PATCH
diff --git a/src/render/Glass.cpp b/src/render/Glass.cpp
index ac892ddb..ee36bad3 100644
--- a/src/render/Glass.cpp
+++ b/src/render/Glass.cpp
@@ -424,10 +424,10 @@ CGlass::RenderEntityInGlass(CEntity *entity)
 	ASSERT(col!=nil);
 	if ( col->numTriangles >= 2 )
 	{
-		CVector a = object->GetMatrix() * col->vertices[0];
-		CVector b = object->GetMatrix() * col->vertices[1];
-		CVector c = object->GetMatrix() * col->vertices[2];
-		CVector d = object->GetMatrix() * col->vertices[3];
+		CVector a = object->GetMatrix() * col->vertices[0].Get();
+		CVector b = object->GetMatrix() * col->vertices[1].Get();
+		CVector c = object->GetMatrix() * col->vertices[2].Get();
+		CVector d = object->GetMatrix() * col->vertices[3].Get();
 
 		if ( object->bGlassCracked )
 		{
@@ -613,10 +613,10 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
 	CColModel *col = object->GetColModel();
 	ASSERT(col!=nil);
 	
-	CVector a = object->GetMatrix() * col->vertices[0];
-	CVector b = object->GetMatrix() * col->vertices[1];
-	CVector c = object->GetMatrix() * col->vertices[2];
-	CVector d = object->GetMatrix() * col->vertices[3];
+	CVector a = object->GetMatrix() * col->vertices[0].Get();
+	CVector b = object->GetMatrix() * col->vertices[1].Get();
+	CVector c = object->GetMatrix() * col->vertices[2].Get();
+	CVector d = object->GetMatrix() * col->vertices[3].Get();
 
 	float minx = Min(Min(a.x, b.x), Min(c.x, d.x));
 	float maxx = Max(Max(a.x, b.x), Max(c.x, d.x));
-- 
cgit v1.2.3


From eb8844fd113d3fdae0456d56bdb0eb56e3a5f26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Sun, 26 Jul 2020 20:59:58 +0300
Subject: Fix casepath chaos

---
 src/audio/oal/stream.cpp   |  12 ++---
 src/core/CdStreamPosix.cpp |  16 +++---
 src/core/FileMgr.cpp       |  37 +++----------
 src/fakerw/fake.cpp        |  62 ++++++++++------------
 src/skel/crossplatform.cpp | 129 ++++++++++++++++++++++++++++-----------------
 src/skel/crossplatform.h   |   6 ++-
 6 files changed, 132 insertions(+), 130 deletions(-)

(limited to 'src')

diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index 1ffe941e..9fad47a9 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -203,15 +203,11 @@ CStream::CStream(char *filename, ALuint &source, ALuint (&buffers)[NUM_STREAMBUF
 {
 // Be case-insensitive on linux (from https://github.com/OneSadCookie/fcaseopen/)
 #if !defined(_WIN32)
-	FILE *test = fopen(filename, "r");
-	if (!test) {
-		char *r = (char*)alloca(strlen(filename) + 4);
-		if (casepath(filename, r))
-		{
-		    strcpy(m_aFilename, r);
-		}
+	char *real = casepath(filename);
+	if (real) {
+		strcpy(m_aFilename, real);
+		free(real);
 	} else {
-		fclose(test);
 #else
 	{
 #endif
diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp
index 073ba909..45fd9832 100644
--- a/src/core/CdStreamPosix.cpp
+++ b/src/core/CdStreamPosix.cpp
@@ -189,10 +189,11 @@ GetGTA3ImgSize(void)
     realpath(gImgNames[0], path);
     if (stat(path, &statbuf) == -1) {
 		// Try case-insensitivity
-		char *r = (char*)alloca(strlen(gImgNames[0]) + 4);
-		if (casepath(gImgNames[0], r))
+		char* real = casepath(gImgNames[0], false);
+		if (real)
 		{
-			realpath(r, path);
+			realpath(real, path);
+			free(real);
     		if (stat(path, &statbuf) != -1)
 				goto ok;
 		}
@@ -210,7 +211,6 @@ CdStreamShutdown(void)
 {
     // Destroying semaphores and free(gpReadInfo) will be done at threads
 #ifndef ONE_THREAD_PER_CHANNEL
-    free(gChannelRequestQ.items);
     gCdStreamThreadStatus = 2;
     sem_post(&gCdStreamSema);
 #endif
@@ -442,6 +442,7 @@ void *CdStreamThread(void *param)
         sem_destroy(&gpReadInfo[i].pDoneSemaphore);
     }
     sem_destroy(&gCdStreamSema);
+	free(gChannelRequestQ.items);
 #else
     sem_destroy(&gpReadInfo[channel].pStartSemaphore);
     sem_destroy(&gpReadInfo[channel].pDoneSemaphore);
@@ -460,10 +461,11 @@ CdStreamAddImage(char const *path)
 
 	// Fix case sensitivity and backslashes.
 	if (gImgFiles[gNumImages] == -1) {
-		char *r = (char*)alloca(strlen(path) + 4);
-		if (casepath(path, r))
+		char* real = casepath(path, false);
+		if (real)
 		{
-		    gImgFiles[gNumImages] = open(r, _gdwCdStreamFlags);
+		    gImgFiles[gNumImages] = open(real, _gdwCdStreamFlags);
+			free(real);
 		}
 	}
 
diff --git a/src/core/FileMgr.cpp b/src/core/FileMgr.cpp
index 618874fa..ac51f8de 100644
--- a/src/core/FileMgr.cpp
+++ b/src/core/FileMgr.cpp
@@ -4,6 +4,7 @@
 #include <direct.h>
 #endif
 #include "common.h"
+#include "crossplatform.h"
 
 #include "FileMgr.h"
 
@@ -31,19 +32,16 @@ static myFILE myfiles[NUMFILES];
 #include <dirent.h>
 #include <errno.h>
 #include <unistd.h>
-#include "crossplatform.h"
 #define _getcwd getcwd
 
 // Case-insensitivity on linux (from https://github.com/OneSadCookie/fcaseopen)
 void mychdir(char const *path)
 {
-    char *r = (char*)alloca(strlen(path) + 4);
-    if (casepath(path, r))
-    {
+	char* r = casepath(path, false);
+    if (r) {
         chdir(r);
-    }
-    else
-    {
+		free(r);
+    } else {
         errno = ENOENT;
     }
 }
@@ -73,30 +71,7 @@ found:
 	*p++ = 'b';
 	*p = '\0';
 	
-#if !defined(_WIN32)
-	char *newPath = strdup(filename);
-	// Normally casepath() fixes backslashes, but if the mode is sth other than r/rb it will create new file with backslashes on linux, so fix backslashes here
-	char *nextBs;
-	while(nextBs = strstr(newPath, "\\")){
-		*nextBs = '/';
-	}
-#else
-	const char *newPath = filename;
-#endif
-
-	myfiles[fd].file = fopen(newPath, realmode);
-// Be case-insensitive on linux (from https://github.com/OneSadCookie/fcaseopen/)
-#if !defined(_WIN32)
-	if (!myfiles[fd].file) {
-		char *r = (char*)alloca(strlen(newPath) + 4);
-		if (casepath(newPath, r))
-		{
-		    myfiles[fd].file = fopen(r, realmode);
-		}
-	}
-
-	free(newPath);
-#endif
+	myfiles[fd].file = fcaseopen(filename, realmode);
 	if(myfiles[fd].file == nil)
 		return 0;
 	return fd;
diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index d4417a7f..7d563d77 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -375,23 +375,19 @@ RwStream *RwStreamOpen(RwStreamType type, RwStreamAccessType accessType, const v
 		file = rwNewT(StreamFile, 1, 0);
 		memcpy(file, &fakefile, sizeof(StreamFile));
 #ifndef _WIN32
-		// Be case-insensitive and fix backslashes (from https://github.com/OneSadCookie/fcaseopen/)
-		FILE* first = fopen((char*)pData, "r");
-		char *r;
-		if (!first) {
-			r = (char*)alloca(strlen((char*)pData) + 4);
-			// Use default path(and pass error handling to librw) if we can't find any match
-			if (!casepath((char*)pData, r))
-				r = (char*)pData;
+		char *r = casepath((char*)pData);
+		if (r) {
+			if (file->open((char*)r, mode)) {
+				free(r);
+				return file;
+			}
+			free(r);
 		} else
-			fclose(first);
-
-		if(file->open((char*)r, mode))
-			return file;
-#else
-		if(file->open((char*)pData, mode))
-			return file;
 #endif
+		{
+			if (file->open((char*)pData, mode))
+				return file;
+		}
 		rwFree(file);
 		return nil;
 	}
@@ -859,15 +855,14 @@ RwImage *
 RtBMPImageWrite(RwImage *image, const RwChar *imageName)
 {
 #ifndef _WIN32
-	char *r = nil;
-	FILE *valid = fopen((char *)imageName, "r");
-	if(!valid) {
-		char *r = (char *)alloca(strlen((char *)imageName) + 4);
-		// Use default path(and pass error handling to librw) if we can't find any match
-		if(!casepath((char *)imageName, r)) r = (char *)imageName;
-	} else
-		fclose(valid);
-	rw::writeBMP(image, r);
+	char *r = casepath(imageName);
+	if (r) {
+		rw::writeBMP(image, r);
+		free(r);
+	} else {
+		rw::writeBMP(image, imageName);
+	}
+	
 #else
 	rw::writeBMP(image, imageName);
 #endif
@@ -877,15 +872,16 @@ RwImage *
 RtBMPImageRead(const RwChar *imageName)
 {
 #ifndef _WIN32
-	char *r = nil;
-	FILE *valid = fopen((char *)imageName, "r");
-	if(!valid) {
-		r = (char *)alloca(strlen((char *)imageName) + 4);
-		// Use default path(and pass error handling to librw) if we can't find any match
-		if(!casepath((char *)imageName, r)) r = (char *)imageName;
-	} else
-		fclose(valid);
-	return rw::readBMP(r);
+	RwImage *image;
+	char *r = casepath(imageName);
+	if (r) {
+		image = rw::readBMP(r);
+		free(r);
+	} else {
+		image = rw::readBMP(imageName);
+	}
+	return image;
+
 #else
 	return rw::readBMP(imageName);
 #endif
diff --git a/src/skel/crossplatform.cpp b/src/skel/crossplatform.cpp
index 40f4f053..6188992d 100644
--- a/src/skel/crossplatform.cpp
+++ b/src/skel/crossplatform.cpp
@@ -87,7 +87,7 @@ void FileTimeToSystemTime(time_t* writeTime, SYSTEMTIME* out) {
 // Funcs/features from Windows that we need on other platforms
 #ifndef _WIN32
 char *strupr(char *s) {
-   char* tmp = s;
+    char* tmp = s;
 
     for (;*tmp;++tmp) {
         *tmp = toupper((unsigned char) *tmp);
@@ -96,7 +96,7 @@ char *strupr(char *s) {
     return s;
 }
 char *strlwr(char *s) {
-   char* tmp = s;
+    char* tmp = s;
 
     for (;*tmp;++tmp) {
         *tmp = tolower((unsigned char) *tmp);
@@ -116,86 +116,117 @@ char *trim(char *s) {
     return s;
 }
 
+FILE* _fcaseopen(char const* filename, char const* mode)
+{
+    FILE* result;
+    char* real = casepath(filename);
+    if (!real)
+        result = fopen(filename, mode);
+    else {
+        result = fopen(real, mode);
+        free(real);
+    }
+    return result;
+}
+
 // Case-insensitivity on linux (from https://github.com/OneSadCookie/fcaseopen)
-// r must have strlen(path) + 2 bytes
-int casepath(char const *path, char *r)
+// Returned string should freed manually (if exists)
+char* casepath(char const* path, bool checkPathFirst)
 {
+    if (checkPathFirst && access(path, F_OK) != -1) {
+        // File path is correct
+        return nil;
+    }
+
     size_t l = strlen(path);
-    char *p = (char*)alloca(l + 1);
+    char* p = (char*)alloca(l + 1);
+    char* out = (char*)malloc(l + 3); // for extra ./
     strcpy(p, path);
 
-    // my addon: change \'s with /
-	char *nextBs;
-	while(nextBs = strstr(p, "\\")){
-		*nextBs = '/';
-	}
-	
-	// my addon: linux doesn't handle filenames with spaces at the end nicely
-	p = trim(p);
+    // my addon: linux doesn't handle filenames with spaces at the end nicely
+    p = trim(p);
 
     size_t rl = 0;
-    
-    DIR *d;
-    if (p[0] == '/')
+
+    DIR* d;
+    if (p[0] == '/' || p[0] == '\\')
     {
         d = opendir("/");
-        p = p + 1;
     }
     else
     {
         d = opendir(".");
-        r[0] = '.';
-        r[1] = 0;
+        out[0] = '.';
+        out[1] = 0;
         rl = 1;
     }
-    
-    int last = 0;
-    char *c = strsep(&p, "/");
-    while (c)
+
+    bool cantProceed = false; // just convert slashes in what's left in string, not case sensitivity
+    bool mayBeTrailingSlash = false;
+    char* c;
+    while (c = strsep(&p, "/\\"))
     {
-        if (!d)
+        // May be trailing slash(allow), slash at the start(avoid), or multiple slashes(avoid)
+        if (*c == '\0')
         {
-            return 0;
+            mayBeTrailingSlash = true;
+            continue;
+        } else {
+            mayBeTrailingSlash = false;
         }
-        
-        if (last)
+
+        out[rl] = '/';
+        rl += 1;
+        out[rl] = 0;
+
+        if (cantProceed)
         {
-            closedir(d);
-            return 0;
+            strcpy(out + rl, c);
+            rl += strlen(c);
+            continue;
         }
-        
-        r[rl] = '/';
-        rl += 1;
-        r[rl] = 0;
-        
-        struct dirent *e = readdir(d);
-        while (e)
+
+        struct dirent* e;
+        while (e = readdir(d))
         {
             if (strcasecmp(c, e->d_name) == 0)
             {
-                strcpy(r + rl, e->d_name);
-                rl += strlen(e->d_name);
+                strcpy(out + rl, e->d_name);
+                int reportedLen = (int)strlen(e->d_name);
+                rl += reportedLen;
+                assert(reportedLen == strlen(c) && "casepath: This is not good at all");
 
                 closedir(d);
-                d = opendir(r);
-                
+                d = opendir(out);
+
+                // Either it wasn't a folder, or permission error, I/O error etc.
+                if (!d) {
+                    cantProceed = true;
+                }
+
                 break;
             }
-
-            e = readdir(d);
         }
-        
+
         if (!e)
         {
-            strcpy(r + rl, c);
+            printf("casepath couldn't find dir/file \"%s\", full path was %s\n", c, path);
+            // No match, add original name and continue converting further slashes.
+            strcpy(out + rl, c);
             rl += strlen(c);
-            last = 1;
+            cantProceed = true;
         }
-        
-        c = strsep(&p, "/");
     }
-    
+
     if (d) closedir(d);
-    return 1;
+    if (mayBeTrailingSlash) {
+        out[rl] = '/';  rl += 1;
+        out[rl] = '\0';
+    }
+
+    if (rl > l + 2) {
+        printf("\n\ncasepath: Corrected path length is longer then original+2:\n\tOriginal: %s (%d chars)\n\tCorrected: %s (%d chars)\n\n", path, l, out, rl);
+    }
+    return out;
 }
 #endif
diff --git a/src/skel/crossplatform.h b/src/skel/crossplatform.h
index 268eedff..69600385 100644
--- a/src/skel/crossplatform.h
+++ b/src/skel/crossplatform.h
@@ -23,7 +23,7 @@ enum eWinVersion
 #include "win.h"
 #endif
 extern DWORD _dwOperatingSystemVersion;
-
+#define fcaseopen fopen
 #else
 char *strupr(char *str);
 char *strlwr(char *str);
@@ -43,7 +43,9 @@ enum {
 };
 
 extern long _dwOperatingSystemVersion;
-int casepath(char const *path, char *r);
+char *casepath(char const *path, bool checkPathFirst = true);
+FILE *_fcaseopen(char const *filename, char const *mode);
+#define fcaseopen _fcaseopen
 #endif
 
 #ifdef RW_GL3
-- 
cgit v1.2.3


From 2f40c3dc8bd30336189b2f53324ae6aa234993a1 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Wed, 29 Jul 2020 09:50:06 +0200
Subject: synch fakerw with reVC; update librw

---
 src/fakerw/fake.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index 7d563d77..b9ff0144 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -35,9 +35,9 @@ RwReal RwV3dLength(const RwV3d * in) { return length(*in); }
 //void RwV3dAssign(RwV3d * out, const RwV3d * ina);
 void RwV3dAdd(RwV3d * out, const RwV3d * ina, const RwV3d * inb) { *out = add(*ina, *inb); }
 void RwV3dSub(RwV3d * out, const RwV3d * ina, const RwV3d * inb) { *out = sub(*ina, *inb); }
-//void RwV3dScale(RwV3d * out, const RwV3d * in, RwReal scalar);
-//void RwV3dIncrementScaled(RwV3d * out,  const RwV3d * in, RwReal scalar);
-//void RwV3dNegate(RwV3d * out, const RwV3d * in);
+void RwV3dScale(RwV3d * out, const RwV3d * in, RwReal scalar) { *out = scale(*in, scalar); }
+void RwV3dIncrementScaled(RwV3d * out,  const RwV3d * in, RwReal scalar) { *out = add(*out, scale(*in, scalar)); }
+void RwV3dNegate(RwV3d * out, const RwV3d * in) { *out = neg(*in); }
 RwReal RwV3dDotProduct(const RwV3d * ina, const RwV3d * inb) { return dot(*ina, *inb); }
 //void RwV3dCrossProduct(RwV3d * out, const RwV3d * ina, const RwV3d * inb);
 RwV3d *RwV3dTransformPoints(RwV3d * pointsOut, const RwV3d * pointsIn, RwInt32 numPoints, const RwMatrix * matrix)
@@ -83,7 +83,8 @@ RwFrame *RwFrameTranslate(RwFrame * frame, const RwV3d * v, RwOpCombineType comb
 RwFrame *RwFrameRotate(RwFrame * frame, const RwV3d * axis, RwReal angle, RwOpCombineType combine) { frame->rotate(axis, angle, (CombineOp)combine); return frame; }
 RwFrame *RwFrameScale(RwFrame * frame, const RwV3d * v, RwOpCombineType combine) { frame->scale(v, (CombineOp)combine); return frame; }
 RwFrame *RwFrameTransform(RwFrame * frame, const RwMatrix * m, RwOpCombineType combine) { frame->transform(m, (CombineOp)combine); return frame; }
-//RwFrame *RwFrameOrthoNormalize(RwFrame * frame);
+//TODO: actually implement this!
+RwFrame *RwFrameOrthoNormalize(RwFrame * frame) { return frame; }
 RwFrame *RwFrameSetIdentity(RwFrame * frame) { frame->matrix.setIdentity(); frame->updateObjects(); return frame; }
 //RwFrame *RwFrameCloneHierarchy(RwFrame * root);
 //RwBool RwFrameDestroyHierarchy(RwFrame * frame);
@@ -136,7 +137,7 @@ RwCamera    *RwCameraCreate(void) { return rw::Camera::create(); }
 RwCamera    *RwCameraClone(RwCamera * camera) { return camera->clone(); }
 RwCamera    *RwCameraSetViewOffset(RwCamera *camera, const RwV2d *offset) { camera->setViewOffset(offset); return camera; }
 RwCamera    *RwCameraSetViewWindow(RwCamera *camera, const RwV2d *viewWindow) { camera->setViewWindow(viewWindow); return camera; }
-RwCamera    *RwCameraSetProjection(RwCamera *camera, RwCameraProjection projection);
+RwCamera    *RwCameraSetProjection(RwCamera *camera, RwCameraProjection projection) { camera->projection = projection; return camera; }
 RwCamera    *RwCameraSetNearClipPlane(RwCamera *camera, RwReal nearClip) { camera->setNearPlane(nearClip); return camera; }
 RwCamera    *RwCameraSetFarClipPlane(RwCamera *camera, RwReal farClip) { camera->setFarPlane(farClip); return camera; }
 RwInt32      RwCameraRegisterPlugin(RwInt32 size, RwUInt32 pluginID, RwPluginObjectConstructor constructCB, RwPluginObjectDestructor destructCB, RwPluginObjectCopy copyCB);
-- 
cgit v1.2.3


From 581cb5edfa39a263bcbcdf3e37c608a5c7758849 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Wed, 29 Jul 2020 14:56:06 +0300
Subject: The real pickup reflection fix

---
 src/control/Pickups.cpp | 33 +++++++++------------------------
 src/core/Camera.cpp     |  4 ++--
 src/core/Fire.cpp       |  7 ++-----
 src/render/Shadows.cpp  |  3 +++
 src/rw/RwHelper.cpp     | 34 ++++++++++++++++++++++++++++++++++
 src/rw/RwHelper.h       | 10 +++++++++-
 6 files changed, 59 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 32bffa17..eb4843c5 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -700,15 +700,9 @@ CPickups::DoPickUpEffects(CEntity *entity)
 		const CVector &pos = entity->GetPosition();
 
 		float colorModifier = ((CGeneral::GetRandomNumber() & 0x1F) * 0.015f + 1.0f) * modifiedSin * 0.15f;
-		CShadows::StoreStaticShadow(
-			(uintptr)entity,
-			SHADOWTYPE_ADDITIVE,
-			gpShadowExplosionTex,
-			&pos,
-			2.0f, 0.0f, 0.0f, -2.0f,
-			255,                                        // this is 0 on PC which results in no shadow
-			aWeaponReds[colorId] * colorModifier, aWeaponGreens[colorId] * colorModifier, aWeaponBlues[colorId] * colorModifier,
-			4.0f, 1.0f, 40.0f, false, 0.0f);
+		CShadows::StoreStaticShadow((uintptr)entity, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &pos, 2.0f, 0.0f, 0.0f, -2.0f, 0,
+		                            aWeaponReds[colorId] * colorModifier, aWeaponGreens[colorId] * colorModifier, aWeaponBlues[colorId] * colorModifier, 4.0f,
+		                            1.0f, 40.0f, false, 0.0f);
 
 		float radius = (CGeneral::GetRandomNumber() & 0xF) * 0.1f + 3.0f;
 		CPointLights::AddLight(CPointLights::LIGHT_POINT, pos, CVector(0.0f, 0.0f, 0.0f), radius, aWeaponReds[colorId] * modifiedSin / 256.0f, aWeaponGreens[colorId] * modifiedSin / 256.0f, aWeaponBlues[colorId] * modifiedSin / 256.0f, CPointLights::FOG_NONE, true);
@@ -759,11 +753,8 @@ CPickups::DoMineEffects(CEntity *entity)
 		float s = Sin((float)((CTimer::GetTimeInMilliseconds() + (uintptr)entity) & 0x1FF) * DEGTORAD(360.0f / 0x200));
 
 		int32 red = (MAXDIST - dist) * (0.5f * s + 0.5f) / MAXDIST * 64.0f;
-		CShadows::StoreStaticShadow((uintptr)entity, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &pos,
-			2.0f, 0.0f, 0.0f, -2.0f,
-			255,                                        // this is 0 on PC which results in no shadow
-			red, 0, 0,
-			4.0f, 1.0f, 40.0f, false, 0.0f);
+		CShadows::StoreStaticShadow((uintptr)entity, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &pos, 2.0f, 0.0f, 0.0f, -2.0f, 0, red, 0, 0, 4.0f, 1.0f, 40.0f,
+		                            false, 0.0f);
 		CCoronas::RegisterCorona((uintptr)entity, red, 0, 0, 255, pos, 0.6f, 60.0f, CCoronas::TYPE_RING, CCoronas::FLARE_NONE, CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f);
 	}
 
@@ -781,11 +772,8 @@ CPickups::DoMoneyEffects(CEntity *entity)
 		float s = Sin((float)((CTimer::GetTimeInMilliseconds() + (uintptr)entity) & 0x3FF) * DEGTORAD(360.0f / 0x400));
 
 		int32 green = (MAXDIST - dist) * (0.2f * s + 0.3f) / MAXDIST * 64.0f;
-		CShadows::StoreStaticShadow((uintptr)entity, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &pos,
-			2.0f, 0.0f, 0.0f, -2.0f,
-			255,                                        // this is 0 on PC which results in no shadow
-			0, green, 0,
-			4.0f, 1.0f, 40.0f, false, 0.0f);
+		CShadows::StoreStaticShadow((uintptr)entity, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &pos, 2.0f, 0.0f, 0.0f, -2.0f, 0, 0, green, 0, 4.0f, 1.0f,
+		                            40.0f, false, 0.0f);
 		CCoronas::RegisterCorona((uintptr)entity, 0, green, 0, 255, pos, 0.4f, 40.0f, CCoronas::TYPE_RING, CCoronas::FLARE_NONE, CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f);
 	}
 
@@ -803,11 +791,8 @@ CPickups::DoCollectableEffects(CEntity *entity)
 		float s = Sin((float)((CTimer::GetTimeInMilliseconds() + (uintptr)entity) & 0x7FF) * DEGTORAD(360.0f / 0x800));
 
 		int32 color = (MAXDIST - dist) * (0.5f * s + 0.5f) / MAXDIST * 255.0f;
-		CShadows::StoreStaticShadow((uintptr)entity, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &pos,
-			2.0f, 0.0f, 0.0f, -2.0f,
-			255,                                        // this is 0 on PC which results in no shadow
-			color, color, color,
-			4.0f, 1.0f, 40.0f, false, 0.0f);
+		CShadows::StoreStaticShadow((uintptr)entity, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &pos, 2.0f, 0.0f, 0.0f, -2.0f, 0, color, color, color, 4.0f,
+		                            1.0f, 40.0f, false, 0.0f);
 		CCoronas::RegisterCorona((uintptr)entity, color, color, color, 255, pos, 0.6f, 40.0f, CCoronas::TYPE_RING, CCoronas::FLARE_NONE, CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f);
 	}
 
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index c253d00f..abe0833e 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -3587,8 +3587,8 @@ CCamera::CalculateDerivedValues(void)
 	m_cameraMatrix = Invert(m_matrix);
 
 	float hfov = DEGTORAD(CDraw::GetScaledFOV()/2.0f);
-	float c = cos(hfov);
-	float s = sin(hfov);
+	float c = Cos(hfov);
+	float s = Sin(hfov);
 
 	// right plane
 	m_vecFrustumNormals[0] = CVector(c, -s, 0.0f);
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
index 933c73da..c6dece6a 100644
--- a/src/core/Fire.cpp
+++ b/src/core/Fire.cpp
@@ -128,11 +128,8 @@ CFire::ProcessFire(void)
 		lightpos.z = m_vecPos.z + 5.0f;
 
 		if (!m_pEntity) {
-			CShadows::StoreStaticShadow((uintptr)this, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &lightpos,
-				7.0f, 0.0f, 0.0f, -7.0f,
-				255,                                        // this is 0 on PC which results in no shadow
-				nRandNumber / 2, nRandNumber / 2, 0,
-				10.0f, 1.0f, 40.0f, 0, 0.0f);
+			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;
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index d07c302a..c169c351 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -796,6 +796,8 @@ CShadows::RenderStaticShadows(void)
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)TRUE);
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE,         (void *)FALSE);
 
+	SetAlphaTest(0);
+
 	for ( int32 i = 0; i < MAX_STATICSHADOWS; i++ )
 		aStaticShadows[i].m_bRendered = false;
 
@@ -849,6 +851,7 @@ CShadows::RenderStaticShadows(void)
 			RenderBuffer::RenderStuffInBuffer();
 		}
 	}
+	RestoreAlphaTest();
 
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)FALSE);
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE,      (void *)TRUE);
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 3503e27d..bf70c8dc 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -611,3 +611,37 @@ CameraCreate(RwInt32 width, RwInt32 height, RwBool zBuffer)
 WRAPPER void _TexturePoolsInitialise() { EAXJMP(0x598B10); }
 WRAPPER void _TexturePoolsShutdown() { EAXJMP(0x598B30); }
 #endif
+
+#if defined(FIX_BUGS) && defined(GTA_PC)
+RwUInt32 saved_alphafunc, saved_alpharef;
+
+void
+SetAlphaTest(RwUInt32 alpharef)
+{
+#ifdef LIBRW
+	saved_alphafunc = rw::GetRenderState(rw::ALPHATESTFUNC);
+	saved_alpharef = rw::GetRenderState(rw::ALPHATESTREF);
+
+	rw::SetRenderState(rw::ALPHATESTFUNC, rw::ALPHAGREATEREQUAL);
+	rw::SetRenderState(rw::ALPHATESTREF, 0);
+#else
+	RwD3D8GetRenderState(D3DRS_ALPHAFUNC, &saved_alphafunc);
+	RwD3D8GetRenderState(D3DRS_ALPHAREF, &saved_alpharef);
+	
+	RwD3D8SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
+	RwD3D8SetRenderState(D3DRS_ALPHAREF, alpharef);
+#endif
+}
+
+void
+RestoreAlphaTest()
+{
+#ifdef LIBRW
+	rw::SetRenderState(rw::ALPHATESTFUNC, saved_alphafunc);
+	rw::SetRenderState(rw::ALPHATESTREF, saved_alpharef);
+#else
+	RwD3D8SetRenderState(D3DRS_ALPHAFUNC, saved_alphafunc);
+	RwD3D8SetRenderState(D3DRS_ALPHAREF, saved_alpharef);
+#endif
+}
+#endif
diff --git a/src/rw/RwHelper.h b/src/rw/RwHelper.h
index a751ee39..eceaee07 100644
--- a/src/rw/RwHelper.h
+++ b/src/rw/RwHelper.h
@@ -52,4 +52,12 @@ RwCamera *CameraCreate(RwInt32 width,
 
 					   
 void _TexturePoolsInitialise();
-void _TexturePoolsShutdown();
\ No newline at end of file
+void _TexturePoolsShutdown();
+
+#if defined(FIX_BUGS) && defined (GTA_PC)
+void SetAlphaTest(RwUInt32 alpharef);
+void RestoreAlphaTest();
+#else
+#define SetAlphaTest(a) (0)
+#define RestoreAlphaTest() (0)
+#endif
\ No newline at end of file
-- 
cgit v1.2.3


From 6b92e9e12b376b9edf04070ecf83179e9a0f8fda Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Wed, 29 Jul 2020 15:24:42 +0300
Subject: Dual pass rendering for RW 3.3

---
 src/core/Game.cpp   | 18 ++++++++++++++----
 src/core/config.h   |  1 +
 src/rw/RwHelper.cpp |  8 ++++++--
 src/rw/RwMatFX.cpp  |  4 ++--
 4 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 0d839dfa..2c9e784c 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -149,9 +149,14 @@ CGame::InitialiseOnceBeforeRW(void)
 	return true;
 }
 
-#if !defined(LIBRW) && defined(PS2_MATFX)
+#ifndef LIBRW
+#ifdef PS2_MATFX
 void ReplaceMatFxCallback();
-#endif
+#endif // PS2_MATFX
+#ifdef DUAL_PASS_RENDERING
+void ReplaceAtomicPipeCallback();
+#endif // DUAL_PASS_RENDERING
+#endif // !LIBRW
 
 bool
 CGame::InitialiseRenderWare(void)
@@ -203,9 +208,14 @@ CGame::InitialiseRenderWare(void)
 #else
 	rw::MatFX::modulateEnvMap = false;
 #endif
-#elif defined(PS2_MATFX)
+#else
+#ifdef PS2_MATFX
 	ReplaceMatFxCallback();
-#endif
+#endif // PS2_MATFX
+#ifdef DUAL_PASS_RENDERING
+	ReplaceAtomicPipeCallback();
+#endif // DUAL_PASS_RENDERING
+#endif // LIBRW
 	
 	CFont::Initialise();
 	CHud::Initialise();
diff --git a/src/core/config.h b/src/core/config.h
index 8972e7b7..9dfbad03 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -198,6 +198,7 @@ enum Config {
 #define ASPECT_RATIO_SCALE	// Not just makes everything scale with aspect ratio, also adds support for all aspect ratios
 #define DEFAULT_NATIVE_RESOLUTION	// Set default video mode to your native resolution (fixes Windows 10 launch)
 #define USE_TXD_CDIMAGE		// generate and load textures from txd.img
+#define DUAL_PASS_RENDERING // dual pass rendering from SkyGfx 
 #define IMPROVED_VIDEOMODE	// save and load videomode parameters instead of a magic number
 #define DISABLE_LOADING_SCREEN // disable the loading screen which vastly improves the loading time
 //#define NO_ISLAND_LOADING  // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index bf70c8dc..08a8fca4 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -11,7 +11,11 @@
 RtCharset *debugCharset;
 #endif
 
-bool gPS2alphaTest = 1;
+#ifdef DUAL_PASS_RENDERING
+bool gPS2alphaTest = true;
+#else
+bool gPS2alphaTest = false;
+#endif
 
 #ifndef FINAL
 static bool charsetOpen;
@@ -644,4 +648,4 @@ RestoreAlphaTest()
 	RwD3D8SetRenderState(D3DRS_ALPHAREF, saved_alpharef);
 #endif
 }
-#endif
+#endif
\ No newline at end of file
diff --git a/src/rw/RwMatFX.cpp b/src/rw/RwMatFX.cpp
index a128ff1a..c8384b0f 100644
--- a/src/rw/RwMatFX.cpp
+++ b/src/rw/RwMatFX.cpp
@@ -2,7 +2,6 @@
 
 #define WITHD3D
 #include "common.h"
-#include "rwcore.h"
 #include "rpmatfx.h"
 
 struct MatFXNothing { int pad[5]; int effect; };
@@ -305,7 +304,8 @@ ReplaceMatFxCallback()
 {
 	RxD3D8AllInOneSetRenderCallBack(
 	    RxPipelineFindNodeByName(RpMatFXGetD3D8Pipeline(rpMATFXD3D8ATOMICPIPELINE), RxNodeDefinitionGetD3D8AtomicAllInOne()->name, nil, nil),
-		_rwD3D8AtomicMatFXRenderCallback);
+	    _rwD3D8AtomicMatFXRenderCallback);
+	
 }
 #endif // PS2_MATFX
 
-- 
cgit v1.2.3


From 4a4feb948d0f6e67f3ff5c71a7aa23176cabb0e2 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Wed, 29 Jul 2020 15:25:57 +0300
Subject: Add forgotten file

---
 src/rw/RwDualPass.cpp | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 247 insertions(+)
 create mode 100644 src/rw/RwDualPass.cpp

(limited to 'src')

diff --git a/src/rw/RwDualPass.cpp b/src/rw/RwDualPass.cpp
new file mode 100644
index 00000000..c8ebb8ad
--- /dev/null
+++ b/src/rw/RwDualPass.cpp
@@ -0,0 +1,247 @@
+#ifndef LIBRW
+
+#define WITHD3D
+#include "common.h"
+#ifdef DUAL_PASS_RENDERING
+#include "rwcore.h"
+
+extern "C" {
+RwBool _rwD3D8RenderStateIsVertexAlphaEnable(void);
+RwBool _rwD3D8RenderStateVertexAlphaEnable(RwBool enable);
+RwRaster *_rwD3D8RWGetRasterStage(RwUInt32 stage);
+}
+
+extern bool gPS2alphaTest;
+
+void
+_rxD3D8DualPassRenderCallback(RwResEntry *repEntry, void *object, RwUInt8 type, RwUInt32 flags)
+{
+	RxD3D8ResEntryHeader *resEntryHeader;
+	RxD3D8InstanceData *instancedData;
+	RwInt32 numMeshes;
+	RwBool lighting;
+	RwBool vertexAlphaBlend;
+	RwBool forceBlack;
+	RwUInt32 ditherEnable;
+	RwUInt32 shadeMode;
+	void *lastVertexBuffer;
+
+	/* Get lighting state */
+	RwD3D8GetRenderState(D3DRS_LIGHTING, &lighting);
+
+	forceBlack = FALSE;
+
+	if (lighting) {
+		if (flags & rxGEOMETRY_PRELIT) {
+			/* Emmisive color from the vertex colors */
+			RwD3D8SetRenderState(D3DRS_COLORVERTEX, TRUE);
+			RwD3D8SetRenderState(D3DRS_EMISSIVEMATERIALSOURCE, D3DMCS_COLOR1);
+		} else {
+			/* Emmisive color from material, set to black in the submit node */
+			RwD3D8SetRenderState(D3DRS_COLORVERTEX, FALSE);
+			RwD3D8SetRenderState(D3DRS_EMISSIVEMATERIALSOURCE, D3DMCS_MATERIAL);
+		}
+	} else {
+		if ((flags & rxGEOMETRY_PRELIT) == 0) {
+			forceBlack = TRUE;
+
+			RwD3D8GetRenderState(D3DRS_DITHERENABLE, &ditherEnable);
+			RwD3D8GetRenderState(D3DRS_SHADEMODE, &shadeMode);
+
+			RwD3D8SetRenderState(D3DRS_TEXTUREFACTOR, 0xff000000);
+			RwD3D8SetRenderState(D3DRS_DITHERENABLE, FALSE);
+			RwD3D8SetRenderState(D3DRS_SHADEMODE, D3DSHADE_FLAT);
+		}
+	}
+
+	/* Enable clipping */
+	if (type == rpATOMIC) {
+		RpAtomic *atomic;
+		RwCamera *cam;
+
+		atomic = (RpAtomic *)object;
+
+		cam = RwCameraGetCurrentCamera();
+		// RWASSERT(cam);
+
+		if (RwD3D8CameraIsSphereFullyInsideFrustum(cam, RpAtomicGetWorldBoundingSphere(atomic))) {
+			RwD3D8SetRenderState(D3DRS_CLIPPING, FALSE);
+		} else {
+			RwD3D8SetRenderState(D3DRS_CLIPPING, TRUE);
+		}
+	} else {
+		RpWorldSector *worldSector;
+		RwCamera *cam;
+
+		worldSector = (RpWorldSector *)object;
+
+		cam = RwCameraGetCurrentCamera();
+		// RWASSERT(cam);
+
+		if (RwD3D8CameraIsBBoxFullyInsideFrustum(cam, RpWorldSectorGetTightBBox(worldSector))) {
+			RwD3D8SetRenderState(D3DRS_CLIPPING, FALSE);
+		} else {
+			RwD3D8SetRenderState(D3DRS_CLIPPING, TRUE);
+		}
+	}
+
+	/* Set texture to NULL if hasn't any texture flags */
+	if ((flags & (rxGEOMETRY_TEXTURED | rpGEOMETRYTEXTURED2)) == 0) {
+		RwD3D8SetTexture(NULL, 0);
+
+		if (forceBlack) {
+			RwD3D8SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_SELECTARG2);
+			RwD3D8SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_TFACTOR);
+
+			RwD3D8SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+		}
+	}
+
+	/* Get vertex alpha Blend state */
+	vertexAlphaBlend = _rwD3D8RenderStateIsVertexAlphaEnable();
+
+	/* Set Last vertex buffer to force the call */
+	lastVertexBuffer = (void *)0xffffffff;
+
+	/* Get the instanced data */
+	resEntryHeader = (RxD3D8ResEntryHeader *)(repEntry + 1);
+	instancedData = (RxD3D8InstanceData *)(resEntryHeader + 1);
+
+	/*
+	 * Data shared between meshes
+	 */
+
+	/*
+	 * Set the Default Pixel shader
+	 */
+	RwD3D8SetPixelShader(0);
+
+	/*
+	 * Vertex shader
+	 */
+	RwD3D8SetVertexShader(instancedData->vertexShader);
+
+	/* Get the number of meshes */
+	numMeshes = resEntryHeader->numMeshes;
+	while (numMeshes--) {
+		// RWASSERT(instancedData->material != NULL);
+
+		if ((flags & (rxGEOMETRY_TEXTURED | rpGEOMETRYTEXTURED2))) {
+			RwD3D8SetTexture(instancedData->material->texture, 0);
+
+			if (forceBlack) {
+				/* Only change the colorop, we need to use the texture alpha channel */
+				RwD3D8SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_SELECTARG2);
+				RwD3D8SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_TFACTOR);
+			}
+		}
+
+		if (instancedData->vertexAlpha || (0xFF != instancedData->material->color.alpha)) {
+			if (!vertexAlphaBlend) {
+				vertexAlphaBlend = TRUE;
+
+				_rwD3D8RenderStateVertexAlphaEnable(TRUE);
+			}
+		} else {
+			if (vertexAlphaBlend) {
+				vertexAlphaBlend = FALSE;
+
+				_rwD3D8RenderStateVertexAlphaEnable(FALSE);
+			}
+		}
+
+		if (lighting) {
+			if (instancedData->vertexAlpha) {
+				RwD3D8SetRenderState(D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_COLOR1);
+			} else {
+				RwD3D8SetRenderState(D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_MATERIAL);
+			}
+
+			RwD3D8SetSurfaceProperties(&instancedData->material->color, &instancedData->material->surfaceProps, (flags & rxGEOMETRY_MODULATE));
+		}
+
+		/*
+		 * Render
+		 */
+
+		/* Set the stream source */
+		if (lastVertexBuffer != instancedData->vertexBuffer) {
+			RwD3D8SetStreamSource(0, instancedData->vertexBuffer, instancedData->stride);
+
+			lastVertexBuffer = instancedData->vertexBuffer;
+		}
+		if (!gPS2alphaTest) {
+			/* Set the Index buffer */
+			if (instancedData->indexBuffer != NULL) {
+				RwD3D8SetIndices(instancedData->indexBuffer, instancedData->baseIndex);
+
+				/* Draw the indexed primitive */
+				RwD3D8DrawIndexedPrimitive((D3DPRIMITIVETYPE)instancedData->primType, 0, instancedData->numVertices, 0, instancedData->numIndices);
+			} else {
+				RwD3D8DrawPrimitive((D3DPRIMITIVETYPE)instancedData->primType, instancedData->baseIndex, instancedData->numVertices);
+			}
+		} else {
+			RwD3D8SetIndices(instancedData->indexBuffer, instancedData->baseIndex);
+
+			int hasAlpha, alphafunc, alpharef, zwrite;
+			RwD3D8GetRenderState(D3DRS_ALPHABLENDENABLE, &hasAlpha);
+			RwD3D8GetRenderState(D3DRS_ZWRITEENABLE, &zwrite);
+			if (hasAlpha && zwrite) {
+				RwD3D8GetRenderState(D3DRS_ALPHAFUNC, &alphafunc);
+				RwD3D8GetRenderState(D3DRS_ALPHAREF, &alpharef);
+
+				RwD3D8SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
+				RwD3D8SetRenderState(D3DRS_ALPHAREF, 128);
+
+				if (instancedData->indexBuffer)
+					RwD3D8DrawIndexedPrimitive(instancedData->primType, 0, instancedData->numVertices, 0, instancedData->numIndices);
+				else
+					RwD3D8DrawPrimitive(instancedData->primType, instancedData->baseIndex, instancedData->numVertices);
+
+				RwD3D8SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_LESS);
+				RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, FALSE);
+
+				if (instancedData->indexBuffer)
+					RwD3D8DrawIndexedPrimitive(instancedData->primType, 0, instancedData->numVertices, 0, instancedData->numIndices);
+				else
+					RwD3D8DrawPrimitive(instancedData->primType, instancedData->baseIndex, instancedData->numVertices);
+
+				RwD3D8SetRenderState(D3DRS_ALPHAFUNC, alphafunc);
+				RwD3D8SetRenderState(D3DRS_ALPHAREF, alpharef);
+				RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void *)TRUE);
+			} else {
+				if (instancedData->indexBuffer)
+					RwD3D8DrawIndexedPrimitive(instancedData->primType, 0, instancedData->numVertices, 0, instancedData->numIndices);
+				else
+					RwD3D8DrawPrimitive(instancedData->primType, instancedData->baseIndex, instancedData->numVertices);
+			}
+		}
+
+		/* Move onto the next instancedData */
+		instancedData++;
+	}
+
+	if (forceBlack) {
+		RwD3D8SetRenderState(D3DRS_DITHERENABLE, ditherEnable);
+		RwD3D8SetRenderState(D3DRS_SHADEMODE, shadeMode);
+
+		if (_rwD3D8RWGetRasterStage(0)) {
+			RwD3D8SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_MODULATE);
+			RwD3D8SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+		} else {
+			RwD3D8SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_SELECTARG2);
+			RwD3D8SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+		}
+	}
+}
+
+void
+ReplaceAtomicPipeCallback()
+{
+	RxD3D8AllInOneSetRenderCallBack(RxPipelineFindNodeByName(RXPIPELINEGLOBAL(platformAtomicPipeline), RxNodeDefinitionGetD3D8AtomicAllInOne()->name, nil, nil),
+	                                _rxD3D8DualPassRenderCallback);
+}
+
+#endif // DUAL_PASS_RENDERING
+
+#endif // !LIBRW
\ No newline at end of file
-- 
cgit v1.2.3