thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update warnings in mingw makefile.

Browse source 
Add hack to allow nosubtitles in loomcd (Only once game has started)
Revert _roomPalette changes for 256 colors games, caused problems in loomcd, I'm not sure the older 256 color needs these changes.

svn-id: r9890
This commit is contained in:
Travis Howell 2003-08-28 12:21:35 +00:00
parent 0a7dd227b8
commit cf4ae4097f
4 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.mingw
View file

@ -23,7 +23,7 @@ CP = cp
# Default compilation parameters. Normally don't edit these # # Default compilation parameters. Normally don't edit these #
####################################################################### #######################################################################
CXXFLAGS:= -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas CXXFLAGS:= -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
DEFINES := DEFINES :=
LDFLAGS := LDFLAGS :=
INCLUDES:= -I. -Icommon -Iscumm $(SDL_CFLAGS) INCLUDES:= -I. -Icommon -Iscumm $(SDL_CFLAGS)

16
scumm/gfx.cpp
View file

@ -1898,7 +1898,7 @@ void Gdi::unkDecodeB_trans(byte *dst, const byte *src, int height) {
do { do {
FILL_BITS; FILL_BITS;
if (color != _transparentColor) if (color != _transparentColor)
*dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod; *dst = color + _palette_mod;
dst++; dst++;
if (!READ_BIT) { if (!READ_BIT) {
} else if (!READ_BIT) { } else if (!READ_BIT) {
@ -1930,7 +1930,7 @@ void Gdi::unkDecodeC(byte *dst, const byte *src, int height) {
int h = height; int h = height;
do { do {
FILL_BITS; FILL_BITS;
*dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod; *dst = color + _palette_mod;
dst += _vm->_screenWidth; dst += _vm->_screenWidth;
if (!READ_BIT) { if (!READ_BIT) {
} else if (!READ_BIT) { } else if (!READ_BIT) {
@ -2036,7 +2036,7 @@ void Gdi::unkDecode8(byte *dst, const byte *src, int height) {
byte color = *src++; byte color = *src++;
do { do {
*dst = _vm->_roomPalette[color]; *dst = color;
NEXT_ROW NEXT_ROW
} while (--run); } while (--run);
} }
@ -2065,7 +2065,7 @@ void Gdi::unkDecode9(byte *dst, const byte *src, int height) {
color += bits << i; color += bits << i;
} }
for (i = 0; i < ((c & 3) + 2); i++) { for (i = 0; i < ((c & 3) + 2); i++) {
*dst = (run * 16 + _vm->_roomPalette[color]); *dst = (run * 16 + color);
NEXT_ROW NEXT_ROW
} }
break; break;
@ -2077,7 +2077,7 @@ void Gdi::unkDecode9(byte *dst, const byte *src, int height) {
READ_256BIT; READ_256BIT;
color += bits << j; color += bits << j;
} }
*dst = (run * 16 + _vm->_roomPalette[color]); *dst = (run * 16 + color);
NEXT_ROW NEXT_ROW
} }
break; break;
@ -2106,13 +2106,13 @@ void Gdi::unkDecode10(byte *dst, const byte *src, int height) {
for (;;) { for (;;) {
byte color = *src++; byte color = *src++;
if (color < numcolors) { if (color < numcolors) {
*dst = local_palette[_vm->_roomPalette[color]]; *dst = local_palette[color];
NEXT_ROW NEXT_ROW
} else { } else {
uint run = color - numcolors + 1; uint run = color - numcolors + 1;
color = *src++; color = *src++;
do { do {
*dst = _vm->_roomPalette[color]; *dst = color;
NEXT_ROW NEXT_ROW
} while (--run); } while (--run);
} }
@ -2129,7 +2129,7 @@ void Gdi::unkDecode11(byte *dst, const byte *src, int height) {
do { do {
int h = height; int h = height;
do { do {
*dst = _vm->_roomPalette[color]; *dst = color;
dst += _vm->_screenWidth; dst += _vm->_screenWidth;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
READ_256BIT READ_256BIT

5
scumm/script_v5.cpp
View file

@ -1661,8 +1661,13 @@ void Scumm_v5::o5_roomOps() {
b = getVarOrDirectWord(0x40); b = getVarOrDirectWord(0x40);
} }
checkRange(256, 0, a, "o5_roomOps: 2: Illegal room color slot (%d)"); checkRange(256, 0, a, "o5_roomOps: 2: Illegal room color slot (%d)");
if (_features & GF_16COLOR) {
_roomPalette[b] = a; _roomPalette[b] = a;
_fullRedraw = true; _fullRedraw = true;
} else {
_shadowPalette[b] = a;
setDirtyColors(b, b);
}
} else { } else {
error("room-color is no longer a valid command"); error("room-color is no longer a valid command");
} }

9
scumm/string.cpp
View file

@ -16,7 +16,11 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
<<<<<<< string.cpp
* $Header$ * $Header$
=======
* $Header$
>>>>>>> 1.153
* *
*/ */
@ -310,7 +314,10 @@ void Scumm::CHARSET_1() {
if (_version <= 3) { if (_version <= 3) {
_charset->printChar(c); _charset->printChar(c);
} else { } else {
if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle)) { if ((_gameId == GID_LOOM256) && _noSubtitles) {
// FIXME Special case for loomcd, since it only uses CD audio.for sound
// We need a way to check if CD audio is been used
} else if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle)) {
// Subtitles are turned off, and there is a voice version // Subtitles are turned off, and there is a voice version
// of this message -> don't print it. // of this message -> don't print it.
} else } else