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

[fingolfin at users.sourceforge.net]

Revision: 38595
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38595&view=rev
Author:   fingolfin
Date:     2009-02-20 15:47:37 +0000 (Fri, 20 Feb 2009)

Log Message:
-----------
SCI: Removed unused allow_patches param/member

Modified Paths:
--------------
    scummvm/trunk/engines/sci/include/sciresource.h
    scummvm/trunk/engines/sci/sci.cpp
    scummvm/trunk/engines/sci/scicore/resource.cpp

Modified: scummvm/trunk/engines/sci/include/sciresource.h
===================================================================
--- scummvm/trunk/engines/sci/include/sciresource.h	2009-02-20 15:44:22 UTC (rev 38594)
+++ scummvm/trunk/engines/sci/include/sciresource.h	2009-02-20 15:47:37 UTC (rev 38595)
@@ -188,8 +188,6 @@
 
 	resource_t *lru_first, *lru_last; /* Pointers to the first and last LRU queue entries */
 	/* LRU queue: lru_first points to the most recent entry */
-
-	unsigned char allow_patches;
 } ResourceManager;
 
 /**** FUNCTION DECLARATIONS ****/
@@ -197,14 +195,12 @@
 /**--- New Resource manager ---**/
 
 ResourceManager *
-scir_new_resource_manager(char *dir, int version, char allow_patches, int max_memory);
+scir_new_resource_manager(char *dir, int version, int max_memory);
 /* Creates a new FreeSCI resource manager
 ** Parameters: (char *) dir: Path to the resource and patch files (not modified or freed
 **                           by the resource manager)
 **             (int) version: The SCI version to look for; use SCI_VERSION_AUTODETECT
 **                            in the default case.
-**             (char ) allow_patches: Set to 1 if external patches (those look like
-**                                   "view.101" or "script.093") should be applied
 **             (int) max_memory: Maximum number of bytes to allow allocated for resources
 ** Returns   : (ResourceManager *) A newly allocated resource manager
 ** max_memory will not be interpreted as a hard limit, only as a restriction for resources

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2009-02-20 15:44:22 UTC (rev 38594)
+++ scummvm/trunk/engines/sci/sci.cpp	2009-02-20 15:47:37 UTC (rev 38595)
@@ -199,7 +199,7 @@
 	char resource_dir[MAXPATHLEN+1] = "";
 	getcwd(resource_dir, MAXPATHLEN); /* Store resource directory */
 
-	resmgr = scir_new_resource_manager(resource_dir, res_version, 1, 256 * 1024);
+	resmgr = scir_new_resource_manager(resource_dir, res_version, 256 * 1024);
 
 	if (!resmgr) {
 		printf("No resources found in '%s'.\nAborting...\n",

Modified: scummvm/trunk/engines/sci/scicore/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource.cpp	2009-02-20 15:44:22 UTC (rev 38594)
+++ scummvm/trunk/engines/sci/scicore/resource.cpp	2009-02-20 15:47:37 UTC (rev 38595)
@@ -426,7 +426,6 @@
 
 int
 scir_add_appropriate_sources(ResourceManager *mgr,
-                             int allow_patches,
                              char *dir) {
 	const char *trailing_slash = "";
 	//char path_separator;
@@ -577,8 +576,7 @@
 }
 
 ResourceManager *
-scir_new_resource_manager(char *dir, int version,
-                          char allow_patches, int max_memory) {
+scir_new_resource_manager(char *dir, int version, int max_memory) {
 	int resource_error = 0;
 	ResourceManager *mgr = (ResourceManager*)sci_malloc(sizeof(ResourceManager));
 	char *caller_cwd = sci_getcwd();
@@ -602,7 +600,7 @@
 	mgr->sources = NULL;
 	mgr->sci_version = version;
 
-	scir_add_appropriate_sources(mgr, allow_patches, dir);
+	scir_add_appropriate_sources(mgr, dir);
 	scir_scan_new_sources(mgr, &resmap_version);
 
 	if (!mgr->resources || !mgr->resources_nr) {
@@ -621,8 +619,6 @@
 	mgr->lru_first = NULL;
 	mgr->lru_last = NULL;
 
-	mgr->allow_patches = allow_patches;
-
 	qsort(mgr->resources, mgr->resources_nr, sizeof(resource_t),
 	      resourcecmp); /* Sort resources */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.