1 files changed, 48 insertions, 8 deletions

diff --git a/src/Streaming.h b/src/Streaming.h
index 2b2efe79..e92819e1 100644
--- a/src/Streaming.h
+++ b/src/Streaming.h
@@ -14,6 +14,7 @@ enum StreamFlags
 	STREAMFLAGS_PRIORITY    = 0x08,
 	STREAMFLAGS_NOFADE      = 0x10,
 
+	// TODO: this isn't named well, maybe CANT_REMOVE?
 	STREAMFLAGS_NOT_IN_LIST = STREAMFLAGS_DONT_REMOVE|STREAMFLAGS_SCRIPTOWNED,
 	STREAMFLAGS_KEEP_IN_MEMORY = STREAMFLAGS_DONT_REMOVE|STREAMFLAGS_SCRIPTOWNED|STREAMFLAGS_DEPENDENCY,
 };
@@ -23,13 +24,16 @@ enum StreamLoadState
 	STREAMSTATE_NOTLOADED = 0,
 	STREAMSTATE_LOADED    = 1,
 	STREAMSTATE_INQUEUE   = 2,
-	STREAMSTATE_READING   = 3,	// what is this?
-	STREAMSTATE_STARTED   = 4,	// first part read
+	STREAMSTATE_READING   = 3,	// channel is reading
+	STREAMSTATE_STARTED   = 4,	// first part loaded
 };
 
 enum ChannelState
 {
-	CHANNELSTATE_0 = 0,
+	CHANNELSTATE_IDLE = 0,
+	CHANNELSTATE_READING = 1,
+	CHANNELSTATE_STARTED = 2,
+	CHANNELSTATE_ERROR = 3,
 };
 
 class CStreamingInfo
@@ -49,17 +53,18 @@ public:
 	void AddToList(CStreamingInfo *link);
 	void RemoveFromList(void);
 	uint32 GetCdSize(void) { return m_size; }
+	bool IsPriority(void) { return !!(m_flags & STREAMFLAGS_PRIORITY); }
 };
 
 struct CStreamingChannel
 {
-	int32 modelIds[4];
+	int32 streamIds[4];
 	int32 offsets[4];
 	int32 state;
 	int32 field24;
 	int32 position;
 	int32 size;
-	int32 field30;
+	int32 numTries;
 	int32 status;	// from CdStream
 };
 
@@ -79,12 +84,14 @@ public:
 	static CStreamingInfo &ms_endRequestedList;
 	static int32 &ms_oldSectorX;
 	static int32 &ms_oldSectorY;
-	static uint32 &ms_streamingBufferSize;
-	static uint8 **ms_pStreamingBuffer;	//[2]
+	static int32 &ms_streamingBufferSize;
+	static int8 **ms_pStreamingBuffer;	//[2]
 	static int32 &ms_memoryUsed;
 	static CStreamingChannel *ms_channel;	//[2]
+	static int32 &ms_channelError;
 	static int32 &ms_numVehiclesLoaded;
 	static int32 *ms_vehiclesLoaded;	//[MAXVEHICLESLOADED]
+	static int32 &ms_lastVehicleDeleted;
 	static CDirectory *&ms_pExtraObjectsDir;
 	static int32 &ms_numPriorityRequests;
 	static bool &ms_hasLoadedLODs;
@@ -104,22 +111,55 @@ public:
 	static bool ConvertBufferToObject(int8 *buf, int32 streamId);
 	static bool FinishLoadingLargeFile(int8 *buf, int32 streamId);
 	static void RequestModel(int32 model, int32 flags);
+	static void ReRequestModel(int32 model) { RequestModel(model, ms_aInfoForModel[model].m_flags); }
 	static void RequestTxd(int32 txd, int32 flags) { RequestModel(txd + STREAM_OFFSET_TXD, flags); }
+	static void ReRequestTxd(int32 txd) { ReRequestModel(txd + STREAM_OFFSET_TXD); }
 	static void RequestSubway(void);
 	static void RequestBigBuildings(eLevelName level);
 	static void RequestIslands(eLevelName level);
 	static void RequestSpecialModel(int32 modelId, const char *modelName, int32 flags);
 	static void RequestSpecialChar(int32 charId, const char *modelName, int32 flags);
+	static void DecrementRef(int32 id);
 	static void RemoveModel(int32 id);
-
+	static void RemoveTxd(int32 id) { RemoveModel(id + STREAM_OFFSET_TXD); }
+	static void RemoveUnusedBuildings(eLevelName level);
+	static void RemoveBuildings(eLevelName level);
+	static void RemoveUnusedBigBuildings(eLevelName level);
+	static void RemoveIslandsNotUsed(eLevelName level);
+	static void RemoveBigBuildings(eLevelName level);
+	static bool RemoveLoadedVehicle(void);
+	static bool RemoveLeastUsedModel(void);
+	static void RemoveAllUnusedModels(void);
+	static void RemoveUnusedModelsInLoadedList(void);
+	static bool RemoveReferencedTxds(int32 mem);
+	static int32 GetAvailableVehicleSlot(void);
 	static bool IsTxdUsedByRequestedModels(int32 txdId);
 	static bool AddToLoadedVehiclesList(int32 modelId);
+	static bool IsObjectInCdImage(int32 id);
+	static void HaveAllBigBuildingsLoaded(eLevelName level);
+	static void SetModelIsDeletable(int32 id);
+	static void SetModelTxdIsDeletable(int32 id);
+	static void SetMissionDoesntRequireModel(int32 id);
+
+	static int32 GetCdImageOffset(int32 lastPosn);
+	static int32 GetNextFileOnCd(int32 position, bool priority);
+	static void RequestModelStream(int32 ch);
+	static bool ProcessLoadingChannel(int32 ch);
+	static void RetryLoadFile(int32 ch);
+	static void LoadRequestedModels(void);
+	static void LoadAllRequestedModels(bool priority);
+	static void FlushChannels(void);
+	static void FlushRequestList(void);
 
 	static void MakeSpaceFor(int32 size);
 	static void ImGonnaUseStreamingMemory(void);
 	static void IHaveUsedStreamingMemory(void);
 	static void UpdateMemoryUsed(void);
 
+
+	static void LoadInitialPeds(void);
+	static void LoadInitialVehicles(void);
+
 	static void LoadScene(CVector *pos);
 	static void LoadAllRequestedModels(bool);
 };