[Scummvm-cvs-logs] SF.net SVN: scummvm:[53014] scummvm/trunk/engines/sci/graphics/cursor.cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Mon Oct 4 11:23:06 CEST 2010
Revision: 53014
http://scummvm.svn.sourceforge.net/scummvm/?rev=53014&view=rev
Author: m_kiewitz
Date: 2010-10-04 09:23:06 +0000 (Mon, 04 Oct 2010)
Log Message:
-----------
SCI: fixing crash in mag cursor code for pharkas
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/cursor.cpp
Modified: scummvm/trunk/engines/sci/graphics/cursor.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/cursor.cpp 2010-10-04 08:47:39 UTC (rev 53013)
+++ scummvm/trunk/engines/sci/graphics/cursor.cpp 2010-10-04 09:23:06 UTC (rev 53014)
@@ -411,6 +411,8 @@
_zoomColor = 0;
_zoomMultiplier = 0;
_zoomZoneActive = false;
+ delete _zoomCursorView;
+ delete _zoomPicView;
}
void GfxCursor::kernelSetZoomZone(byte multiplier, Common::Rect zone, GuiResourceId viewNum, int loopNum, int celNum, GuiResourceId picNum, byte zoomColor) {
@@ -421,21 +423,11 @@
_zoomMultiplier = multiplier;
- if (_cachedCursors.size() >= MAX_CACHED_CURSORS)
- purgeCache();
-
- if (!_cachedCursors.contains(viewNum))
- _cachedCursors[viewNum] = new GfxView(_resMan, _screen, _palette, viewNum);
- if (!_cachedCursors.contains(picNum))
- _cachedCursors[picNum] = new GfxView(_resMan, _screen, _palette, picNum);
-
- _zoomCursorView = _cachedCursors[viewNum];
+ _zoomCursorView = new GfxView(_resMan, _screen, _palette, viewNum);
_zoomCursorLoop = (byte)loopNum;
_zoomCursorCel = (byte)celNum;
- _zoomPicView = _cachedCursors[picNum];
+ _zoomPicView = new GfxView(_resMan, _screen, _palette, picNum);
- kernelSetView(viewNum, loopNum, celNum, NULL);
-
_zoomZone = zone;
kernelSetMoveZone(_zoomZone);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list