diff options
| author | Max Horn | 2009-10-26 10:41:28 +0000 |
|---|---|---|
| committer | Max Horn | 2009-10-26 10:41:28 +0000 |
| commit | e963dfbd172dd461bf246a09552eca5c07cb52b1 (patch) | |
| tree | 323d64ace6784853518835ec3c9a5518389b84b2 /engines/tinsel/handle.cpp | |
| parent | bbe0b81aff36cc188d598ba3d66cc2521e14c0f2 (diff) | |
| download | scummvm-rg350-e963dfbd172dd461bf246a09552eca5c07cb52b1.tar.gz scummvm-rg350-e963dfbd172dd461bf246a09552eca5c07cb52b1.tar.bz2 scummvm-rg350-e963dfbd172dd461bf246a09552eca5c07cb52b1.zip | |
TINSEL: Remove dead stuff from memory managment code, doxygenify some comments
svn-id: r45402
Diffstat (limited to 'engines/tinsel/handle.cpp')
| -rw-r--r-- | engines/tinsel/handle.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp index b1d4e608df..87989a6edb 100644 --- a/engines/tinsel/handle.cpp +++ b/engines/tinsel/handle.cpp @@ -171,7 +171,7 @@ void SetupHandleTable(void) { else { // allocate a discarded memory node for other files pH->_node = MemoryAlloc( - DWM_MOVEABLE | DWM_DISCARDABLE | DWM_NOALLOC, + DWM_DISCARDABLE | DWM_NOALLOC, pH->filesize & FSIZE_MASK); pH->_ptr = NULL; @@ -383,8 +383,7 @@ byte *LockMem(SCNHANDLE offset) { if (pH->_node->pBaseAddr == NULL) // must have been discarded - reallocate the memory - MemoryReAlloc(pH->_node, cdTopHandle-cdBaseHandle, - DWM_MOVEABLE | DWM_DISCARDABLE); + MemoryReAlloc(pH->_node, cdTopHandle - cdBaseHandle, DWM_DISCARDABLE); if (pH->_node->pBaseAddr == NULL) error("Out of memory"); @@ -406,8 +405,7 @@ byte *LockMem(SCNHANDLE offset) { if (pH->_node->pBaseAddr == NULL) // must have been discarded - reallocate the memory - MemoryReAlloc(pH->_node, pH->filesize & FSIZE_MASK, - DWM_MOVEABLE | DWM_DISCARDABLE); + MemoryReAlloc(pH->_node, pH->filesize & FSIZE_MASK, DWM_DISCARDABLE); if (pH->_node->pBaseAddr == NULL) error("Out of memory"); @@ -451,7 +449,7 @@ void LockScene(SCNHANDLE offset) { // WORKAROUND: The original didn't include the DWM_LOCKED flag. It's being // included because the method is 'LockScene' so it's presumed that the // point of this was that the scene's memory block be locked - MemoryReAlloc(pH->_node, pH->filesize & FSIZE_MASK, DWM_MOVEABLE | DWM_LOCKED); + MemoryReAlloc(pH->_node, pH->filesize & FSIZE_MASK, DWM_LOCKED); #ifdef DEBUG bLockedScene = true; #endif @@ -474,7 +472,7 @@ void UnlockScene(SCNHANDLE offset) { if ((pH->filesize & fPreload) == 0) { // change the flags for the node - MemoryReAlloc(pH->_node, pH->filesize & FSIZE_MASK, DWM_MOVEABLE | DWM_DISCARDABLE); + MemoryReAlloc(pH->_node, pH->filesize & FSIZE_MASK, DWM_DISCARDABLE); #ifdef DEBUG bLockedScene = false; #endif |