libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Removed unused allow_patches param/member

Browse Source 
svn-id: r38595
This commit is contained in:
Max Horn 2009-02-20 15:47:37 +00:00
parent 7422e98f8f
commit 617c63c1ed
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/sci/include/sciresource.h
View File

@ -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

2
engines/sci/sci.cpp
View File

@ -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",

8
engines/sci/scicore/resource.cpp
View File

@ -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 */