NEVERHOOD: Graphics related changes/fixes:

- Add BitmapFlags enum
- Merge unpackSpriteRle and unpackSpriteRleRepl
- Implement Y flipping in unpackSpriteRle
- Fix Y flipping in AsScene2804CrystalWaves

1 files changed, 3 insertions, 4 deletions

diff --git a/engines/neverhood/resource.cpp b/engines/neverhood/resource.cpp
index e009ff286e..aff3528b45 100644
--- a/engines/neverhood/resource.cpp
+++ b/engines/neverhood/resource.cpp
@@ -42,11 +42,10 @@ SpriteResource::~SpriteResource() {
 
 void SpriteResource::draw(byte *dest, int destPitch, bool flipX, bool flipY) {
 	if (_pixels) {
-		if (_rle) {
+		if (_rle)
 			unpackSpriteRle(_pixels, _dimensions.width, _dimensions.height, dest, destPitch, flipX, flipY);
-		} else {
+		else
 			unpackSpriteNormal(_pixels, _dimensions.width, _dimensions.height, dest, destPitch, flipX, flipY);
-		}
 	}
 }
 
@@ -164,7 +163,7 @@ void AnimResource::draw(uint frameIndex, byte *dest, int destPitch, bool flipX,
 	_width = frameInfo.rect.width;
 	_height = frameInfo.rect.height;
 	if (_replEnabled && _replOldColor != _replNewColor)
-		unpackSpriteRleRepl(_currSpriteData, _width, _height, dest, destPitch, _replOldColor, _replNewColor, flipX, flipY);
+		unpackSpriteRle(_currSpriteData, _width, _height, dest, destPitch, flipX, flipY, _replOldColor, _replNewColor);
 	else
 		unpackSpriteRle(_currSpriteData, _width, _height, dest, destPitch, flipX, flipY);
 }