diff options
| author | Max Horn | 2010-10-15 12:18:19 +0000 |
|---|---|---|
| committer | Max Horn | 2010-10-15 12:18:19 +0000 |
| commit | 550073ee049ba30d84cb76c82fb18c045b07569f (patch) | |
| tree | 0b67327d8f27969c6a6ebd1971fafee6cd7b70d9 /engines/sword25/gfx/image | |
| parent | 2b5de8c8921d8ec012c689597870e5ae781e3b81 (diff) | |
| download | scummvm-rg350-550073ee049ba30d84cb76c82fb18c045b07569f.tar.gz scummvm-rg350-550073ee049ba30d84cb76c82fb18c045b07569f.tar.bz2 scummvm-rg350-550073ee049ba30d84cb76c82fb18c045b07569f.zip | |
SWORD25: Do not use Kernel::GetService directly anymore
svn-id: r53477
Diffstat (limited to 'engines/sword25/gfx/image')
| -rw-r--r-- | engines/sword25/gfx/image/renderedimage.cpp | 8 | ||||
| -rw-r--r-- | engines/sword25/gfx/image/swimage.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword25/gfx/image/renderedimage.cpp b/engines/sword25/gfx/image/renderedimage.cpp index 96b6139a59..d758e66841 100644 --- a/engines/sword25/gfx/image/renderedimage.cpp +++ b/engines/sword25/gfx/image/renderedimage.cpp @@ -56,10 +56,10 @@ RenderedImage::RenderedImage(const Common::String &filename, bool &result) : _height(0) { result = false; - PackageManager *pPackage = static_cast<PackageManager *>(Kernel::GetInstance()->GetService("package")); + PackageManager *pPackage = Kernel::GetInstance()->GetPackage(); BS_ASSERT(pPackage); - _backSurface = (static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx")))->getSurface(); + _backSurface = Kernel::GetInstance()->GetGfx()->getSurface(); // Datei laden byte *pFileData; @@ -103,7 +103,7 @@ RenderedImage::RenderedImage(uint width, uint height, bool &result) : _data = new byte[width * height * 4]; Common::set_to(_data, &_data[width * height * 4], 0); - _backSurface = (static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx")))->getSurface(); + _backSurface = Kernel::GetInstance()->GetGfx()->getSurface(); _doCleanup = true; @@ -112,7 +112,7 @@ RenderedImage::RenderedImage(uint width, uint height, bool &result) : } RenderedImage::RenderedImage() : _width(0), _height(0), _data(0) { - _backSurface = (static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx")))->getSurface(); + _backSurface = Kernel::GetInstance()->GetGfx()->getSurface(); _doCleanup = false; diff --git a/engines/sword25/gfx/image/swimage.cpp b/engines/sword25/gfx/image/swimage.cpp index ac4463ea16..77ac109e48 100644 --- a/engines/sword25/gfx/image/swimage.cpp +++ b/engines/sword25/gfx/image/swimage.cpp @@ -55,7 +55,7 @@ SWImage::SWImage(const Common::String &filename, bool &result) : _height(0) { result = false; - PackageManager *pPackage = static_cast<PackageManager *>(Kernel::GetInstance()->GetService("package")); + PackageManager *pPackage = Kernel::GetInstance()->GetPackage(); BS_ASSERT(pPackage); // Datei laden |