Possible fix for bug #1979086 - "DRASCULA: Wrong language detection(?) and crash"

svn-id: r32728

3 files changed, 7 insertions, 7 deletions

diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index feb6cb93ca..b0877a2e3e 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -1669,7 +1669,7 @@ void DrasculaEngine::animation_12_5() {
 	const int frusky_x[] = {100, 139, 178, 217, 100, 178, 217, 139, 100, 139};
 	const int elfrusky_x[] = {1, 68, 135, 1, 68, 135, 1, 68, 135, 68, 1, 135, 68, 135, 68};
 	int color, component;
-	char fade;
+	signed char fade;
 
 	playMusic(26);
 	updateRoom();
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index ce67cc2c0e..567d894b75 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -245,7 +245,7 @@ public:
 
 	void loadPic(const char *NamePcc, byte *targetSurface, int colorCount = 1);
 
-	typedef char DacPalette256[256][3];
+	typedef signed char DacPalette256[256][3];
 
 	void setRGB(byte *pal, int plt);
 	void assignDefaultPalette();
@@ -397,7 +397,7 @@ public:
 	void playFLI(const char *filefli, int vel);
 	void fadeFromBlack(int fadeSpeed);
 	void fadeToBlack(int fadeSpeed);
-	char adjustToVGA(char value);
+	signed char adjustToVGA(signed char value);
 	void color_abc(int cl);
 	void centerText(const char *,int,int);
 	void playSound(int soundNum);
diff --git a/engines/drascula/palette.cpp b/engines/drascula/palette.cpp
index ad57bce618..6a93f21e55 100644
--- a/engines/drascula/palette.cpp
+++ b/engines/drascula/palette.cpp
@@ -87,12 +87,12 @@ void DrasculaEngine::color_abc(int cl) {
 	setPalette((byte *)&gamePalette);
 }
 
-char DrasculaEngine::adjustToVGA(char value) {
+signed char DrasculaEngine::adjustToVGA(signed char value) {
 	return (value & 0x3F) * (value > 0);
 }
 
 void DrasculaEngine::fadeToBlack(int fadeSpeed) {
-	char fade;
+	signed char fade;
 	unsigned int color, component;
 
 	DacPalette256 palFade;
@@ -110,7 +110,7 @@ void DrasculaEngine::fadeToBlack(int fadeSpeed) {
 }
 
 void DrasculaEngine::fadeFromBlack(int fadeSpeed) {
-	char fade;
+	signed char fade;
 	unsigned int color, component;
 
 	DacPalette256 palFade;
@@ -186,7 +186,7 @@ void DrasculaEngine::setDarkPalette() {
 }
 
 void DrasculaEngine::setPaletteBase(int darkness) {
-	char fade;
+	signed char fade;
 	unsigned int color, component;
 
 	for (fade = darkness; fade >= 0; fade--) {