aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/image
diff options
context:
space:
mode:
authorFilippos Karapetis2011-01-23 15:01:24 +0000
committerFilippos Karapetis2011-01-23 15:01:24 +0000
commit125078582262b40dfa53695c5e3e30d48f1ec380 (patch)
treec0678e6a8a2ef8e68372c71b3d1d66012ce65ddb /engines/sword25/gfx/image
parent04af67d736979272e17b0dcd0e3e4371fc0d07cc (diff)
downloadscummvm-rg350-125078582262b40dfa53695c5e3e30d48f1ec380.tar.gz
scummvm-rg350-125078582262b40dfa53695c5e3e30d48f1ec380.tar.bz2
scummvm-rg350-125078582262b40dfa53695c5e3e30d48f1ec380.zip
SWORD25: Replaced BS_ASSERT() with assert()
svn-id: r55464
Diffstat (limited to 'engines/sword25/gfx/image')
-rw-r--r--engines/sword25/gfx/image/renderedimage.cpp2
-rw-r--r--engines/sword25/gfx/image/swimage.cpp6
-rw-r--r--engines/sword25/gfx/image/vectorimage.cpp2
-rw-r--r--engines/sword25/gfx/image/vectorimage.h10
4 files changed, 10 insertions, 10 deletions
diff --git a/engines/sword25/gfx/image/renderedimage.cpp b/engines/sword25/gfx/image/renderedimage.cpp
index c0eec6570c..d4f493d43c 100644
--- a/engines/sword25/gfx/image/renderedimage.cpp
+++ b/engines/sword25/gfx/image/renderedimage.cpp
@@ -55,7 +55,7 @@ RenderedImage::RenderedImage(const Common::String &filename, bool &result) :
result = false;
PackageManager *pPackage = Kernel::getInstance()->getPackage();
- BS_ASSERT(pPackage);
+ assert(pPackage);
_backSurface = Kernel::getInstance()->getGfx()->getSurface();
diff --git a/engines/sword25/gfx/image/swimage.cpp b/engines/sword25/gfx/image/swimage.cpp
index 143754ce58..ff06491b36 100644
--- a/engines/sword25/gfx/image/swimage.cpp
+++ b/engines/sword25/gfx/image/swimage.cpp
@@ -45,7 +45,7 @@ SWImage::SWImage(const Common::String &filename, bool &result) :
result = false;
PackageManager *pPackage = Kernel::getInstance()->getPackage();
- BS_ASSERT(pPackage);
+ assert(pPackage);
// Datei laden
byte *pFileData;
@@ -104,8 +104,8 @@ bool SWImage::setContent(const byte *pixeldata, uint size, uint offset, uint str
}
uint SWImage::getPixel(int x, int y) {
- BS_ASSERT(x >= 0 && x < _width);
- BS_ASSERT(y >= 0 && y < _height);
+ assert(x >= 0 && x < _width);
+ assert(y >= 0 && y < _height);
return _imageDataPtr[_width * y + x];
}
diff --git a/engines/sword25/gfx/image/vectorimage.cpp b/engines/sword25/gfx/image/vectorimage.cpp
index b2af06105d..094e6a59a8 100644
--- a/engines/sword25/gfx/image/vectorimage.cpp
+++ b/engines/sword25/gfx/image/vectorimage.cpp
@@ -293,7 +293,7 @@ VectorImage::VectorImage(const byte *pFileData, uint fileSize, bool &success, co
// Die Ausführung darf nicht an dieser Stelle ankommen: Entweder es wird ein Shape gefunden, dann wird die Funktion mit vorher verlassen, oder
// es wird keines gefunden, dann tritt eine Exception auf sobald über das Ende der Datei hinaus gelesen wird.
- BS_ASSERT(false);
+ assert(false);
}
VectorImage::~VectorImage() {
diff --git a/engines/sword25/gfx/image/vectorimage.h b/engines/sword25/gfx/image/vectorimage.h
index 3477463b43..79a7519dda 100644
--- a/engines/sword25/gfx/image/vectorimage.h
+++ b/engines/sword25/gfx/image/vectorimage.h
@@ -101,12 +101,12 @@ public:
return _pathInfos.size();
}
const VectorPathInfo &getPathInfo(uint pathNr) const {
- BS_ASSERT(pathNr < getPathCount());
+ assert(pathNr < getPathCount());
return _pathInfos[pathNr];
}
double getLineStyleWidth(uint lineStyle) const {
- BS_ASSERT(lineStyle < _lineStyles.size());
+ assert(lineStyle < _lineStyles.size());
return _lineStyles[lineStyle].width;
}
@@ -115,7 +115,7 @@ public:
}
uint32 getLineStyleColor(uint lineStyle) const {
- BS_ASSERT(lineStyle < _lineStyles.size());
+ assert(lineStyle < _lineStyles.size());
return _lineStyles[lineStyle].color;
}
@@ -124,7 +124,7 @@ public:
}
uint32 getFillStyleColor(uint fillStyle) const {
- BS_ASSERT(fillStyle < _fillStyles.size());
+ assert(fillStyle < _fillStyles.size());
return _fillStyles[fillStyle];
}
@@ -165,7 +165,7 @@ public:
return _elements.size();
}
const VectorImageElement &getElement(uint elementNr) const {
- BS_ASSERT(elementNr < _elements.size());
+ assert(elementNr < _elements.size());
return _elements[elementNr];
}
const Common::Rect &getBoundingBox() const {