diff options
author | Eugene Sandulenko | 2010-10-03 13:25:11 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-13 00:07:27 +0000 |
commit | 1e15d8efb73503d9f613cc60023771b0c11f0dd6 (patch) | |
tree | 03246cc37974ddda1dbe3951f3ea4a49400788f5 /engines/sword25/kernel/resmanager.cpp | |
parent | 9a5415e6f9c95f61a4eaf5955ee4e36221e9ec77 (diff) | |
download | scummvm-rg350-1e15d8efb73503d9f613cc60023771b0c11f0dd6.tar.gz scummvm-rg350-1e15d8efb73503d9f613cc60023771b0c11f0dd6.tar.bz2 scummvm-rg350-1e15d8efb73503d9f613cc60023771b0c11f0dd6.zip |
SWORD25: Enforced code naming conventions in sfx/ and reservice.h
svn-id: r53390
Diffstat (limited to 'engines/sword25/kernel/resmanager.cpp')
-rw-r--r-- | engines/sword25/kernel/resmanager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/sword25/kernel/resmanager.cpp b/engines/sword25/kernel/resmanager.cpp index ff82e6b797..9e80f32f8d 100644 --- a/engines/sword25/kernel/resmanager.cpp +++ b/engines/sword25/kernel/resmanager.cpp @@ -162,7 +162,7 @@ Resource *ResourceManager::RequestResource(const Common::String &FileName) { if (m_LogCacheMiss) BS_LOG_WARNINGLN("\"%s\" was not precached.", UniqueFileName.c_str()); Resource *pResource; - if ((pResource = LoadResource(UniqueFileName))) { + if ((pResource = loadResource(UniqueFileName))) { pResource->AddReference(); return pResource; } @@ -194,7 +194,7 @@ bool ResourceManager::PrecacheResource(const Common::String &FileName, bool Forc } } - if (!ResourcePtr && LoadResource(UniqueFileName) == NULL) { + if (!ResourcePtr && loadResource(UniqueFileName) == NULL) { BS_LOG_ERRORLN("Could not precache \"%s\",", FileName.c_str()); return false; } @@ -221,17 +221,17 @@ void ResourceManager::MoveToFront(Resource *pResource) { * The resource must not already be loaded * @param FileName The unique filename of the resource to be loaded */ -Resource *ResourceManager::LoadResource(const Common::String &FileName) { +Resource *ResourceManager::loadResource(const Common::String &fileName) { // ResourceService finden, der die Resource laden kann. for (uint i = 0; i < m_ResourceServices.size(); ++i) { - if (m_ResourceServices[i]->CanLoadResource(FileName)) { + if (m_ResourceServices[i]->canLoadResource(fileName)) { // If more memory is desired, memory must be released DeleteResourcesIfNecessary(); // Load the resource Resource *pResource; - if (!(pResource = m_ResourceServices[i]->LoadResource(FileName))) { - BS_LOG_ERRORLN("Responsible service could not load resource \"%s\".", FileName.c_str()); + if (!(pResource = m_ResourceServices[i]->loadResource(fileName))) { + BS_LOG_ERRORLN("Responsible service could not load resource \"%s\".", fileName.c_str()); return NULL; } @@ -246,7 +246,7 @@ Resource *ResourceManager::LoadResource(const Common::String &FileName) { } } - BS_LOG_ERRORLN("Could not find a service that can load \"%s\".", FileName.c_str()); + BS_LOG_ERRORLN("Could not find a service that can load \"%s\".", fileName.c_str()); return NULL; } |