summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-08-19 14:58:43 +0200
committeraap <aap@papnet.eu>2020-08-19 14:58:43 +0200
commit5ac83e4b4cb945a40bf3175b89b78965595679d2 (patch)
tree491b70213475a5df1619f2c5760b11c6a4a19179
parentMerge pull request #687 from Nick007J/miami (diff)
downloadre3-5ac83e4b4cb945a40bf3175b89b78965595679d2.tar
re3-5ac83e4b4cb945a40bf3175b89b78965595679d2.tar.gz
re3-5ac83e4b4cb945a40bf3175b89b78965595679d2.tar.bz2
re3-5ac83e4b4cb945a40bf3175b89b78965595679d2.tar.lz
re3-5ac83e4b4cb945a40bf3175b89b78965595679d2.tar.xz
re3-5ac83e4b4cb945a40bf3175b89b78965595679d2.tar.zst
re3-5ac83e4b4cb945a40bf3175b89b78965595679d2.zip
-rw-r--r--src/core/Streaming.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 3c32b856..b6a4f735 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -199,11 +199,25 @@ CStreaming::Init2(void)
ms_pStreamingBuffer[1] = ms_pStreamingBuffer[0] + ms_streamingBufferSize*CDSTREAM_SECTOR_SIZE;
debug("Streaming buffer size is %d sectors", ms_streamingBufferSize);
+ // PC only, figure out how much memory we got
+#ifdef GTA_PC
#define MB (1024*1024)
+#ifdef FIX_BUGS
+ // do what gta3 does
+ extern size_t _dwMemAvailPhys;
+ ms_memoryAvailable = (_dwMemAvailPhys - 10*MB)/2;
+ if(ms_memoryAvailable < 65*MB)
+ ms_memoryAvailable = 65*MB;
+ desiredNumVehiclesLoaded = (int32)((ms_memoryAvailable / MB - 65) / 3 + 12);
+ if(desiredNumVehiclesLoaded > MAXVEHICLESLOADED)
+ desiredNumVehiclesLoaded = MAXVEHICLESLOADED;
+#else
ms_memoryAvailable = 65 * MB;
desiredNumVehiclesLoaded = 25;
- debug("Memory allocated to Streaming is %dMB", ms_memoryAvailable / MB);
+ debug("Memory allocated to Streaming is %zuMB", ms_memoryAvailable/MB); // original modifier was %d
+#endif
#undef MB
+#endif
// find island LODs