[Scummvm-git-logs] scummvm master -> b4c8ec66a574604a49476712dc4e62b544d3e33f

[SupSuper]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
57cefa1ddc DREAMWEB: Convert sprite.cpp from ANSI to UTF-8
b4c8ec66a5 ULTIMA4: Convert scale.cpp from ANSI to UTF-8


Commit: 57cefa1ddc8096884aacb64a4c62824f0539a10b
    https://github.com/scummvm/scummvm/commit/57cefa1ddc8096884aacb64a4c62824f0539a10b
Author: SupSuper (supsuper at gmail.com)
Date: 2020-04-20T21:37:14+01:00

Commit Message:
DREAMWEB: Convert sprite.cpp from ANSI to UTF-8

Gets rid of VS Studio's warnings about illegal characters

Changed paths:
    engines/dreamweb/sprite.cpp


diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index c5b4a2c840..93b17660d2 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -584,17 +584,17 @@ void DreamWebEngine::monks2text() {
 	} else {
 		switch (_introCount) {
 		case 1:
-			monks2ShowText(8);	// WÅchter! Das Netz der TrÅume fÅngt an sich aufzulÖsen
+			monks2ShowText(8);	// WÅchter! Das Netz der TrÅume fÅngt an sich aufzulÖsen
 			break;
 		case 4:	// Floppy
 		case 5:	// CD
 			if ((_introCount == 4 && !hasSpeech()) || (_introCount == 5 && hasSpeech()))
-				monks2ShowText(9);	// Die sieben bÖsen MÅchte der Erde fangen an sich zu sammeln
+				monks2ShowText(9);	// Die sieben bÖsen MÅchte der Erde fangen an sich zu sammeln
 			break;
 		case 7:	// Floppy
 		case 9:	// CD
 			if ((_introCount == 7 && !hasSpeech()) || (_introCount == 9 && hasSpeech()))
-				monks2ShowText(10);	// Wenn sie zu mÅchtig werden, wird das Dreamweb zerstÖrt
+				monks2ShowText(10);	// Wenn sie zu mÅchtig werden, wird das Dreamweb zerstÖrt
 			break;
 		case 10:	// Floppy
 		case 13:	// CD and floppy
@@ -612,12 +612,12 @@ void DreamWebEngine::monks2text() {
 				monks2ShowText(13, 0, 135);
 			break;
 		case 19:
-			monks2ShowText(14);	// SCHWEIGT! Die AuserwÅhlten sammeln sich
+			monks2ShowText(14);	// SCHWEIGT! Die AuserwÃ…hlten sammeln sich
 			break;
 		case 22:	// Floppy
 		case 23:	// CD
 			if ((_introCount == 22 && !hasSpeech()) || (_introCount == 23 && hasSpeech()))
-				monks2ShowText(15);	// Wenn sie ihre KrÅfte entdecken, werden sie zu mÅchtig sein
+				monks2ShowText(15);	// Wenn sie ihre KrÃ…fte entdecken, werden sie zu mÃ…chtig sein
 			break;
 		case 25:	// Floppy
 		case 27:	// CD
@@ -627,7 +627,7 @@ void DreamWebEngine::monks2text() {
 		case 28:	// Floppy
 		case 30:	// CD
 			if ((_introCount == 28 && !hasSpeech()) || (_introCount == 30 && hasSpeech()))
-				monks2ShowText(17);	// Ja. Sie ist zu einem groÜen und stattlichen Man herangewachsen
+				monks2ShowText(17);	// Ja. Sie ist zu einem groÃœen und stattlichen Man herangewachsen
 			break;
 		case 31:	// Floppy
 		case 35:	// CD


Commit: b4c8ec66a574604a49476712dc4e62b544d3e33f
    https://github.com/scummvm/scummvm/commit/b4c8ec66a574604a49476712dc4e62b544d3e33f
Author: SupSuper (supsuper at gmail.com)
Date: 2020-04-20T21:37:15+01:00

Commit Message:
ULTIMA4: Convert scale.cpp from ANSI to UTF-8

Gets rid of VS Studio's warnings about illegal characters

Changed paths:
    engines/ultima/ultima4/gfx/scale.cpp


diff --git a/engines/ultima/ultima4/gfx/scale.cpp b/engines/ultima/ultima4/gfx/scale.cpp
index 232bba2636..bd84dac03a 100644
--- a/engines/ultima/ultima4/gfx/scale.cpp
+++ b/engines/ultima/ultima4/gfx/scale.cpp
@@ -414,7 +414,7 @@ Image *scaleScale2x(Image *src, int scale, int n) {
 				src->getPixel(x, y + yoff1, h.r, h.g, h.b, h.a);
 				src->getPixel(x + xoff1, y + yoff1, i.r, i.g, i.b, i.a);
 
-				// lissen diagonals (45°,135°,225°,315°)
+				// lissen diagonals (45°,135°,225°,315°)
 				// corner : if there is gradient towards a diagonal direction,
 				// take the color of surrounding points in this direction
 				e0 = colorEqual(d, b) && (!colorEqual(b, f)) && (!colorEqual(d, h)) ? d : e;
@@ -422,7 +422,7 @@ Image *scaleScale2x(Image *src, int scale, int n) {
 				e2 = colorEqual(d, h) && (!colorEqual(d, b)) && (!colorEqual(h, f)) ? d : e;
 				e3 = colorEqual(h, f) && (!colorEqual(d, h)) && (!colorEqual(b, f)) ? f : e;
 
-				// lissen eight more directions (22° or 67°, 112° or 157°...)
+				// lissen eight more directions (22° or 67°, 112° or 157°...)
 				// middle of side : if there is a gradient towards one of these directions (middle of side direction and of direction of either diagonal around this side),
 				// take the color of surrounding points in this direction
 				e4 = colorEqual(e0, c) ? e0 : colorEqual(e1, a) ? e1 : e;