summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-15 11:41:27 +0200
committeraap <aap@papnet.eu>2019-06-15 11:41:27 +0200
commit25605045bcf04d3bf7b982e7fa582eab564dc7d1 (patch)
treed0c2c68e2a84e73a6cab399b840bb9ceb4565539 /src
parentMerge pull request #13 from ShFil119/CIdebug (diff)
downloadre3-25605045bcf04d3bf7b982e7fa582eab564dc7d1.tar
re3-25605045bcf04d3bf7b982e7fa582eab564dc7d1.tar.gz
re3-25605045bcf04d3bf7b982e7fa582eab564dc7d1.tar.bz2
re3-25605045bcf04d3bf7b982e7fa582eab564dc7d1.tar.lz
re3-25605045bcf04d3bf7b982e7fa582eab564dc7d1.tar.xz
re3-25605045bcf04d3bf7b982e7fa582eab564dc7d1.tar.zst
re3-25605045bcf04d3bf7b982e7fa582eab564dc7d1.zip
Diffstat (limited to '')
-rw-r--r--src/TxdStore.cpp2
-rw-r--r--src/TxdStore.h7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/TxdStore.cpp b/src/TxdStore.cpp
index 291feb2f..6ff7e852 100644
--- a/src/TxdStore.cpp
+++ b/src/TxdStore.cpp
@@ -29,7 +29,7 @@ CTxdStore::GameShutdown(void)
for(i = 0; i < TXDSTORESIZE; i++){
TxdDef *def = GetSlot(i);
- if(def && GetNumRefs(i))
+ if(def && GetNumRefs(i) == 0)
RemoveTxdSlot(i);
}
}
diff --git a/src/TxdStore.h b/src/TxdStore.h
index 50a94a75..a9e57d31 100644
--- a/src/TxdStore.h
+++ b/src/TxdStore.h
@@ -34,6 +34,11 @@ public:
static bool FinishLoadTxd(int slot, RwStream *stream);
static void RemoveTxd(int slot);
- static TxdDef *GetSlot(int slot) { return ms_pTxdPool->GetSlot(slot); }
+ static TxdDef *GetSlot(int slot) {
+ assert(slot >= 0);
+ assert(ms_pTxdPool);
+ assert(slot < ms_pTxdPool->GetSize());
+ return ms_pTxdPool->GetSlot(slot);
+ }
static bool isTxdLoaded(int slot);
};