From fed19cb66ae5b56dd7dc81b90edd5a0d15986678 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Mon, 13 Aug 2012 03:42:30 +0200 Subject: WINTERMUTE: WinterMute -> Wintermute --- engines/wintermute/base/gfx/base_image.cpp | 6 +++--- engines/wintermute/base/gfx/base_image.h | 4 ++-- engines/wintermute/base/gfx/base_renderer.cpp | 4 ++-- engines/wintermute/base/gfx/base_renderer.h | 4 ++-- engines/wintermute/base/gfx/base_surface.cpp | 4 ++-- engines/wintermute/base/gfx/base_surface.h | 4 ++-- engines/wintermute/base/gfx/osystem/base_render_osystem.cpp | 4 ++-- engines/wintermute/base/gfx/osystem/base_render_osystem.h | 4 ++-- engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp | 4 ++-- engines/wintermute/base/gfx/osystem/base_surface_osystem.h | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) (limited to 'engines/wintermute/base/gfx') diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp index c1b6636237..ec52e26c00 100644 --- a/engines/wintermute/base/gfx/base_image.cpp +++ b/engines/wintermute/base/gfx/base_image.cpp @@ -38,7 +38,7 @@ #include "common/stream.h" #include "common/system.h" -namespace WinterMute { +namespace Wintermute { ////////////////////////////////////////////////////////////////////// BaseImage::BaseImage() { @@ -69,7 +69,7 @@ bool BaseImage::loadFile(const Common::String &filename) { } else if (_filename.hasSuffix(".bmp")) { _decoder = new Graphics::BitmapDecoder(); } else if (_filename.hasSuffix(".tga")) { - _decoder = new WinterMute::TGA(); + _decoder = new Wintermute::TGA(); } else if (_filename.hasSuffix(".jpg")) { _decoder = new Graphics::JPEGDecoder(); } else { @@ -228,4 +228,4 @@ bool BaseImage::copyFrom(BaseImage *origImage, int newWidth, int newHeight) { return true; } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h index 76a389977d..7bf901fe40 100644 --- a/engines/wintermute/base/gfx/base_image.h +++ b/engines/wintermute/base/gfx/base_image.h @@ -36,7 +36,7 @@ #include "common/str.h" #include "common/stream.h" -namespace WinterMute { +namespace Wintermute { class BaseSurface; class BaseFileManager; class BaseImage { @@ -67,6 +67,6 @@ private: BaseFileManager *_fileManager; }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp index 5d81c44c25..47a5462452 100644 --- a/engines/wintermute/base/gfx/base_renderer.cpp +++ b/engines/wintermute/base/gfx/base_renderer.cpp @@ -34,7 +34,7 @@ #include "engines/wintermute/platform_osystem.h" #include "engines/wintermute/base/base_persistence_manager.h" -namespace WinterMute { +namespace Wintermute { ////////////////////////////////////////////////////////////////////// BaseRenderer::BaseRenderer(BaseGame *inGame) : BaseClass(inGame) { @@ -373,4 +373,4 @@ bool BaseRenderer::displayIndicator() { return STATUS_OK; } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h index 49b5e187eb..aa8812254d 100644 --- a/engines/wintermute/base/gfx/base_renderer.h +++ b/engines/wintermute/base/gfx/base_renderer.h @@ -34,7 +34,7 @@ #include "common/rect.h" #include "common/array.h" -namespace WinterMute { +namespace Wintermute { class BaseImage; class BaseActiveRect; @@ -215,6 +215,6 @@ private: BaseRenderer *makeOSystemRenderer(BaseGame *inGame); // Implemented in BRenderSDL.cpp -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/base/gfx/base_surface.cpp b/engines/wintermute/base/gfx/base_surface.cpp index 28ac4e6973..cbd665591a 100644 --- a/engines/wintermute/base/gfx/base_surface.cpp +++ b/engines/wintermute/base/gfx/base_surface.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/base_game.h" #include "engines/wintermute/base/gfx/base_surface.h" -namespace WinterMute { +namespace Wintermute { ////////////////////////////////////////////////////////////////////// BaseSurface::BaseSurface(BaseGame *inGame) : BaseClass(inGame) { @@ -146,4 +146,4 @@ void BaseSurface::setSize(int width, int height) { _height = height; } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h index 57a51ce3aa..3be61477ba 100644 --- a/engines/wintermute/base/gfx/base_surface.h +++ b/engines/wintermute/base/gfx/base_surface.h @@ -33,7 +33,7 @@ #include "engines/wintermute/math/rect32.h" #include "graphics/surface.h" -namespace WinterMute { +namespace Wintermute { class BaseSurface: public BaseClass { public: @@ -94,6 +94,6 @@ protected: }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp index ab4e690458..201c881122 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp @@ -38,7 +38,7 @@ #include "common/queue.h" #include "common/config-manager.h" -namespace WinterMute { +namespace Wintermute { RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, bool mirrorX, bool mirrorY, bool disableAlpha) : _owner(owner), _srcRect(*srcRect), _dstRect(*dstRect), _drawNum(0), _isValid(true), _wantsDraw(true), _hasAlpha(!disableAlpha) { @@ -602,4 +602,4 @@ BaseSurface *BaseRenderOSystem::createSurface() { return new BaseSurfaceOSystem(_gameRef); } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h index 070ddf9241..5859fec74e 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h @@ -34,7 +34,7 @@ #include "graphics/surface.h" #include "common/list.h" -namespace WinterMute { +namespace Wintermute { class BaseSurfaceOSystem; class RenderTicket { Graphics::Surface *_surface; @@ -125,6 +125,6 @@ private: uint32 _clearColor; }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif // WINTERMUTE_BRENDERER_SDL_H diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index 400bb1de41..5b0f7c94c3 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -43,7 +43,7 @@ #include "common/stream.h" #include "common/system.h" -namespace WinterMute { +namespace Wintermute { ////////////////////////////////////////////////////////////////////////// BaseSurfaceOSystem::BaseSurfaceOSystem(BaseGame *inGame) : BaseSurface(inGame) { @@ -426,4 +426,4 @@ bool BaseSurfaceOSystem::putSurface(const Graphics::Surface &surface, bool hasAl return STATUS_OK; } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h index fe1d055026..27f9ad047e 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/gfx/base_surface.h" #include "common/list.h" -namespace WinterMute { +namespace Wintermute { struct TransparentSurface; class BaseImage; class BaseSurfaceOSystem : public BaseSurface { @@ -94,6 +94,6 @@ private: byte *_alphaMask; }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif // WINTERMUTE_BSURFACESDL_H -- cgit v1.2.3