diff options
Diffstat (limited to 'engines/sword25/gfx/opengl')
| -rw-r--r-- | engines/sword25/gfx/opengl/glimage.cpp | 4 | ||||
| -rw-r--r-- | engines/sword25/gfx/opengl/openglgfx.cpp | 14 | ||||
| -rw-r--r-- | engines/sword25/gfx/opengl/openglgfx.h | 14 | ||||
| -rw-r--r-- | engines/sword25/gfx/opengl/swimage.cpp | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/engines/sword25/gfx/opengl/glimage.cpp b/engines/sword25/gfx/opengl/glimage.cpp index 0d17eb1758..a690cc19ee 100644 --- a/engines/sword25/gfx/opengl/glimage.cpp +++ b/engines/sword25/gfx/opengl/glimage.cpp @@ -57,10 +57,10 @@ GLImage::GLImage(const Common::String &Filename, bool &Result) : m_Height(0) { Result = false; - PackageManager *pPackage = static_cast<PackageManager *>(BS_Kernel::GetInstance()->GetService("package")); + PackageManager *pPackage = static_cast<PackageManager *>(Kernel::GetInstance()->GetService("package")); BS_ASSERT(pPackage); - _backSurface = (static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx")))->getSurface(); + _backSurface = (static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx")))->getSurface(); // Datei laden char *pFileData; diff --git a/engines/sword25/gfx/opengl/openglgfx.cpp b/engines/sword25/gfx/opengl/openglgfx.cpp index c30fc8ed0d..e73654ce95 100644 --- a/engines/sword25/gfx/opengl/openglgfx.cpp +++ b/engines/sword25/gfx/opengl/openglgfx.cpp @@ -73,7 +73,7 @@ const Common::String B25S_EXTENSION(".b25s"); // CONSTRUCTION / DESTRUCTION // ----------------------------------------------------------------------------- -OpenGLGfx::OpenGLGfx(BS_Kernel *pKernel) : +OpenGLGfx::OpenGLGfx(Kernel *pKernel) : GraphicEngine(pKernel), m_GLspritesInitialized(false) { } @@ -86,7 +86,7 @@ OpenGLGfx::~OpenGLGfx() { // ----------------------------------------------------------------------------- -BS_Service *OpenGLGfx_CreateObject(BS_Kernel *pKernel) { +Service *OpenGLGfx_CreateObject(Kernel *pKernel) { return new OpenGLGfx(pKernel); } @@ -285,7 +285,7 @@ void OpenGLGfx::FlipImagedataVertical(unsigned int Width, unsigned int Height, b // RESOURCE MANAGING // ----------------------------------------------------------------------------- -BS_Resource *OpenGLGfx::LoadResource(const Common::String &FileName) { +Resource *OpenGLGfx::LoadResource(const Common::String &FileName) { BS_ASSERT(CanLoadResource(FileName)); // Bild für den Softwarebuffer laden @@ -328,7 +328,7 @@ BS_Resource *OpenGLGfx::LoadResource(const Common::String &FileName) { // Vectorgraphik laden if (FileName.hasSuffix(SWF_EXTENSION)) { // Pointer auf Package-Manager holen - PackageManager *pPackage = BS_Kernel::GetInstance()->GetPackage(); + PackageManager *pPackage = Kernel::GetInstance()->GetPackage(); BS_ASSERT(pPackage); // Datei laden @@ -371,7 +371,7 @@ BS_Resource *OpenGLGfx::LoadResource(const Common::String &FileName) { // Font laden if (FileName.hasSuffix(FNT_EXTENSION)) { - FontResource *pResource = new FontResource(BS_Kernel::GetInstance(), FileName); + FontResource *pResource = new FontResource(Kernel::GetInstance(), FileName); if (pResource->IsValid()) return pResource; else { @@ -407,7 +407,7 @@ void OpenGLGfx::DrawDebugLine(const Vertex &Start, const Vertex &End, unsigned i // PERSISTENZ // ----------------------------------------------------------------------------- -bool OpenGLGfx::Persist(BS_OutputPersistenceBlock &Writer) { +bool OpenGLGfx::Persist(OutputPersistenceBlock &Writer) { bool result = true; result &= GraphicEngine::Persist(Writer); @@ -418,7 +418,7 @@ bool OpenGLGfx::Persist(BS_OutputPersistenceBlock &Writer) { // ----------------------------------------------------------------------------- -bool OpenGLGfx::Unpersist(BS_InputPersistenceBlock &Reader) { +bool OpenGLGfx::Unpersist(InputPersistenceBlock &Reader) { bool result = true; result &= GraphicEngine::Unpersist(Reader); diff --git a/engines/sword25/gfx/opengl/openglgfx.h b/engines/sword25/gfx/opengl/openglgfx.h index c96fa381d6..5b480491c5 100644 --- a/engines/sword25/gfx/opengl/openglgfx.h +++ b/engines/sword25/gfx/opengl/openglgfx.h @@ -49,9 +49,9 @@ namespace Sword25 { // FORWARD DECLARATIONS // ----------------------------------------------------------------------------- -class BS_Kernel; -class BS_Service; -class BS_Resource; +class Kernel; +class Service; +class Resource; class Panel; class BS_Image; class RenderObjectManager; @@ -63,7 +63,7 @@ class RenderObjectManager; class OpenGLGfx : public GraphicEngine { public: - OpenGLGfx(BS_Kernel *pKernel); + OpenGLGfx(Kernel *pKernel); virtual ~OpenGLGfx(); // Interface @@ -82,7 +82,7 @@ public: // Resource-Managing Methoden // -------------------------- - virtual BS_Resource *LoadResource(const Common::String &FileName); + virtual Resource *LoadResource(const Common::String &FileName); virtual bool CanLoadResource(const Common::String &FileName); // Debugging Methoden @@ -91,8 +91,8 @@ public: // Persistenz Methoden // ------------------- - virtual bool Persist(BS_OutputPersistenceBlock &Writer); - virtual bool Unpersist(BS_InputPersistenceBlock &Reader); + virtual bool Persist(OutputPersistenceBlock &Writer); + virtual bool Unpersist(InputPersistenceBlock &Reader); private: bool m_GLspritesInitialized; diff --git a/engines/sword25/gfx/opengl/swimage.cpp b/engines/sword25/gfx/opengl/swimage.cpp index 1244cc3879..5fa579365b 100644 --- a/engines/sword25/gfx/opengl/swimage.cpp +++ b/engines/sword25/gfx/opengl/swimage.cpp @@ -56,7 +56,7 @@ SWImage::SWImage(const Common::String &Filename, bool &Result) : m_Height(0) { Result = false; - PackageManager *pPackage = static_cast<PackageManager *>(BS_Kernel::GetInstance()->GetService("package")); + PackageManager *pPackage = static_cast<PackageManager *>(Kernel::GetInstance()->GetService("package")); BS_ASSERT(pPackage); // Datei laden |