1 files changed, 85 insertions, 8 deletions

diff --git a/src/rw/TxdStore.cpp b/src/rw/TxdStore.cpp
index 0bd29718..b7936bcf 100644
--- a/src/rw/TxdStore.cpp
+++ b/src/rw/TxdStore.cpp
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include "main.h"
+#include "smallHeap.h"
 #include "templates.h"
 #include "General.h"
 #include "Streaming.h"
@@ -9,13 +11,19 @@
 CPool<TxdDef,TxdDef> *CTxdStore::ms_pTxdPool;
 RwTexDictionary *CTxdStore::ms_pStoredTxd;
 
+// LCS: file done except unused:
+// CTexListStore::RemoveTexListChunk(int)
+// CTexListStore::validateRefs(void)
+// CTexListStore::Write(base::cRelocatableChunkWriter &)
+
 void
 CTxdStore::Initialise(void)
 {
-	if(ms_pTxdPool == nil)
+	if(gMakeResources && ms_pTxdPool == nil)
 		ms_pTxdPool = new CPool<TxdDef,TxdDef>(TXDSTORESIZE, "TexDictionary");
 }
 
+// removed in LCS but we should probably keep it
 void
 CTxdStore::Shutdown(void)
 {
@@ -23,6 +31,7 @@ CTxdStore::Shutdown(void)
 		delete ms_pTxdPool;
 }
 
+// removed in LCS but we should probably keep it
 void
 CTxdStore::GameShutdown(void)
 {
@@ -42,6 +51,7 @@ CTxdStore::AddTxdSlot(const char *name)
 	assert(def);
 	def->texDict = nil;
 	def->refCount = 0;
+	def->refCountGu = 0;
 	strcpy(def->name, name);
 	return ms_pTxdPool->GetJustIndex(def);
 }
@@ -95,7 +105,11 @@ CTxdStore::SetCurrentTxd(int slot)
 void
 CTxdStore::Create(int slot)
 {
-	GetSlot(slot)->texDict = RwTexDictionaryCreate();
+	TxdDef *def = GetSlot(slot);
+	def->texDict = RwTexDictionaryCreate();
+	// LCS: mobile sets the txd name here, but txds don't really have names
+	def->refCount = 0;
+	def->refCountGu = 0;
 }
 
 int
@@ -111,6 +125,20 @@ CTxdStore::AddRef(int slot)
 }
 
 void
+CTxdStore::AddRefEvenIfNotInMemory(int slot)
+{
+	GetSlot(slot)->refCount++;
+}
+
+void
+CTxdStore::AddRefGu(int slot)
+{
+	TxdDef *def = GetSlot(slot);
+	def->refCount++;
+	def->refCountGu++;
+}
+
+void
 CTxdStore::RemoveRef(int slot)
 {
 	if(--GetSlot(slot)->refCount <= 0)
@@ -118,6 +146,15 @@ CTxdStore::RemoveRef(int slot)
 }
 
 void
+CTxdStore::RemoveRefGu(int slot)
+{
+	TxdDef *def = GetSlot(slot);
+	def->refCount--;
+	if(gUseChunkFiles)
+		def->refCountGu--;
+}
+
+void
 CTxdStore::RemoveRefWithoutDelete(int slot)
 {
 	GetSlot(slot)->refCount--;
@@ -128,15 +165,32 @@ CTxdStore::LoadTxd(int slot, RwStream *stream)
 {
 	TxdDef *def = GetSlot(slot);
 
-	if(RwStreamFindChunk(stream, rwID_TEXDICTIONARY, nil, nil)){
-		def->texDict = RwTexDictionaryGtaStreamRead(stream);
-		return def->texDict != nil;
+	if(stream){
+		if(RwStreamFindChunk(stream, rwID_TEXDICTIONARY, nil, nil)){
+			def->texDict = RwTexDictionaryGtaStreamRead(stream);
+			return def->texDict != nil;
+		}
+	}else{
+		// TODO(LCS)? fall back reading from file
 	}
 	printf("Failed to load TXD\n");
 	return false;
 }
 
 bool
+CTxdStore::LoadTxd(int slot, void *data, void *chunk)
+{
+	TxdDef *def = GetSlot(slot);
+	def->texDict = (RwTexDictionary*)data;
+	if(strncasecmp(def->name, "radar", 5) == 0){
+		def->refCount = 0;
+		def->refCountGu = 0;
+	}
+	CStreaming::RegisterPointer(&def->texDict, 3, true);
+	return def->texDict != nil;
+}
+
+bool
 CTxdStore::LoadTxd(int slot, const char *filename)
 {
 	RwStream *stream;
@@ -152,6 +206,7 @@ CTxdStore::LoadTxd(int slot, const char *filename)
 	return ret;
 }
 
+// removed in LCS but we should probably keep it
 bool
 CTxdStore::StartLoadTxd(int slot, RwStream *stream)
 {
@@ -165,6 +220,7 @@ CTxdStore::StartLoadTxd(int slot, RwStream *stream)
 	}
 }
 
+// removed in LCS but we should probably keep it
 bool
 CTxdStore::FinishLoadTxd(int slot, RwStream *stream)
 {
@@ -174,10 +230,31 @@ CTxdStore::FinishLoadTxd(int slot, RwStream *stream)
 }
 
 void
-CTxdStore::RemoveTxd(int slot)
+CTxdStore::RemoveTxd(int slot, bool notChunk)
 {
 	TxdDef *def = GetSlot(slot);
-	if(def->texDict)
-		RwTexDictionaryDestroy(def->texDict);
+	if(def->texDict){
+		if(!gUseChunkFiles || notChunk)
+			RwTexDictionaryDestroy(def->texDict);
+		else{
+			// TODO? Rsl3D specific: RslTextureDestroyDispList for all textures
+			CStreaming::UnregisterPointer(&def->texDict, 3);
+			cSmallHeap::msInstance.Free(def->texDict);
+		}
+	}
 	def->texDict = nil;
+	def->refCount = 0;
+	def->refCountGu = 0;
+}
+
+void
+CTxdStore::Load(RwTexDictionary *stored, CPool<TxdDef> *pool)
+{
+	ms_pTxdPool = pool;
+	ms_pStoredTxd = stored;
+	for(int i = 0; i < TXDSTORESIZE; i++){
+		TxdDef *def = GetSlot(i);
+		if(def)
+			def->refCount = def->texDict != nil;
+	}
 }