Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size)

Browse Source
This commit is contained in:
Filip Gawin 2020-10-03 16:17:24 +02:00
parent fa65cf6017
commit 0ac2be0093
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/Streaming.cpp
View File

@ -2436,12 +2436,17 @@ CStreaming::DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, size_t mem)
void void
CStreaming::MakeSpaceFor(int32 size) CStreaming::MakeSpaceFor(int32 size)
{ {
// BUG: ms_memoryAvailable can be uninitialized #ifdef FIX_BUGS
// the code still happens to work in that case because ms_memoryAvailable is unsigned #define MB (1024 * 1024)
// but it's not nice.... if(ms_memoryAvailable == 0) {
extern size_t _dwMemAvailPhys;
ms_memoryAvailable = (_dwMemAvailPhys - 10 * MB) / 2;
if(ms_memoryAvailable < 50 * MB) ms_memoryAvailable = 50 * MB;
}
#undef MB
#endif
while(ms_memoryUsed >= ms_memoryAvailable - size) while(ms_memoryUsed >= ms_memoryAvailable - size)
if(!RemoveLeastUsedModel()){ if(!RemoveLeastUsedModel()) {
DeleteRwObjectsBehindCamera(ms_memoryAvailable - size); DeleteRwObjectsBehindCamera(ms_memoryAvailable - size);
return; return;
} }