aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-09-23 18:48:58 +0200
committerEinar Johan Trøan Sømåen2013-09-23 19:07:24 +0200
commitf5fa2edd220fca94d6b45e5cbc922cbdd5ec22f5 (patch)
tree8c50fd4ef00dbaf701eeb4b3ddeaf72d9c7d0ab9 /engines/wintermute
parentd6c21f8c1e93842d7a1573fc72ce9528b6ed52b7 (diff)
downloadscummvm-rg350-f5fa2edd220fca94d6b45e5cbc922cbdd5ec22f5.tar.gz
scummvm-rg350-f5fa2edd220fca94d6b45e5cbc922cbdd5ec22f5.tar.bz2
scummvm-rg350-f5fa2edd220fca94d6b45e5cbc922cbdd5ec22f5.zip
WINTERMUTE: Remove asserts in Blend-functions in TransparentSurface.
Diffstat (limited to 'engines/wintermute')
-rw-r--r--engines/wintermute/graphics/transparent_surface.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/engines/wintermute/graphics/transparent_surface.cpp b/engines/wintermute/graphics/transparent_surface.cpp
index 4ba74b01de..411ff1f477 100644
--- a/engines/wintermute/graphics/transparent_surface.cpp
+++ b/engines/wintermute/graphics/transparent_surface.cpp
@@ -68,11 +68,6 @@ public:
*/
void BlenderAdditive::blendPixel(byte ina, byte inr, byte ing, byte inb, byte *outa, byte *outr, byte *outg, byte *outb, byte *ca, byte *cr, byte *cg, byte *cb) {
-
-
- assert(!(*cr == 255 && *ca == 255 && *cb == 255 && *cg == 255));
- // Just use the faster, sans-colormod version
-
if (*ca != 255) {
ina = (ina) * (*ca) >> 8;
}
@@ -105,10 +100,6 @@ void BlenderAdditive::blendPixel(byte ina, byte inr, byte ing, byte inb, byte *o
*/
void BlenderSubtractive::blendPixel(byte ina, byte inr, byte ing, byte inb, byte *outa, byte *outr, byte *outg, byte *outb, byte *ca, byte *cr, byte *cg, byte *cb) {
-
- assert(!(*cr == 255 && *ca == 255 && *cb == 255 && *cg == 255));
- // Just use the faster, sans-colormod version
-
//if (*ca != 255) {
// ina = ina * (*ca) >> 8;
// }
@@ -146,10 +137,6 @@ void BlenderSubtractive::blendPixel(byte ina, byte inr, byte ing, byte inb, byte
*/
void BlenderNormal::blendPixel(byte ina, byte inr, byte ing, byte inb, byte *outa, byte *outr, byte *outg, byte *outb, byte *ca, byte *cr, byte *cg, byte *cb) {
-
- assert(!(*cr == 255 && *ca == 255 && *cb == 255 && *cg == 255));
- // Just use the faster, sans-colormod version
-
if (*ca != 255) {
ina = ina * (*ca) >> 8;
}