PRINCE: Graphics::drawTransparentWithTrans fix

scummvm · Aug 12, 2014 · b315003 · b315003
1 parent 6471a35
commit b315003
Showing 1 changed file with 23 additions and 16 deletions.
diff --git a/engines/prince/graphics.cpp b/engines/prince/graphics.cpp
@@ -191,27 +191,34 @@ void GraphicsMan::drawTransparentWithTransDrawNode(Graphics::Surface *screen, Dr
 				if (x + drawNode->posX < screen->w && x + drawNode->posX >= 0) {
 					if (*src2 != 255) {
 						*dst2 = *src2;
-					} else if (x) {
-						if (*(src2 - 1) == 255) {
-							if (x != drawNode->s->w - 1) {
-								if (*(src2 + 1) == 255) {
-									continue;
+					} else {
+						if (x) {
+							if (*(src2 - 1) == 255) {
+								if (x != drawNode->s->w - 1) {
+									if (*(src2 + 1) == 255) {
+										continue;
+									}
 								}
 							}
+						} else if (*(src2 + 1) == 255) {
+							continue;
 						}
-					} else if (*(src2 + 1) == 255) {
-						continue;
-					}
-					byte value = 0;
-					if (y != drawNode->s->h - 1) {
-						value = *(src1 + drawNode->s->pitch + x);
-						if (value == 255) {
-							if (y) {
-								value = *(src1 + x);
-								if (value == 255) {
+						byte value = 0;
+						if (y != drawNode->s->h - 1) {
+							value = *(src2 + drawNode->s->pitch);
+							if (value == 255) {
+								if (y) {
+									value = *(src2 - drawNode->s->pitch);
+									if (value == 255) {
+										continue;
+									}
+								} else {
 									continue;
 								}
-							} else {
+							}
+						} else {
+							value = *(src2 - drawNode->s->pitch);
+							if (value == 255) {
 								continue;
 							}
 						}