From 1e15d8efb73503d9f613cc60023771b0c11f0dd6 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 3 Oct 2010 13:25:11 +0000 Subject: SWORD25: Enforced code naming conventions in sfx/ and reservice.h svn-id: r53390 --- engines/sword25/kernel/resmanager.cpp | 14 +++++----- engines/sword25/kernel/resmanager.h | 2 +- engines/sword25/kernel/resservice.h | 52 ++--------------------------------- 3 files changed, 10 insertions(+), 58 deletions(-) (limited to 'engines/sword25/kernel') 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; } diff --git a/engines/sword25/kernel/resmanager.h b/engines/sword25/kernel/resmanager.h index 7000005b08..578f121fec 100644 --- a/engines/sword25/kernel/resmanager.h +++ b/engines/sword25/kernel/resmanager.h @@ -155,7 +155,7 @@ private: * The resource must not already be loaded * @param FileName The unique filename of the resource to be loaded */ - Resource *LoadResource(const Common::String &FileName); + Resource *loadResource(const Common::String &fileName); /** * Returns the full path of a given resource filename. diff --git a/engines/sword25/kernel/resservice.h b/engines/sword25/kernel/resservice.h index 2fbadda054..d5961d52ae 100644 --- a/engines/sword25/kernel/resservice.h +++ b/engines/sword25/kernel/resservice.h @@ -59,63 +59,15 @@ public: * Loads a resource * @return Returns the resource if successful, otherwise NULL */ - virtual Resource *LoadResource(const Common::String &FileName) = 0; + virtual Resource *loadResource(const Common::String &fileName) = 0; /** * Checks whether the given name can be loaded by the resource service * @param FileName Dateiname * @return Returns true if the resource can be loaded. */ - virtual bool CanLoadResource(const Common::String &FileName) = 0; + virtual bool canLoadResource(const Common::String &fileName) = 0; -protected: - // Alternative methods for classes BS_ResourceService - - /** - * Compares two strings, with the second string allowed to contain '*' and '?' wildcards - * @param String The first comparison string. This must not contain wildcards - * @param Pattern The sceond comaprison string. Wildcards of '*' and '?' are allowed. - * @return Returns true if the string matches the pattern, otherwise false. - */ - bool _WildCardStringMatch(const Common::String &String, const Common::String &Pattern) { - return _WildCardStringMatchRecursion(String.c_str(), Pattern.c_str()); - } - -private: - bool _WildCardStringMatchRecursion(const char *String, const char *Pattern) { - // Checks: - // 1. The pattern starts with '*' -> TRUE - if (*Pattern == '*') { - // Use a copy of the pattern pointer so as not to destroy the current state - const char *PatternCopy = Pattern; - while (*PatternCopy == '*') { - PatternCopy++; - } - if (!*PatternCopy) return true; - } - // 2. The string is over, but the patern is not -> FALSE - if (!*String && *Pattern) return false; - // 3. The string is over, and the pattern is finished -> TRUE - if (!*String) return true; - - // Recursive check 1: - // If the two current characters are the same, or pattern '?', then keep scanning - if (*String == *Pattern || *Pattern == '?') return _WildCardStringMatchRecursion(String + 1, Pattern + 1); - - // Falls nicht, wird untersucht ob ein '*' vorliegt - if (*Pattern == '*') { - // Recursive check 2: - // First the result of strign and pattern + 1 is examined.. - if (_WildCardStringMatchRecursion(String, Pattern + 1)) return true; - // If this fails, the result of string + 1 pattern is returned - else return _WildCardStringMatchRecursion(String + 1, Pattern); - // The recursion ends, therefore, keep returning to this place until a character - // in the string which corresponds to the '*' in pattern - } - - // The match has failed - return false; - } }; } // End of namespace Sword25 -- cgit v1.2.3