[Scummvm-cvs-logs] SF.net SVN: scummvm:[44823] scummvm/trunk/engines/sci/gui

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Fri Oct 9 14:10:17 CEST 2009


Revision: 44823
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44823&view=rev
Author:   m_kiewitz
Date:     2009-10-09 12:10:17 +0000 (Fri, 09 Oct 2009)

Log Message:
-----------
SCI/newgui: SciGuiView now also locks resource

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_view.cpp
    scummvm/trunk/engines/sci/gui/gui_view.h

Modified: scummvm/trunk/engines/sci/gui/gui_view.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-09 12:10:08 UTC (rev 44822)
+++ scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-09 12:10:17 UTC (rev 44823)
@@ -49,14 +49,16 @@
 		delete[] _loop[loopNum].cel;
 	}
 	delete[] _loop;
+
+	_resMan->unlockResource(_resource);
 }
 
 void SciGuiView::initData(GuiResourceId resourceId) {
-	Resource *viewResource = _resMan->findResource(ResourceId(kResourceTypeView, resourceId), false);
-	if (!viewResource) {
+	_resource = _resMan->findResource(ResourceId(kResourceTypeView, resourceId), true);
+	if (!_resource) {
 		error("view resource %d not found", resourceId);
 	}
-	_resourceData = viewResource->data;
+	_resourceData = _resource->data;
 
 	byte *celData, *loopData;
 	uint16 celOffset;

Modified: scummvm/trunk/engines/sci/gui/gui_view.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.h	2009-10-09 12:10:08 UTC (rev 44822)
+++ scummvm/trunk/engines/sci/gui/gui_view.h	2009-10-09 12:10:17 UTC (rev 44823)
@@ -71,6 +71,7 @@
 	SciGuiPalette *_palette;
 
 	GuiResourceId _resourceId;
+	Resource *_resource;
 	byte *_resourceData;
 
 	uint16 _loopCount;


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