aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel/heapmem.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2009-10-26 20:08:33 +0000
committerJohannes Schickel2009-10-26 20:08:33 +0000
commit692a4b74dc69f9b8be99456cb02a4421df7c5d6a (patch)
tree24bc789f88113987ab7a117d3e9055529d97055d /engines/tinsel/heapmem.cpp
parenta30b8f0bdc54ac2336535165356840365b02d4d4 (diff)
downloadscummvm-rg350-692a4b74dc69f9b8be99456cb02a4421df7c5d6a.tar.gz
scummvm-rg350-692a4b74dc69f9b8be99456cb02a4421df7c5d6a.tar.bz2
scummvm-rg350-692a4b74dc69f9b8be99456cb02a4421df7c5d6a.zip
Change assert parameter to match the comment above it.
svn-id: r45415
Diffstat (limited to 'engines/tinsel/heapmem.cpp')
-rw-r--r--engines/tinsel/heapmem.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/tinsel/heapmem.cpp b/engines/tinsel/heapmem.cpp
index a3ffea73dc..0e10eab958 100644
--- a/engines/tinsel/heapmem.cpp
+++ b/engines/tinsel/heapmem.cpp
@@ -452,9 +452,8 @@ void MemoryReAlloc(MEM_NODE *pMemNode, long size) {
assert(size);
if (size != pMemNode->size) {
-
// make sure memory object is not locked and discarded
- assert(pMemNode->flags == (DWM_LOCKED | DWM_DISCARDED));
+ assert(!(pMemNode->flags & DWM_LOCKED) && (pMemNode->flags & DWM_DISCARDED));
assert(pMemNode->size == 0);
// unlink the mnode from the current heap