From 7c74e81e0ac7f9482c3732cb9305929d9e83a0c4 Mon Sep 17 00:00:00 2001 From: Simei Yin Date: Sun, 15 Apr 2018 21:10:02 +0200 Subject: SLUDGE: Objectify PeopleManager --- engines/sludge/cursors.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'engines/sludge/cursors.cpp') diff --git a/engines/sludge/cursors.cpp b/engines/sludge/cursors.cpp index 0c7745e9ff..849a627c73 100644 --- a/engines/sludge/cursors.cpp +++ b/engines/sludge/cursors.cpp @@ -44,18 +44,18 @@ CursorManager::~CursorManager() { } void CursorManager::init() { - _mouseCursorAnim = makeNullAnim(); + _mouseCursorAnim = _vm->_peopleMan->makeNullAnim(); _mouseCursorFrameNum = 0; _mouseCursorCountUp = 0; } void CursorManager::kill() { - deleteAnim(_mouseCursorAnim); + _vm->_peopleMan->deleteAnim(_mouseCursorAnim); _mouseCursorAnim = nullptr; } void CursorManager::pickAnimCursor(PersonaAnimation *pp) { - deleteAnim(_mouseCursorAnim); + _vm->_peopleMan->deleteAnim(_mouseCursorAnim); _mouseCursorAnim = pp; _mouseCursorFrameNum = 0; _mouseCursorCountUp = 0; @@ -107,18 +107,18 @@ void CursorManager::pasteCursor(int x, int y, PersonaAnimation *c) { void CursorManager::freeze(FrozenStuffStruct *frozenStuff) { frozenStuff->mouseCursorAnim = _mouseCursorAnim; frozenStuff->mouseCursorFrameNum = _mouseCursorFrameNum; - _mouseCursorAnim = makeNullAnim(); + _mouseCursorAnim = _vm->_peopleMan->makeNullAnim(); _mouseCursorFrameNum = 0; } void CursorManager::resotre(FrozenStuffStruct *frozenStuff) { - deleteAnim(_mouseCursorAnim); + _vm->_peopleMan->deleteAnim(_mouseCursorAnim); _mouseCursorAnim = frozenStuff->mouseCursorAnim; _mouseCursorFrameNum = frozenStuff->mouseCursorFrameNum; } void CursorManager::saveCursor(Common::WriteStream *stream) { - saveAnim(_mouseCursorAnim, stream); + _vm->_peopleMan->saveAnim(_mouseCursorAnim, stream); stream->writeUint16BE(_mouseCursorFrameNum); } @@ -126,7 +126,7 @@ bool CursorManager::loadCursor(Common::SeekableReadStream *stream) { _mouseCursorAnim = new PersonaAnimation; if (!checkNew(_mouseCursorAnim)) return false; - if (!loadAnim(_mouseCursorAnim, stream)) + if (!_vm->_peopleMan->loadAnim(_mouseCursorAnim, stream)) return false; _mouseCursorFrameNum = stream->readUint16BE(); return true; -- cgit v1.2.3