diff options
| -rw-r--r-- | engines/sword25/gfx/dynamicbitmap.cpp | 12 | ||||
| -rw-r--r-- | engines/sword25/gfx/dynamicbitmap.h | 6 | ||||
| -rw-r--r-- | engines/sword25/gfx/graphicengine.cpp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/engines/sword25/gfx/dynamicbitmap.cpp b/engines/sword25/gfx/dynamicbitmap.cpp index 0446e6fee7..91d46e99f4 100644 --- a/engines/sword25/gfx/dynamicbitmap.cpp +++ b/engines/sword25/gfx/dynamicbitmap.cpp @@ -58,7 +58,7 @@ DynamicBitmap::DynamicBitmap(RenderObjectPtr<RenderObject> parentPtr, uint width // Das BS_Bitmap konnte nicht erzeugt werden, daher muss an dieser Stelle abgebrochen werden. if (!_initSuccess) return; - _initSuccess = createGLImage(width, height); + _initSuccess = createRenderedImage(width, height); } // ----------------------------------------------------------------------------- @@ -70,10 +70,10 @@ DynamicBitmap::DynamicBitmap(InputPersistenceBlock &reader, RenderObjectPtr<Rend // ----------------------------------------------------------------------------- -bool DynamicBitmap::createGLImage(uint width, uint height) { - // GLImage mit den gewünschten Maßen erstellen +bool DynamicBitmap::createRenderedImage(uint width, uint height) { + // RenderedImage mit den gewünschten Maßen erstellen bool result = false; - _image.reset(new GLImage(width, height, result)); + _image.reset(new RenderedImage(width, height, result)); _originalWidth = _width = width; _originalHeight = _height = height; @@ -174,8 +174,8 @@ bool DynamicBitmap::unpersist(InputPersistenceBlock &reader) { result &= Bitmap::unpersist(reader); - // Ein BS_GLImage mit den gespeicherten Maßen erstellen. - result &= createGLImage(_width, _height); + // Ein RenderedImage mit den gespeicherten Maßen erstellen. + result &= createRenderedImage(_width, _height); // Bilddaten werden nicht gespeichert (s.o.). BS_LOG_WARNINGLN("Unpersisting a BS_DynamicBitmap. Bitmap contents are missing."); diff --git a/engines/sword25/gfx/dynamicbitmap.h b/engines/sword25/gfx/dynamicbitmap.h index 6313444294..a02769fb57 100644 --- a/engines/sword25/gfx/dynamicbitmap.h +++ b/engines/sword25/gfx/dynamicbitmap.h @@ -42,7 +42,7 @@ #include "sword25/kernel/common.h" #include "sword25/gfx/bitmap.h" -#include "sword25/gfx/image/glimage.h" +#include "sword25/gfx/image/renderedimage.h" #include "common/ptr.h" @@ -77,9 +77,9 @@ private: DynamicBitmap(RenderObjectPtr<RenderObject> parentPtr, uint width, uint height); DynamicBitmap(InputPersistenceBlock &reader, RenderObjectPtr<RenderObject> parentPtr, uint handle); - bool createGLImage(uint width, uint height); + bool createRenderedImage(uint width, uint height); - Common::ScopedPtr<GLImage> _image; + Common::ScopedPtr<RenderedImage> _image; }; } // End of namespace Sword25 diff --git a/engines/sword25/gfx/graphicengine.cpp b/engines/sword25/gfx/graphicengine.cpp index a6cbbdbde2..b0e1b17359 100644 --- a/engines/sword25/gfx/graphicengine.cpp +++ b/engines/sword25/gfx/graphicengine.cpp @@ -42,7 +42,7 @@ #include "sword25/gfx/panel.h" #include "sword25/gfx/renderobjectmanager.h" #include "sword25/gfx/screenshot.h" -#include "sword25/gfx/image/glimage.h" +#include "sword25/gfx/image/renderedimage.h" #include "sword25/gfx/image/swimage.h" #include "sword25/gfx/image/vectorimage.h" #include "sword25/package/packagemanager.h" @@ -315,7 +315,7 @@ Resource *GraphicEngine::LoadResource(const Common::String &FileName) { // Sprite-Bild laden if (FileName.hasSuffix(PNG_EXTENSION) || FileName.hasSuffix(B25S_EXTENSION)) { bool Result = false; - GLImage *pImage = new GLImage(FileName, Result); + RenderedImage *pImage = new RenderedImage(FileName, Result); if (!Result) { delete pImage; return 0; |