From 00a0f8d15df8f241741e4a9a68a71641715ae062 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 23 Jan 2011 14:49:50 +0000 Subject: SWORD25: Removed the custom log class and replaced it with warning/error/debugC calls svn-id: r55462 --- engines/sword25/gfx/bitmap.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'engines/sword25/gfx/bitmap.cpp') diff --git a/engines/sword25/gfx/bitmap.cpp b/engines/sword25/gfx/bitmap.cpp index b5412c8276..9010a9c981 100644 --- a/engines/sword25/gfx/bitmap.cpp +++ b/engines/sword25/gfx/bitmap.cpp @@ -38,8 +38,6 @@ namespace Sword25 { -#define BS_LOG_PREFIX "BITMAP" - Bitmap::Bitmap(RenderObjectPtr parentPtr, TYPES type, uint handle) : RenderObject(parentPtr, type, handle), _modulationColor(0xffffffff), @@ -54,7 +52,7 @@ Bitmap::~Bitmap() { void Bitmap::setAlpha(int alpha) { if (!isAlphaAllowed()) { - BS_LOG_WARNINGLN("Tried to set alpha value on a bitmap that does not support alpha blending. Call was ignored."); + warning("Tried to set alpha value on a bitmap that does not support alpha blending. Call was ignored."); return; } @@ -64,7 +62,7 @@ void Bitmap::setAlpha(int alpha) { alpha = 0; if (alpha > 255) alpha = 255; - BS_LOG_WARNINGLN("Tried to set an invalid alpha value (%d) on a bitmap. Value was changed to %d.", oldAlpha, alpha); + warning("Tried to set an invalid alpha value (%d) on a bitmap. Value was changed to %d.", oldAlpha, alpha); return; } @@ -78,7 +76,7 @@ void Bitmap::setAlpha(int alpha) { void Bitmap::setModulationColor(uint modulationColor) { if (!isColorModulationAllowed()) { - BS_LOG_WARNINGLN("Tried to set modulation color of a bitmap that does not support color modulation. Call was ignored."); + warning("Tried to set modulation color of a bitmap that does not support color modulation. Call was ignored."); return; } @@ -96,12 +94,12 @@ void Bitmap::setScaleFactor(float scaleFactor) { void Bitmap::setScaleFactorX(float scaleFactorX) { if (!isScalingAllowed()) { - BS_LOG_WARNINGLN("Tried to set scale factor of a bitmap that does not support scaling. Call was ignored."); + warning("Tried to set scale factor of a bitmap that does not support scaling. Call was ignored."); return; } if (scaleFactorX < 0) { - BS_LOG_WARNINGLN("Tried to set scale factor of a bitmap to a negative value. Call was ignored."); + warning("Tried to set scale factor of a bitmap to a negative value. Call was ignored."); return; } @@ -118,12 +116,12 @@ void Bitmap::setScaleFactorX(float scaleFactorX) { void Bitmap::setScaleFactorY(float scaleFactorY) { if (!isScalingAllowed()) { - BS_LOG_WARNINGLN("Tried to set scale factor of a bitmap that does not support scaling. Call was ignored."); + warning("Tried to set scale factor of a bitmap that does not support scaling. Call was ignored."); return; } if (scaleFactorY < 0) { - BS_LOG_WARNINGLN("Tried to set scale factor of a bitmap to a negative value. Call was ignored."); + warning("Tried to set scale factor of a bitmap to a negative value. Call was ignored."); return; } -- cgit v1.2.3