diff options
| -rw-r--r-- | engines/sci/include/sciresource.h | 6 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/scicore/resource.cpp | 8 |
3 files changed, 4 insertions, 12 deletions
diff --git a/engines/sci/include/sciresource.h b/engines/sci/include/sciresource.h index 5f37c080b2..fb98951e85 100644 --- a/engines/sci/include/sciresource.h +++ b/engines/sci/include/sciresource.h @@ -188,8 +188,6 @@ typedef struct { 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 @@ typedef struct { /**--- 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 diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 22c7768bdb..9de4942bb8 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -199,7 +199,7 @@ Common::Error SciEngine::go() { 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", diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp index aa89d4653c..0bd94caefd 100644 --- a/engines/sci/scicore/resource.cpp +++ b/engines/sci/scicore/resource.cpp @@ -426,7 +426,6 @@ sci_test_view_type(ResourceManager *mgr) { int scir_add_appropriate_sources(ResourceManager *mgr, - int allow_patches, char *dir) { const char *trailing_slash = ""; //char path_separator; @@ -577,8 +576,7 @@ _scir_free_resource_sources(ResourceSource *rss) { } 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 @@ scir_new_resource_manager(char *dir, int version, 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 @@ scir_new_resource_manager(char *dir, int version, 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 */ |