aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/text.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2011-01-23 14:49:50 +0000
committerFilippos Karapetis2011-01-23 14:49:50 +0000
commit00a0f8d15df8f241741e4a9a68a71641715ae062 (patch)
treed40be8437f7ca54dab9c77145bf72550bc5a3150 /engines/sword25/gfx/text.cpp
parent411d41d3d0a3e4d14187d4a980c25c0a2e41ad9c (diff)
downloadscummvm-rg350-00a0f8d15df8f241741e4a9a68a71641715ae062.tar.gz
scummvm-rg350-00a0f8d15df8f241741e4a9a68a71641715ae062.tar.bz2
scummvm-rg350-00a0f8d15df8f241741e4a9a68a71641715ae062.zip
SWORD25: Removed the custom log class and replaced it with warning/error/debugC calls
svn-id: r55462
Diffstat (limited to 'engines/sword25/gfx/text.cpp')
-rw-r--r--engines/sword25/gfx/text.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/sword25/gfx/text.cpp b/engines/sword25/gfx/text.cpp
index b8e12ba570..9609ef810b 100644
--- a/engines/sword25/gfx/text.cpp
+++ b/engines/sword25/gfx/text.cpp
@@ -46,8 +46,6 @@
namespace Sword25 {
-#define BS_LOG_PREFIX "TEXT"
-
namespace {
const uint AUTO_WRAP_THRESHOLD_DEFAULT = 300;
}
@@ -79,7 +77,7 @@ bool Text::setFont(const Common::String &font) {
forceRefresh();
return true;
} else {
- BS_LOG_ERRORLN("Could not precache font \"%s\". Font probably does not exist.", font.c_str());
+ error("Could not precache font \"%s\". Font probably does not exist.", font.c_str());
return false;
}
@@ -136,11 +134,11 @@ bool Text::doRender() {
{
Resource *pResource = rmPtr->requestResource(fontPtr->getCharactermapFileName());
if (!pResource) {
- BS_LOG_ERRORLN("Could not request resource \"%s\".", fontPtr->getCharactermapFileName().c_str());
+ warning("Could not request resource \"%s\".", fontPtr->getCharactermapFileName().c_str());
return false;
}
if (pResource->getType() != Resource::TYPE_BITMAP) {
- BS_LOG_ERRORLN("Requested resource \"%s\" is not a bitmap.", fontPtr->getCharactermapFileName().c_str());
+ error("Requested resource \"%s\" is not a bitmap.", fontPtr->getCharactermapFileName().c_str());
return false;
}
@@ -198,11 +196,11 @@ FontResource *Text::lockFontResource() {
{
Resource *resourcePtr = rmPtr->requestResource(_font);
if (!resourcePtr) {
- BS_LOG_ERRORLN("Could not request resource \"%s\".", _font.c_str());
+ warning("Could not request resource \"%s\".", _font.c_str());
return NULL;
}
if (resourcePtr->getType() != Resource::TYPE_FONT) {
- BS_LOG_ERRORLN("Requested resource \"%s\" is not a font.", _font.c_str());
+ error("Requested resource \"%s\" is not a font.", _font.c_str());
return NULL;
}