libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cleanup

Browse Source 
svn-id: r34910
This commit is contained in:
Max Horn 2008-11-06 14:03:38 +00:00
parent 142a8d5a51
commit 38a4eaa001
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/savefile.h
View File

@ -136,11 +136,11 @@ public:
/**
* Request a list of available savegames with a given DOS-style pattern,
* also known as "glob" in the UNIX world. Refer to the Common::match()
* also known as "glob" in the UNIX world. Refer to the Common::matchString()
* function to learn about the precise pattern format.
* @param pattern Pattern to match. Wildcards like * or ? are available.
* @return list of strings for all present file names.
* @see Common::match
* @see Common::matchString()
*/
virtual Common::StringList listSavefiles(const char *pattern) = 0;
};

2
engines/scumm/charset.cpp
View File

@ -526,7 +526,7 @@ void CharsetRendererV3::setColor(byte color) {
_color = color;
// FM-TOWNS version of Loom uses old color method as well
if ((_vm->_game.version >= 2) && (_vm->_game.features & GF_16COLOR || (_vm->_game.id == GID_LOOM && _vm->_game.version == 3))) {
if ((_vm->_game.version >= 2) && ((_vm->_game.features & GF_16COLOR) || (_vm->_game.id == GID_LOOM && _vm->_game.version == 3))) {
useShadow = ((_color & 0xF0) != 0);
_color &= 0x0f;
} else if (_vm->_game.features & GF_OLD256) {

2
engines/scumm/detection_tables.h
View File

@ -210,7 +210,7 @@ static const GameSettings gameVariantsTable[] = {
{"loom", "EGA", "ega", GID_LOOM, 3, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI, 0, UNK},
{"loom", "No Adlib", "ega", GID_LOOM, 3, 0, MDT_PCSPK, 0, UNK},
{"loom", "PC-Engine", 0, GID_LOOM, 3, 0, MDT_NONE, GF_AUDIOTRACKS, Common::kPlatformPCEngine},
{"loom", "PC-Engine", 0, GID_LOOM, 3, 0, MDT_NONE, GF_AUDIOTRACKS, Common::kPlatformPCEngine},
{"loom", "FM-TOWNS", 0, GID_LOOM, 3, 0, MDT_TOWNS, GF_AUDIOTRACKS | GF_OLD256, Common::kPlatformFMTowns},
{"loom", "VGA", "vga", GID_LOOM, 4, 0, MDT_NONE, GF_AUDIOTRACKS, Common::kPlatformPC},

11
engines/scumm/script_v5.cpp
View File

@ -624,12 +624,13 @@ void ScummEngine_v5::o5_chainScript() {
// WORKAROUND bug #743314: Work around a bug in script 33 in Indy3 VGA.
// That script is used for the fist fights in the Zeppelin. It uses
// Local[5], even though that is never set to any value. But script 33 is
// called via chainScript by script 32, and in there Local[5] is defined
// to the actor ID of the opposing soldier. So, we copy that value over
// to the Local[5] variable of script 33.
// called via chainScript by script 32, and in there Local[5] is set to
// the actor ID of the opposing soldier. So, we copy that value over to
// the Local[5] variable of script 33.
// FIXME: This workaround is meant for Indy3 VGA, but we make no checks
// to exclude the EGA/Mac/FM-TOWNS versions. Maybe we should check those
// (by looking for GF_OLD256 && !platform=FM-TOWNS
// to exclude the EGA/Mac/FM-TOWNS versions. We need to check whether
// those need the same workaround; if they don't, or if they need it in
// modified form, adjust this workaround accordingly.
if (_game.id == GID_INDY3 && vm.slot[cur].number == 32 && script == 33) {
vars[5] = vm.localvar[cur][5];
}

10
engines/scumm/scumm.h
View File

@ -83,6 +83,9 @@ enum {
* Note that some of them could be replaced by checks for the SCUMM version.
*/
enum GameFeatures {
/** A demo, not a full blown game. */
GF_DEMO = 1 << 0,
/** Games with the AKOS costume system (ScummEngine_v7 and subclasses, HE games). */
GF_NEW_COSTUMES = 1 << 2,
@ -114,7 +117,7 @@ enum GameFeatures {
GF_HE_LOCALIZED = 1 << 13,
/**
* HE Games with more global scripts and different sprite handling
* HE games with more global scripts and different sprite handling
* i.e. read it as HE version 9.85. Used for HE98 only.
*/
GF_HE_985 = 1 << 14,
@ -123,10 +126,7 @@ enum GameFeatures {
GF_16BIT_COLOR = 1 << 15,
/** HE games which use sprites for subtitles */
GF_HE_NOSUBTITLES = 1 << 16,
/** A demo, not a full blown game. */
GF_DEMO = 1 << 17
GF_HE_NOSUBTITLES = 1 << 16
};
/* SCUMM Debug Channels */