summaryrefslogtreecommitdiffstats
path: root/src/core/Streaming.h
diff options
context:
space:
mode:
authorshfil <filip.gawin@zoho.com>2020-07-22 23:02:11 +0200
committerGitHub <noreply@github.com>2020-07-22 23:02:11 +0200
commit98dd771d6cf3adb7153700040f122cd0916d5eeb (patch)
tree5578c27b5739341d34def86586a68f1f1129e1bb /src/core/Streaming.h
parentREADME 64-bit preparation (diff)
parent64-bit on Windows (diff)
downloadre3-98dd771d6cf3adb7153700040f122cd0916d5eeb.tar
re3-98dd771d6cf3adb7153700040f122cd0916d5eeb.tar.gz
re3-98dd771d6cf3adb7153700040f122cd0916d5eeb.tar.bz2
re3-98dd771d6cf3adb7153700040f122cd0916d5eeb.tar.lz
re3-98dd771d6cf3adb7153700040f122cd0916d5eeb.tar.xz
re3-98dd771d6cf3adb7153700040f122cd0916d5eeb.tar.zst
re3-98dd771d6cf3adb7153700040f122cd0916d5eeb.zip
Diffstat (limited to 'src/core/Streaming.h')
-rw-r--r--src/core/Streaming.h12
1 files changed, 6 insertions, 6 deletions
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);