diff options
| author | aap <aap@papnet.eu> | 2020-08-20 12:53:17 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-08-20 12:53:17 +0200 |
| commit | 764af8735c00a7f40a51f605fed3c73ce6413337 (patch) | |
| tree | 3009c3e5da4a39e7e64446e654ee3689b8e91632 /src/rw/TxdStore.cpp | |
| parent | transmission done (diff) | |
| download | re3-764af8735c00a7f40a51f605fed3c73ce6413337.tar re3-764af8735c00a7f40a51f605fed3c73ce6413337.tar.gz re3-764af8735c00a7f40a51f605fed3c73ce6413337.tar.bz2 re3-764af8735c00a7f40a51f605fed3c73ce6413337.tar.lz re3-764af8735c00a7f40a51f605fed3c73ce6413337.tar.xz re3-764af8735c00a7f40a51f605fed3c73ce6413337.tar.zst re3-764af8735c00a7f40a51f605fed3c73ce6413337.zip | |
Diffstat (limited to 'src/rw/TxdStore.cpp')
| -rw-r--r-- | src/rw/TxdStore.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/rw/TxdStore.cpp b/src/rw/TxdStore.cpp index 51d018f6..0bd29718 100644 --- a/src/rw/TxdStore.cpp +++ b/src/rw/TxdStore.cpp @@ -13,7 +13,7 @@ void CTxdStore::Initialise(void) { if(ms_pTxdPool == nil) - ms_pTxdPool = new CPool<TxdDef,TxdDef>(TXDSTORESIZE); + ms_pTxdPool = new CPool<TxdDef,TxdDef>(TXDSTORESIZE, "TexDictionary"); } void @@ -58,11 +58,10 @@ CTxdStore::RemoveTxdSlot(int slot) int CTxdStore::FindTxdSlot(const char *name) { - char *defname; int size = ms_pTxdPool->GetSize(); for(int i = 0; i < size; i++){ - defname = GetTxdName(i); - if(defname && !CGeneral::faststricmp(defname, name)) + TxdDef *def = GetSlot(i); + if(def && !CGeneral::faststricmp(def->name, name)) return i; } return -1; @@ -71,8 +70,7 @@ CTxdStore::FindTxdSlot(const char *name) char* CTxdStore::GetTxdName(int slot) { - TxdDef *def = GetSlot(slot); - return def ? def->name : nil; + return GetSlot(slot)->name; } void @@ -91,9 +89,7 @@ CTxdStore::PopCurrentTxd(void) void CTxdStore::SetCurrentTxd(int slot) { - TxdDef *def = GetSlot(slot); - if(def) - RwTexDictionarySetCurrent(def->texDict); + RwTexDictionarySetCurrent(GetSlot(slot)->texDict); } void @@ -118,7 +114,7 @@ void CTxdStore::RemoveRef(int slot) { if(--GetSlot(slot)->refCount <= 0) - CStreaming::RemoveModel(slot + STREAM_OFFSET_TXD); + CStreaming::RemoveTxd(slot); } void |