diff options
| author | Max Horn | 2009-10-04 18:38:18 +0000 |
|---|---|---|
| committer | Max Horn | 2009-10-04 18:38:18 +0000 |
| commit | 6ad5840181557a42be4812984fb38d3f47c3e66a (patch) | |
| tree | ba4ab9536c38b67d1dbb53707c76e733558cb196 /engines/sci/gui | |
| parent | 0da9ad5ff59e910c91becf1ba62ee5e864d25c32 (diff) | |
| download | scummvm-rg350-6ad5840181557a42be4812984fb38d3f47c3e66a.tar.gz scummvm-rg350-6ad5840181557a42be4812984fb38d3f47c3e66a.tar.bz2 scummvm-rg350-6ad5840181557a42be4812984fb38d3f47c3e66a.zip | |
SCI: Rename EngineState::segMan to _segMan
svn-id: r44629
Diffstat (limited to 'engines/sci/gui')
| -rw-r--r-- | engines/sci/gui/gui_gfx.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp index deefa6005f..6644517c0c 100644 --- a/engines/sci/gui/gui_gfx.cpp +++ b/engines/sci/gui/gui_gfx.cpp @@ -838,18 +838,18 @@ GUIMemoryHandle SciGUIgfx::SaveBits(const Common::Rect &rect, byte screenMask) { // now actually ask _screen how much space it will need for saving size = _screen->BitsGetDataSize(r, screenMask); - memoryId = kalloc(_s->segMan, "SaveBits()", size); - memoryPtr = kmem(_s->segMan, memoryId); + memoryId = kalloc(_s->_segMan, "SaveBits()", size); + memoryPtr = kmem(_s->_segMan, memoryId); _screen->BitsSave(r, screenMask, memoryPtr); return memoryId; } void SciGUIgfx::RestoreBits(GUIMemoryHandle memoryHandle) { - byte *memoryPtr = kmem(_s->segMan, memoryHandle);; + byte *memoryPtr = kmem(_s->_segMan, memoryHandle);; if (memoryPtr) { _screen->BitsRestore(memoryPtr); - kfree(_s->segMan, memoryHandle); + kfree(_s->_segMan, memoryHandle); } } @@ -1331,7 +1331,7 @@ void SciGUIgfx::AnimateRestoreAndDelete() { } void SciGUIgfx::SetNowSeen(reg_t objectReference) { - SegManager *segMan = _s->segMan; + SegManager *segMan = _s->_segMan; SciGUIview *view = NULL; Common::Rect cellRect(0, 0); GUIResourceId viewId = (GUIResourceId)GET_SEL32V(objectReference, view); @@ -1349,7 +1349,7 @@ void SciGUIgfx::SetNowSeen(reg_t objectReference) { view->getCellRect(loopNo, cellNo, x, y, z, &cellRect); // TODO: sometimes loop is negative. Check what it means - if (lookup_selector(_s->segMan, objectReference, _s->_kernel->_selectorCache.nsTop, NULL, NULL) == kSelectorVariable) { + if (lookup_selector(_s->_segMan, objectReference, _s->_kernel->_selectorCache.nsTop, NULL, NULL) == kSelectorVariable) { PUT_SEL32V(objectReference, nsLeft, cellRect.left); PUT_SEL32V(objectReference, nsRight, cellRect.right); PUT_SEL32V(objectReference, nsTop, cellRect.top); |