[Scummvm-cvs-logs] SF.net SVN: scummvm: [32728] scummvm/trunk/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Jun 17 23:52:59 CEST 2008
Revision: 32728
http://scummvm.svn.sourceforge.net/scummvm/?rev=32728&view=rev
Author: thebluegr
Date: 2008-06-17 14:52:58 -0700 (Tue, 17 Jun 2008)
Log Message:
-----------
Possible fix for bug #1979086 - "DRASCULA: Wrong language detection(?) and crash"
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/drascula/palette.cpp
Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp 2008-06-17 18:27:03 UTC (rev 32727)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-06-17 21:52:58 UTC (rev 32728)
@@ -1669,7 +1669,7 @@
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();
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-06-17 18:27:03 UTC (rev 32727)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-06-17 21:52:58 UTC (rev 32728)
@@ -245,7 +245,7 @@
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 @@
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);
Modified: scummvm/trunk/engines/drascula/palette.cpp
===================================================================
--- scummvm/trunk/engines/drascula/palette.cpp 2008-06-17 18:27:03 UTC (rev 32727)
+++ scummvm/trunk/engines/drascula/palette.cpp 2008-06-17 21:52:58 UTC (rev 32728)
@@ -87,12 +87,12 @@
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::fadeFromBlack(int fadeSpeed) {
- char fade;
+ signed char fade;
unsigned int color, component;
DacPalette256 palFade;
@@ -186,7 +186,7 @@
}
void DrasculaEngine::setPaletteBase(int darkness) {
- char fade;
+ signed char fade;
unsigned int color, component;
for (fade = darkness; fade >= 0; fade--) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list