diff options
Diffstat (limited to 'engines/sword25/gfx/animationresource.cpp')
| -rw-r--r-- | engines/sword25/gfx/animationresource.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/sword25/gfx/animationresource.cpp b/engines/sword25/gfx/animationresource.cpp index 93b5934041..6e5f683a2e 100644 --- a/engines/sword25/gfx/animationresource.cpp +++ b/engines/sword25/gfx/animationresource.cpp @@ -35,7 +35,6 @@ #include "sword25/gfx/animationresource.h" #include "sword25/kernel/kernel.h" -#include "sword25/kernel/string.h" #include "sword25/package/packagemanager.h" #include "sword25/gfx/bitmapresource.h" @@ -54,8 +53,7 @@ AnimationResource::AnimationResource(const Common::String &filename) : Common::XMLParser(), _valid(false) { // Get a pointer to the package manager - Kernel *pKernel = Kernel::GetInstance(); - _pPackage = static_cast<PackageManager *>(pKernel->GetService("package")); + _pPackage = Kernel::getInstance()->getPackage(); BS_ASSERT(_pPackage); // Switch to the folder the specified Xml fiile is in @@ -117,7 +115,7 @@ bool AnimationResource::parseBooleanKey(Common::String s, bool &result) { } bool AnimationResource::parserCallback_animation(ParserNode *node) { - if (!parseIntegerKey(node->values["fps"].c_str(), 1, &_FPS) || (_FPS < MIN_FPS) || (_FPS > MAX_FPS)) { + if (!parseIntegerKey(node->values["fps"], 1, &_FPS) || (_FPS < MIN_FPS) || (_FPS > MAX_FPS)) { return parserError("Illegal or missing fps attribute in <animation> tag in \"%s\". Assuming default (\"%d\").", getFileName().c_str(), DEFAULT_FPS); } @@ -212,7 +210,7 @@ AnimationResource::~AnimationResource() { bool AnimationResource::precacheAllFrames() const { Common::Array<Frame>::const_iterator iter = _frames.begin(); for (; iter != _frames.end(); ++iter) { - if (!Kernel::GetInstance()->GetResourceManager()->PrecacheResource((*iter).fileName)) { + if (!Kernel::getInstance()->getResourceManager()->precacheResource((*iter).fileName)) { BS_LOG_ERRORLN("Could not precache \"%s\".", (*iter).fileName.c_str()); return false; } @@ -233,7 +231,7 @@ bool AnimationResource::computeFeatures() { Common::Array<Frame>::const_iterator iter = _frames.begin(); for (; iter != _frames.end(); ++iter) { BitmapResource *pBitmap; - if (!(pBitmap = static_cast<BitmapResource *>(Kernel::GetInstance()->GetResourceManager()->RequestResource((*iter).fileName)))) { + if (!(pBitmap = static_cast<BitmapResource *>(Kernel::getInstance()->getResourceManager()->requestResource((*iter).fileName)))) { BS_LOG_ERRORLN("Could not request \"%s\".", (*iter).fileName.c_str()); return false; } |