From b01994a53bbc96da907a4c28934e644184291017 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 18 Aug 2010 12:58:22 +0000 Subject: SWORD25: removed BS_ prefix from rest of the classes. The things which are intentionally left with the prefix: BS_LOG, BS_ASSERT, BS_Rect, BS_String. svn-id: r53261 --- engines/sword25/gfx/opengl/openglgfx.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'engines/sword25/gfx/opengl/openglgfx.cpp') 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); -- cgit v1.2.3