thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Simplified the parameters of some functions

Browse source 
- Replaced some EngineState parameters
- The SCI version is now obtained from the resource manager or the segment manager, thereby simplifying several functions
- Plugged 2 leaks in the fallback detector
- Renamed the segment manager and resource manager to "segmentManager" and "resourceManager" in all places, for consistency

svn-id: r43722
This commit is contained in:
Filippos Karapetis 2009-08-25 08:38:14 +00:00
parent bc20237ae3
commit ed66cad677
44 changed files with 578 additions and 573 deletions
Download patch file Download diff file Expand all files Collapse all files

40
engines/sci/resource.cpp
View file

@ -40,7 +40,7 @@ namespace Sci {
#undef SCI_REQUIRE_RESOURCE_FILES
//#define SCI_VERBOSE_RESMGR 1
//#define SCI_VERBOSE_resourceManager 1
static const char *sci_error_types[] = {
"No error",
@ -103,7 +103,7 @@ void Resource::unalloc() {
status = kResStatusNoMalloc;
}
//-- Resmgr helper functions --
//-- resourceManager helper functions --
// Resource source list management
@ -510,8 +510,8 @@ void ResourceManager::init() {
_mapVersion = _volVersion;
}
debug("Resmgr: Detected resource map version %d: %s", _mapVersion, versionDescription(_mapVersion));
debug("Resmgr: Detected volume version %d: %s", _volVersion, versionDescription(_volVersion));
debug("resourceManager: Detected resource map version %d: %s", _mapVersion, versionDescription(_mapVersion));
debug("resourceManager: Detected volume version %d: %s", _volVersion, versionDescription(_volVersion));
scanNewSources();
addInternalSources();
@ -520,25 +520,25 @@ void ResourceManager::init() {
_sciVersion = detectSciVersion();
if (_sciVersion != SCI_VERSION_AUTODETECT)
debug("Resmgr: Detected %s", versionNames[_sciVersion]);
debug("resourceManager: Detected %s", versionNames[_sciVersion]);
else
warning("Resmgr: Couldn't determine SCI version");
warning("resourceManager: Couldn't determine SCI version");
switch (_viewType) {
case kViewEga:
debug("Resmgr: Detected EGA graphic resources");
debug("resourceManager: Detected EGA graphic resources");
break;
case kViewVga:
debug("Resmgr: Detected VGA graphic resources");
debug("resourceManager: Detected VGA graphic resources");
break;
case kViewVga11:
debug("Resmgr: Detected SCI1.1 VGA graphic resources");
debug("resourceManager: Detected SCI1.1 VGA graphic resources");
break;
case kViewAmiga:
debug("Resmgr: Detected Amiga graphic resources");
debug("resourceManager: Detected Amiga graphic resources");
break;
default:
warning("Resmgr: Couldn't determine view type");
warning("resourceManager: Couldn't determine view type");
}
}
@ -561,7 +561,7 @@ ResourceManager::~ResourceManager() {
void ResourceManager::removeFromLRU(Resource *res) {
if (res->status != kResStatusEnqueued) {
warning("Resmgr: trying to remove resource that isn't enqueued");
warning("resourceManager: trying to remove resource that isn't enqueued");
return;
}
_LRU.remove(res);
@ -571,12 +571,12 @@ void ResourceManager::removeFromLRU(Resource *res) {
void ResourceManager::addToLRU(Resource *res) {
if (res->status != kResStatusAllocated) {
warning("Resmgr: trying to enqueue resource with state %d", res->status);
warning("resourceManager: trying to enqueue resource with state %d", res->status);
return;
}
_LRU.push_front(res);
_memoryLRU += res->size;
#if SCI_VERBOSE_RESMGR
#if SCI_VERBOSE_resourceManager
debug("Adding %s.%03d (%d bytes) to lru control: %d bytes total",
getResourceTypeName(res->type), res->number, res->size,
mgr->_memoryLRU);
@ -607,8 +607,8 @@ void ResourceManager::freeOldResources() {
Resource *goner = *_LRU.reverse_begin();
removeFromLRU(goner);
goner->unalloc();
#ifdef SCI_VERBOSE_RESMGR
printf("Resmgr-debug: LRU: Freeing %s.%03d (%d bytes)\n", getResourceTypeName(goner->type), goner->number, goner->size);
#ifdef SCI_VERBOSE_resourceManager
printf("resourceManager-debug: LRU: Freeing %s.%03d (%d bytes)\n", getResourceTypeName(goner->type), goner->number, goner->size);
#endif
}
}
@ -656,7 +656,7 @@ Resource *ResourceManager::findResource(ResourceId id, bool lock) {
if (retval->data)
return retval;
else {
warning("Resmgr: Failed to read %s", retval->id.toString().c_str());
warning("resourceManager: Failed to read %s", retval->id.toString().c_str());
return NULL;
}
}
@ -665,7 +665,7 @@ void ResourceManager::unlockResource(Resource *res) {
assert(res);
if (res->status != kResStatusLocked) {
warning("[Resmgr] Attempt to unlock unlocked resource %s", res->id.toString().c_str());
warning("[resourceManager] Attempt to unlock unlocked resource %s", res->id.toString().c_str());
return;
}
@ -1567,7 +1567,7 @@ ViewType ResourceManager::detectViewType() {
}
}
warning("Resmgr: Couldn't find any views");
warning("resourceManager: Couldn't find any views");
return kViewUnknown;
}
@ -1661,7 +1661,7 @@ bool ResourceManager::hasOldScriptHeader() {
Resource *res = findResource(ResourceId(kResourceTypeScript, 0), 0);
if (!res) {
warning("Resmgr: Failed to find script.000");
warning("resourceManager: Failed to find script.000");
return false;
}