summaryrefslogtreecommitdiffstats
path: root/src/rw/TxdStore.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-08-20 12:55:41 +0200
committeraap <aap@papnet.eu>2020-08-20 12:55:41 +0200
commit517e2ee9a5fa6f9100378cdcb24a3acd68c01f89 (patch)
treea194c407c50f764dc286dae851e60e4d62f53d0d /src/rw/TxdStore.cpp
parentupdate librw (diff)
downloadre3-517e2ee9a5fa6f9100378cdcb24a3acd68c01f89.tar
re3-517e2ee9a5fa6f9100378cdcb24a3acd68c01f89.tar.gz
re3-517e2ee9a5fa6f9100378cdcb24a3acd68c01f89.tar.bz2
re3-517e2ee9a5fa6f9100378cdcb24a3acd68c01f89.tar.lz
re3-517e2ee9a5fa6f9100378cdcb24a3acd68c01f89.tar.xz
re3-517e2ee9a5fa6f9100378cdcb24a3acd68c01f89.tar.zst
re3-517e2ee9a5fa6f9100378cdcb24a3acd68c01f89.zip
Diffstat (limited to 'src/rw/TxdStore.cpp')
-rw-r--r--src/rw/TxdStore.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/rw/TxdStore.cpp b/src/rw/TxdStore.cpp
index 51d018f6..a9e29729 100644
--- a/src/rw/TxdStore.cpp
+++ b/src/rw/TxdStore.cpp
@@ -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