libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-27 20:28:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
cd229dc57a
scummvm/scumm/scumm.cpp

3031 lines
88 KiB
C++
Raw Normal View History

Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
updated copyright notice svn-id: r12176
2004-01-06 12:45:34 +00:00
* Copyright (C) 2001-2004 The ScummVM project
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
full screen flag, better mouse cursors, removed change log from individual files svn-id: r3462
2001-11-06 20:00:47 +00:00
* $Header$
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
*
*/
#include "stdafx.h"
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
#include "backends/fs/fs.h"
new module 'base'; moved gameDetector.*, main.cpp and base/plugins.* there (this removes the need for an ugly hack in the build system, and is also conceptionally cleaner) svn-id: r10282
2003-09-17 22:41:01 +00:00
#include "base/gameDetector.h"
added initial support for building our 4 adventure engines as loadable modules; right now only work on OS X; once we add more build rules, other systems with dlopen() should work, too (e.g. Linux); Windows support may come later. This is still very much WIP svn-id: r10304
2003-09-18 18:23:53 +00:00
#include "base/plugins.h"
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
#include "common/config-manager.h"
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
#include "common/md5.h"
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
Add back changes that were reverted svn-id: r5764
2002-11-30 16:47:16 +00:00
#include "gui/message.h"
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
#include "gui/newgui.h"
added a global CostumeRenderer in the VM, to avoid actors reinstancing it every time svn-id: r8307
2003-06-05 02:44:18 +00:00
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
#include "scumm/actor.h"
#include "scumm/akos.h"
#include "scumm/boxes.h"
#include "scumm/charset.h"
#include "scumm/costume.h"
#include "scumm/debugger.h"
#include "scumm/dialogs.h"
synced imuse digital with local tree svn-id: r12187
2004-01-06 17:28:29 +00:00
#include "scumm/imuse_digi/dimuse.h"
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
#include "scumm/imuse.h"
#include "scumm/intern.h"
#include "scumm/object.h"
#include "scumm/player_v1.h"
#include "scumm/player_v2.h"
More Amiga V2/V3 sound updates from _Q_: 1. A Player_MOD class, basically acts as a simplified mixer that mixes at 60Hz intervals (or whatever interval you specify), this gives smooth music playback in player_v3a 2. Some changes to player_v3a as a result of #1, including reduced music volume 3. player_v2a, and the necessary additions to scummvm.cpp/scumm.h svn-id: r10392
2003-09-24 06:56:30 +00:00
#include "scumm/player_v2a.h"
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
#include "scumm/player_v3a.h"
#include "scumm/resource.h"
#include "scumm/scumm.h"
added generated MD5 table (not yet used) svn-id: r12033
2003-12-30 16:53:28 +00:00
#include "scumm/scumm-md5.h"
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
#include "scumm/sound.h"
#include "scumm/verbs.h"
Moved FT INSANE to a separate directory and splitted it to multiple files. svn-id: r12444
2004-01-16 22:18:54 +00:00
#include "scumm/insane/insane.h"
Preliminary support for FT INSANE is added. To enable the code define INSANE in config.h. But only non-interactive parts work and there is no insane scene skip. Only one choice during those scenes is Ctrl+X. svn-id: r11507
2003-12-06 05:47:24 +00:00
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
#include "sound/mididrv.h"
#include "sound/mixer.h"
added a global CostumeRenderer in the VM, to avoid actors reinstancing it every time svn-id: r8307
2003-06-05 02:44:18 +00:00
(somewhat hackish) support for COMI CD changing on Mac OS X; reordered stuff in scumm.h svn-id: r7908
2003-05-24 22:17:45 +00:00
#ifdef MACOSX
#include <sys/types.h>
#include <sys/stat.h>
#endif
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
Fix for #775275 : debugger support on WinCE svn-id: r9114
2003-07-21 22:30:15 +00:00
#ifdef _WIN32_WCE
extern bool isSmartphone(void);
#endif
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
namespace Scumm {
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
enum MouseButtonStatus {
msDown = 1,
msClicked = 2
};
MAJOR change to the way how Engine objects are instantiated svn-id: r4758
2002-08-18 17:48:18 +00:00
// Use g_scumm from error() ONLY
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
ScummEngine *g_scumm = 0;
MAJOR change to the way how Engine objects are instantiated svn-id: r4758
2002-08-18 17:48:18 +00:00
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
struct ScummGameSettings {
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
const char *name;
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
const char *description;
byte id, version;
int midi; // MidiDriverType values
uint32 features;
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
const char *baseFilename;
cleanup whitespaces svn-id: r11217
2003-11-08 21:59:32 +00:00
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
GameSettings toGameSettings() const {
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
GameSettings dummy = { name, description, features };
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
return dummy;
}
};
static const ScummGameSettings scumm_settings[] = {
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
/* Scumm Version 1 */
/* Scumm Version 2 */
Get rid of *64 targets, use 'maniac' and 'zak' autodetection for the AFTER_V1 flag instead. svn-id: r8348
2003-06-06 10:47:12 +00:00
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"maniac", "Maniac Mansion", GID_MANIAC, 2, MDT_PCSPK,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, 0},
Disable maniacnes for now. svn-id: r10840
2003-10-17 03:34:42 +00:00
//{"maniacnes", "Maniac Mansion (NES)", GID_MANIAC, 2, MDT_NONE,
get rid of ScummGameSettings::detectname svn-id: r11023
2003-11-01 16:25:25 +00:00
// GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING | GF_NES},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"zak", "Zak McKracken and the Alien Mindbenders", GID_ZAK, 2, MDT_PCSPK,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, 0},
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
/* Scumm Version 3 */
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"indy3EGA", "Indiana Jones and the Last Crusade", GID_INDY3, 3, MDT_PCSPK | MDT_ADLIB,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, 0},
Preliminary preparation for new YM2612 FM emulator. All the hooks are in, but actual implementation needs to be checked for portability. svn-id: r10615
2003-10-05 15:36:52 +00:00
{"indy3Towns", "Indiana Jones and the Last Crusade (FM Towns)", GID_INDY3, 3, MDT_TOWNS,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS | GF_FMTOWNS | GF_AUDIOTRACKS, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"indy3", "Indiana Jones and the Last Crusade (256)", GID_INDY3, 3, MDT_PCSPK | MDT_ADLIB,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS, 0},
remove old zak256 target, if you're still using this its time to start using the zakTowns target svn-id: r13604
2004-04-23 09:23:17 +00:00
mark zak256 as a depreciated target, zakTowns will be used in future to be more consistent with the other target names. Config magic to automatically set a gameid=zak256 in config files not yet implemented. svn-id: r11238
2003-11-10 00:58:22 +00:00
{"zakTowns", "Zak McKracken and the Alien Mindbenders (FM Towns)", GID_ZAK256, 3, MDT_TOWNS,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FMTOWNS | GF_AUDIOTRACKS, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"loom", "Loom", GID_LOOM, 3, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, 0},
Preliminary preparation for new YM2612 FM emulator. All the hooks are in, but actual implementation needs to be checked for portability. svn-id: r10615
2003-10-05 15:36:52 +00:00
{"loomTowns", "Loom (FM Towns)", GID_LOOM, 3, MDT_TOWNS,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FMTOWNS | GF_AUDIOTRACKS, 0},
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
/* Scumm Version 4 */
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"pass", "Passport to Adventure", GID_PASS, 4, MDT_PCSPK | MDT_ADLIB,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, 0},
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
/* Scumm version 5 */
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"monkeyVGA", "Monkey Island 1 (256 color Floppy version)", GID_MONKEY_VGA, 4, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_USE_KEY, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"loomcd", "Loom (256 color CD version)", GID_LOOM256, 4, MDT_NONE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS, 0},
monkey has no native midi resources and SPK isn't support yet. svn-id: r9992
2003-09-04 11:40:12 +00:00
{"monkey", "Monkey Island 1", GID_MONKEY, 5, /*MDT_PCSPK |*/ MDT_ADLIB,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_USE_KEY | GF_AUDIOTRACKS, 0},
Leave SPK resources in monkey1 disabled too. svn-id: r9993
2003-09-04 15:24:58 +00:00
{"monkey1", "Monkey Island 1 (alt)", GID_MONKEY, 5, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_USE_KEY | GF_AUDIOTRACKS, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"game", "Monkey Island 1 (SegaCD version)", GID_MONKEY_SEGA, 5, MDT_NONE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_USE_KEY | GF_AUDIOTRACKS, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"monkey2", "Monkey Island 2: LeChuck's revenge", GID_MONKEY2, 5, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_USE_KEY, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"mi2demo", "Monkey Island 2: LeChuck's revenge (Demo)", GID_MONKEY2, 5, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_USE_KEY, 0},
cleaned up the target list a bit; it would be really nice to unify some of them (like, for example, all the FOA and Sam targets) svn-id: r12767
2004-02-07 17:23:31 +00:00
{"atlantis", "Indiana Jones and the Fate of Atlantis", GID_INDY4, 5, MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_USE_KEY, 0},
cleaned up the target list a bit; it would be really nice to unify some of them (like, for example, all the FOA and Sam targets) svn-id: r12767
2004-02-07 17:23:31 +00:00
{"playfate", "Indiana Jones and the Fate of Atlantis (Demo)", GID_INDY4, 5, MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_USE_KEY, 0},
cleaned up the target list a bit; it would be really nice to unify some of them (like, for example, all the FOA and Sam targets) svn-id: r12767
2004-02-07 17:23:31 +00:00
{"fate", "Indiana Jones and the Fate of Atlantis (Demo)", GID_INDY4, 5, MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_USE_KEY, 0},
cleaned up the target list a bit; it would be really nice to unify some of them (like, for example, all the FOA and Sam targets) svn-id: r12767
2004-02-07 17:23:31 +00:00
{"indy4", "Indiana Jones and the Fate of Atlantis (FM Towns)", GID_INDY4, 5, MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_USE_KEY, 0},
cleaned up the target list a bit; it would be really nice to unify some of them (like, for example, all the FOA and Sam targets) svn-id: r12767
2004-02-07 17:23:31 +00:00
{"indydemo", "Indiana Jones and the Fate of Atlantis (FM Towns Demo)", GID_INDY4, 5, MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_USE_KEY, 0},
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
/* Scumm Version 6 */
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"tentacle", "Day Of The Tentacle", GID_TENTACLE, 6, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_NEW_OPCODES | GF_USE_KEY, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"dottdemo", "Day Of The Tentacle (Demo)", GID_TENTACLE, 6, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_NEW_OPCODES | GF_USE_KEY, 0},
moved GameId declaration to common/engine.h (more logical); moved scumm specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies) svn-id: r8496
2003-06-15 01:42:19 +00:00
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"samnmax", "Sam & Max", GID_SAMNMAX, 6, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_NEW_OPCODES | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"samdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
cleaned up the target list a bit; it would be really nice to unify some of them (like, for example, all the FOA and Sam targets) svn-id: r12767
2004-02-07 17:23:31 +00:00
GF_NEW_OPCODES | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"snmdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
cleaned up the target list a bit; it would be really nice to unify some of them (like, for example, all the FOA and Sam targets) svn-id: r12767
2004-02-07 17:23:31 +00:00
GF_NEW_OPCODES | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER, 0},
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"snmidemo", "Sam & Max (Interactive WIP Demo)", GID_SAMNMAX, 6, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
cleaned up the target list a bit; it would be really nice to unify some of them (like, for example, all the FOA and Sam targets) svn-id: r12767
2004-02-07 17:23:31 +00:00
GF_NEW_OPCODES | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER, 0},
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
// {"test", "Test demo game", GID_SAMNMAX, 6, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE, GF_NEW_OPCODES, 0},
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
/* Scumm Version 7 */
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"ft", "Full Throttle", GID_FT, 7, MDT_NONE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, 0},
cleaned up the target list a bit; it would be really nice to unify some of them (like, for example, all the FOA and Sam targets) svn-id: r12767
2004-02-07 17:23:31 +00:00
{"ftdemo", "Full Throttle (Mac Demo)", GID_FT, 7, MDT_NONE,
o Now Long TRS messages get wrapped o Approaching enemy animation fixed o Renames some vars and struct members o Fixed dosdemo. It didn't run o Correct Mac demo INSANE skipping behaviour svn-id: r12751
2004-02-06 21:05:58 +00:00
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, 0},
Add back full throttle pc demo target svn-id: r11339
2003-11-18 02:20:12 +00:00
{"ftpcdemo", "Full Throttle (PC Demo)", GID_FT, 7, MDT_NONE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, "ft"},
added support for FT mac demo svn-id: r9351
2003-07-31 22:57:04 +00:00
Add back full throttle pc demo target svn-id: r11339
2003-11-18 02:20:12 +00:00
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"dig", "The Dig", GID_DIG, 7, MDT_NONE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, 0},
replaced demo GIDs wth GF_DEMO svn-id: r11326
2003-11-17 21:16:43 +00:00
{"digdemo", "The Dig (Demo)", GID_DIG, 7, MDT_NONE,
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, "dig"},
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
640x480 games not supported on PalmOS svn-id: r13145
2004-03-02 13:09:35 +00:00
#ifndef __PALM_OS__
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
/* Scumm Version 8 */
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible list of music types supported. This was done because now PC speaker support must be treated separately, along with Adlib and native (GM/MT32) support. This fixes a problem with games that don't support PC speaker (including V5 games that don't parse SPK resources yet) being run with -epcspk or -epcjr. Those games now properly switch to -enull so that music resources still get parsed and music/script synchronization mechanisms don't break. svn-id: r9703
2003-08-15 10:19:24 +00:00
{"comi", "The Curse of Monkey Island", GID_CMI, 8, MDT_NONE,
undo this change (proper warning fix was applied to gameDetector.h) svn-id: r12502
2004-01-18 20:47:17 +00:00
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER, 0},
replaced demo GIDs wth GF_DEMO svn-id: r11326
2003-11-17 21:16:43 +00:00
{"comidemo", "The Curse of Monkey Island (Demo)", GID_CMI, 8, MDT_NONE,
undo this change (proper warning fix was applied to gameDetector.h) svn-id: r12502
2004-01-18 20:47:17 +00:00
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER | GF_DEMO, "comi"},
Alter some HE games settings svn-id: r13369
2004-03-23 01:59:02 +00:00
#endif
replaced demo GIDs wth GF_DEMO svn-id: r11326
2003-11-17 21:16:43 +00:00
Move HE games together. svn-id: r13370
2004-03-23 03:33:23 +00:00
// Humongous Entertainment Scumm Version 6
{"puttputt", "Putt-Putt Joins The Parade", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"puttdemo", "Putt-Putt Joins The Parade (Demo)", GID_PUTTDEMO, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS, 0},
{"moondemo", "Putt-Putt Goes To The Moon (Demo)", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"puttmoon", "Putt-Putt Goes To The Moon", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"funpack", "Putt-Putt's Fun Pack", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"fbpack", "Fatty Bear's Fun Pack", GID_FBPACK, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"fbear", "Fatty Bear's Birthday Surprise", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"fbdemo", "Fatty Bear's Birthday Surprise (Demo)", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
Alter some HE games settings svn-id: r13369
2004-03-23 01:59:02 +00:00
#ifdef HEGAMES
add putttime target svn-id: r10257
2003-09-14 22:46:47 +00:00
/* Note that both full versions of Humongous games and demos were often released for
* several interpreter versions... */
Move HE games together. svn-id: r13370
2004-03-23 03:33:23 +00:00
// Humongous Entertainment Scumm Version 7
Alter some HE games settings svn-id: r13369
2004-03-23 01:59:02 +00:00
{"catalog", "Humongous Interactive Catalog", GID_PUTTPUTT, 6, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"farm", "Let's Explore the Farm with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_PUTTPUTT, 6, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"airport", "Let's Explore the Airport with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"airdemo", "Let's Explore the Airport with Buzzy (Demo)", GID_PUTTPUTT, 6, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"jungle", "Let's Explore the Jungle with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"puttzoo", "Putt-Putt Saves the Zoo", GID_PUTTPUTT, 6, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
Move HE games together. svn-id: r13370
2004-03-23 03:33:23 +00:00
{"freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds", GID_FREDDI, 6, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
comment out all the targets for newer humongous games until they start doing something useful svn-id: r11235
2003-11-09 23:50:40 +00:00
// Humongous Entertainment Scumm Version 8.0 ? Scummsrc.80
Alter some HE games settings svn-id: r13369
2004-03-23 01:59:02 +00:00
{"zoodemo", "Putt-Putt Saves the Zoo (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
{"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_FREDDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
{"ff2-demo", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
{"freddi2", "Freddi Fish 2: The Case of the Haunted Schoolhouse", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
{"maze", "Freddi Fish and Luther's Maze Madness", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
{"water", "Freddi Fish and Luther's Water Worries", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
{"pjs-demo", "Pajama Sam 1: No Need to Hide When It's Dark Outside (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
{"socks", "Pajama Sam's Sock Works", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
//Not checked
{"ffhsdemo", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
// Resource changed
{"pajama", "Pajama Sam 1: No Need to Hide When It's Dark Outside", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
add a bunch of known targets for some of the newer humongous games, maybe we should move the target list out into another file? there are a few more to add after they are known as well... svn-id: r9987
2003-09-03 10:34:04 +00:00
comment out all the targets for newer humongous games until they start doing something useful svn-id: r11235
2003-11-09 23:50:40 +00:00
// Humongous Entertainment Scumm Version 9.0 ? Scummsys.90
Alter some HE games settings svn-id: r13369
2004-03-23 01:59:02 +00:00
{"kinddemo", "Big Thinkers Kindergarten (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"1grademo", "Big Thinkers First Grade (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"f3-mdemo", "Freddi Fish 3: The Case of the Stolen Conch Shell (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"timedemo", "Putt-Putt Travels Through Time (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"spyfox", "Spyfox 1: Dry Cereal", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"foxdemo", "Spyfox 1: Dry Cereal (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"spydemo", "Spyfox 1: Dry Cereal (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
add a bunch of known targets for some of the newer humongous games, maybe we should move the target list out into another file? there are a few more to add after they are known as well... svn-id: r9987
2003-09-03 10:34:04 +00:00
comment out all the targets for newer humongous games until they start doing something useful svn-id: r11235
2003-11-09 23:50:40 +00:00
// Humongous Entertainment Scumm Version 9.5 ? Scummsys.95
Alter some HE games settings svn-id: r13369
2004-03-23 01:59:02 +00:00
{"pj2demo", "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"pajama2", "Pajama Sam 2: Thunder and Lightning Aren't so Frightening", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"chase", "Spy Fox in Cheese Chase Game", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
added two HE games svn-id: r10466
2003-09-28 16:26:06 +00:00
comment out all the targets for newer humongous games until they start doing something useful svn-id: r11235
2003-11-09 23:50:40 +00:00
// Humongous Entertainment Scumm Version 9.8 ? Scummsys.98
// these and later games can easily be identified by the .(a) file instead of a .he1
Alter some HE games settings svn-id: r13369
2004-03-23 01:59:02 +00:00
{"freddi4", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"f4-demo", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"lost", "Pajama Sam's Lost & Found", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"racedemo", "Putt-Putt Enters the Race (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"puttrace", "Putt-Putt Enters the Race", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
Update HE games list Keep games divded by versions svn-id: r13133
2004-03-02 04:05:40 +00:00
// Humongous Entertainment Scumm Version 9.9 ? Scummsys.99
Alter some HE games settings svn-id: r13369
2004-03-23 01:59:02 +00:00
{"sf2-demo", "Spyfox 2: Some Assembly Required (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"spyfox2", "Spyfox 2: Some Assembly Required", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"mustard", "Spy Fox in Hold the Mustard", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
add a bunch of known targets for some of the newer humongous games, maybe we should move the target list out into another file? there are a few more to add after they are known as well... svn-id: r9987
2003-09-03 10:34:04 +00:00
comment out all the targets for newer humongous games until they start doing something useful svn-id: r11235
2003-11-09 23:50:40 +00:00
// Humongous Entertainment Scumm Version ? engine moved to c++
Alter some HE games settings svn-id: r13369
2004-03-23 01:59:02 +00:00
{"ff5demo", "Freddi Fish 5: The Case of the Creature of Coral Cave (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"pj3-demo", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Demo)", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"dog", "Putt-Putt and Pep's Dog on a Stick", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"PuttsFunShop", "Putt-Putt's One-Stop Fun Shop", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"putttime", "Putt-Putt Travels Through Time", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"spyozon", "Spyfox 3: Operation Ozone", GID_PJSDEMO, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
640x480 games not supported on PalmOS svn-id: r13145
2004-03-02 13:09:35 +00:00
#endif
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
{NULL, NULL, 0, 0, MDT_NONE, 0, 0}
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list) svn-id: r6652
2003-03-01 22:04:48 +00:00
};
hook up MD5 database (this is still kind of a hack, but at least it shows that the approach works :-) svn-id: r12035
2003-12-30 19:08:45 +00:00
static int compareMD5Table(const void *a, const void *b) {
const char *key = (const char *)a;
const MD5Table *elem = (const MD5Table *)b;
return strcmp(key, elem->md5);
}
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs)
cut down on unnecessary GameDetector references svn-id: r11239
2003-11-10 01:04:12 +00:00
: Engine(syst),
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
_gameId(gs.id),
_version(gs.version),
_features(gs.features),
remade the in-game GUI/menu svn-id: r11119
2003-11-03 23:26:13 +00:00
gdi(this), _pauseDialog(0), _optionsDialog(0), _mainMenuDialog(0),
Fixed warning svn-id: r10793
2003-10-14 08:31:56 +00:00
_targetName(detector->_targetName) {
some more cleanup svn-id: r4761
2002-08-18 18:39:42 +00:00
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
// Init all vars - maybe now we can get rid of our custom new/delete operators?
_imuse = NULL;
_imuseDigital = NULL;
code simplification svn-id: r10762
2003-10-12 17:33:29 +00:00
_musicEngine = NULL;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_verbs = NULL;
_objs = NULL;
_debugger = NULL;
 Valgrind warning fix from Endy svn-id: r12379
2004-01-14 10:40:54 +00:00
_debugFlags = 0;
added quit event svn-id: r8398
2003-06-08 12:11:14 +00:00
_sound = NULL;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
memset(&res, 0, sizeof(res));
memset(&vm, 0, sizeof(vm));
_smushFrameRate = 0;
added quit event svn-id: r8398
2003-06-08 12:11:14 +00:00
_videoFinished = false;
Fix pause mode during video/smush playback svn-id: r11899
2003-12-25 02:55:00 +00:00
_smushPaused = false;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_quit = false;
_pauseDialog = NULL;
_optionsDialog = NULL;
remade the in-game GUI/menu svn-id: r11119
2003-11-03 23:26:13 +00:00
_mainMenuDialog = NULL;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_fastMode = 0;
_actors = NULL;
_inventory = NULL;
_newNames = NULL;
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
_scummVars = NULL;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_varwatch = 0;
_bitVars = NULL;
_numVariables = 0;
_numBitVariables = 0;
_numLocalObjects = 0;
_numGlobalObjects = 0;
_numArray = 0;
_numVerbs = 0;
_numFlObject = 0;
_numInventory = 0;
_numRooms = 0;
_numScripts = 0;
_numSounds = 0;
_numCharsets = 0;
_numNewNames = 0;
_numGlobalScripts = 0;
NUM_ACTORS -> _numActors (for consistency) svn-id: r7489
2003-05-13 23:42:41 +00:00
_numActors = 0;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_numCostumes = 0;
_audioNames = NULL;
_numAudioNames = 0;
_curActor = 0;
_curVerb = 0;
_curVerbSlot = 0;
_curPalIndex = 0;
_currentRoom = 0;
_egoPositioned = false;
_keyPressed = 0;
_lastKeyHit = 0;
_mouseButStat = 0;
_leftBtnPressed = 0;
_rightBtnPressed = 0;
_bootParam = 0;
_dumpScripts = false;
_debugMode = 0;
_objectOwnerTable = NULL;
_objectRoomTable = NULL;
_objectStateTable = NULL;
_numObjectsInRoom = 0;
_userPut = 0;
Fix this damn userface stuff properly :) svn-id: r7772
2003-05-21 07:22:43 +00:00
_userState = 0;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_resourceHeaderSize = 0;
_saveLoadFlag = 0;
_saveLoadSlot = 0;
_lastSaveTime = 0;
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
_saveTemporaryState = false;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(_saveLoadName, 0, sizeof(_saveLoadName));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_maxHeapThreshold = 0;
_minHeapThreshold = 0;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(_localScriptList, 0, sizeof(_localScriptList));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_scriptPointer = NULL;
_scriptOrgPointer = NULL;
_opcode = 0;
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
vm.numNestedScripts = 0;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_currentScript = 0;
_curExecScript = 0;
_lastCodePtr = NULL;
_resultVarNumber = 0;
_scummStackPos = 0;
unify _vm / _scumm usage svn-id: r12262
2004-01-08 20:37:26 +00:00
memset(_vmStack, 0, sizeof(_vmStack));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_keyScriptKey = 0;
_keyScriptNo = 0;
_fileOffset = 0;
_dynamicRoomOffsets = false;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(_resourceMapper, 0, sizeof(_resourceMapper));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_allocatedSize = 0;
_expire_counter = 0;
_lastLoadedRoom = 0;
_roomResource = 0;
OF_OWNER_ROOM = 0;
_verbMouseOver = 0;
_inventoryOffset = 0;
_classData = NULL;
_actorToPrintStrFor = 0;
_sentenceNum = 0;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(_sentence, 0, sizeof(_sentence));
memset(_string, 0, sizeof(_string));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_screenB = 0;
_screenH = 0;
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive) svn-id: r7423
2003-05-10 21:49:59 +00:00
_roomHeight = 0;
_roomWidth = 0;
_screenHeight = 0;
_screenWidth = 0;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(virtscr, 0, sizeof(virtscr));
memset(&camera, 0, sizeof(CameraData));
memset(_colorCycle, 0, sizeof(_colorCycle));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_ENCD_offs = 0;
_EXCD_offs = 0;
_CLUT_offs = 0;
_IM00_offs = 0;
_PALS_offs = 0;
_fullRedraw = false;
_BgNeedsRedraw = false;
_verbRedraw = false;
_screenEffectFlag = false;
_completeScreenRedraw = false;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(&_cursor, 0, sizeof(_cursor));
memset(_grabbedCursor, 0, sizeof(_grabbedCursor));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_currentCursor = 0;
_newEffect = 0;
_switchRoomEffect2 = 0;
_switchRoomEffect = 0;
_doEffect = false;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(&_flashlight, 0, sizeof(_flashlight));
cache room strip offsets (this should help performance on PalmOS) svn-id: r8300
2003-06-04 21:45:29 +00:00
_roomStrips = 0;
spelling svn-id: r8062
2003-05-28 21:28:30 +00:00
_bompActorPalettePtr = NULL;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_shakeEnabled= false;
_shakeFrame = 0;
_screenStartStrip = 0;
_screenEndStrip = 0;
_screenLeft = 0;
_screenTop = 0;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
_blastObjectQueuePos = 0;
memset(_blastObjectQueue, 0, sizeof(_blastObjectQueue));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_blastTextQueuePos = 0;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(_blastTextQueue, 0, sizeof(_blastTextQueue));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_drawObjectQueNr = 0;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(_drawObjectQue, 0, sizeof(_drawObjectQue));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_palManipStart = 0;
_palManipEnd = 0;
_palManipCounter = 0;
_palManipPalette = NULL;
_palManipIntermediatePal = NULL;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(gfxUsageBits, 0, sizeof(gfxUsageBits));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_shadowPalette = NULL;
_shadowPaletteSize = 0;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(_currentPalette, 0, sizeof(_currentPalette));
memset(_proc_special_palette, 0, sizeof(_proc_special_palette));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_palDirtyMin = 0;
_palDirtyMax = 0;
_haveMsg = 0;
_useTalkAnims = false;
_defaultTalkDelay = 0;
Added PC Speaker and PCjr command line options, in preparation for Kirben's addition of WA support for games that already have AD tracks. svn-id: r9656
2003-08-13 14:08:21 +00:00
_midiDriver = MD_NULL;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
tempMusic = 0;
Fix for Bug [766851] ALL: MIDI fragment repeats after close ups Adjusted default _saveSound value used by S&M (whose value is assumed by pre-S&M games). Corrected save/load music behavior for non-temporary saves. (Until this default value change, the incorrect behavior would almost never manifest itself, so existing savegames should be fine.) svn-id: r9035
2003-07-15 10:16:45 +00:00
_saveSound = 0;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(_extraBoxFlags, 0, sizeof(_extraBoxFlags));
memset(_scaleSlots, 0, sizeof(_scaleSlots));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_charset = NULL;
_charsetColor = 0;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(_charsetColorMap, 0, sizeof(_charsetColorMap));
memset(_charsetData, 0, sizeof(_charsetData));
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_charsetBufPos = 0;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
memset(_charsetBuffer, 0, sizeof(_charsetBuffer));
Set vars to 0 on startup. svn-id: r11625
2003-12-14 04:43:04 +00:00
_copyProtection = false;
_demoMode = false;
Patch #715991: Quit Confirmation Dialog (feature request #642721) with some tweaks by me svn-id: r9210
2003-07-28 01:36:16 +00:00
_confirmExit = false;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
_talkDelay = 0;
_keepText = false;
_existLanguageFile = false;
_languageBuffer = NULL;
_languageIndex = NULL;
renamed _bcr -> _costumeRenderer svn-id: r8473
2003-06-14 13:38:22 +00:00
_costumeRenderer = NULL;
init _2byteFontPtr svn-id: r8469
2003-06-14 12:24:42 +00:00
_2byteFontPtr = 0;
Fix valgrind warning svn-id: r12771
2004-02-08 05:12:18 +00:00
_V1_talkingActor = 0;
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
//
// Init all VARS to 0xFF
//
VAR_LANGUAGE = 0xFF;
VAR_KEYPRESS = 0xFF;
added lipSync code svn-id: r12284
2004-01-09 22:10:32 +00:00
VAR_SYNC = 0xFF;
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR_EGO = 0xFF;
VAR_CAMERA_POS_X = 0xFF;
VAR_HAVE_MSG = 0xFF;
VAR_ROOM = 0xFF;
VAR_OVERRIDE = 0xFF;
VAR_MACHINE_SPEED = 0xFF;
VAR_ME = 0xFF;
VAR_NUM_ACTOR = 0xFF;
VAR_CURRENT_LIGHTS = 0xFF;
VAR_CURRENTDRIVE = 0xFF; // How about merging this with VAR_CURRENTDISK?
VAR_CURRENTDISK = 0xFF;
VAR_TMR_1 = 0xFF;
VAR_TMR_2 = 0xFF;
VAR_TMR_3 = 0xFF;
VAR_MUSIC_TIMER = 0xFF;
VAR_ACTOR_RANGE_MIN = 0xFF;
VAR_ACTOR_RANGE_MAX = 0xFF;
VAR_CAMERA_MIN_X = 0xFF;
VAR_CAMERA_MAX_X = 0xFF;
VAR_TIMER_NEXT = 0xFF;
VAR_VIRT_MOUSE_X = 0xFF;
VAR_VIRT_MOUSE_Y = 0xFF;
VAR_ROOM_RESOURCE = 0xFF;
VAR_LAST_SOUND = 0xFF;
VAR_CUTSCENEEXIT_KEY = 0xFF;
VAR_OPTIONS_KEY = 0xFF;
VAR_TALK_ACTOR = 0xFF;
VAR_CAMERA_FAST_X = 0xFF;
VAR_SCROLL_SCRIPT = 0xFF;
VAR_ENTRY_SCRIPT = 0xFF;
VAR_ENTRY_SCRIPT2 = 0xFF;
VAR_EXIT_SCRIPT = 0xFF;
VAR_EXIT_SCRIPT2 = 0xFF;
VAR_VERB_SCRIPT = 0xFF;
VAR_SENTENCE_SCRIPT = 0xFF;
runHook -> runInventoryScript, VAR_HOOK_SCRIPT -> VAR_INVENTORY_SCRIPT svn-id: r8468
2003-06-14 12:23:30 +00:00
VAR_INVENTORY_SCRIPT = 0xFF;
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR_CUTSCENE_START_SCRIPT = 0xFF;
VAR_CUTSCENE_END_SCRIPT = 0xFF;
VAR_CHARINC = 0xFF;
V2 text drawing svn-id: r7502
2003-05-14 13:30:52 +00:00
VAR_CHARCOUNT = 0xFF;
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR_WALKTO_OBJ = 0xFF;
VAR_DEBUGMODE = 0xFF;
VAR_HEAPSPACE = 0xFF;
VAR_RESTART_KEY = 0xFF;
VAR_PAUSE_KEY = 0xFF;
VAR_MOUSE_X = 0xFF;
VAR_MOUSE_Y = 0xFF;
VAR_TIMER = 0xFF;
VAR_TMR_4 = 0xFF;
VAR_SOUNDCARD = 0xFF;
VAR_VIDEOMODE = 0xFF;
remade the in-game GUI/menu svn-id: r11119
2003-11-03 23:26:13 +00:00
VAR_MAINMENU_KEY = 0xFF;
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR_FIXEDDISK = 0xFF;
VAR_CURSORSTATE = 0xFF;
VAR_USERPUT = 0xFF;
VAR_SOUNDRESULT = 0xFF;
VAR_TALKSTOP_KEY = 0xFF;
rework loom subtitle option handing svn-id: r8448
2003-06-12 16:38:43 +00:00
VAR_NOSUBTITLES = 0xFF;
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR_SOUNDPARAM = 0xFF;
VAR_SOUNDPARAM2 = 0xFF;
VAR_SOUNDPARAM3 = 0xFF;
VAR_MOUSEPRESENT = 0xFF;
VAR_PERFORMANCE_1 = 0xFF;
VAR_PERFORMANCE_2 = 0xFF;
VAR_ROOM_FLAG = 0xFF;
VAR_GAME_LOADED = 0xFF;
VAR_NEW_ROOM = 0xFF;
VAR_VERSION = 0xFF;
VAR_V5_TALK_STRING_Y = 0xFF;
VAR_V6_SCREEN_WIDTH = 0xFF;
VAR_V6_SCREEN_HEIGHT = 0xFF;
VAR_V6_EMSSPACE = 0xFF;
VAR_CAMERA_POS_Y = 0xFF;
VAR_CAMERA_MIN_Y = 0xFF;
VAR_CAMERA_MAX_Y = 0xFF;
VAR_CAMERA_THRESHOLD_X = 0xFF;
VAR_CAMERA_THRESHOLD_Y = 0xFF;
VAR_CAMERA_SPEED_X = 0xFF;
VAR_CAMERA_SPEED_Y = 0xFF;
VAR_CAMERA_ACCEL_X = 0xFF;
VAR_CAMERA_ACCEL_Y = 0xFF;
VAR_CAMERA_DEST_X = 0xFF;
VAR_CAMERA_DEST_Y = 0xFF;
VAR_CAMERA_FOLLOWED_ACTOR = 0xFF;
VAR_LEFTBTN_DOWN = 0xFF;
VAR_RIGHTBTN_DOWN = 0xFF;
VAR_LEFTBTN_HOLD = 0xFF;
VAR_RIGHTBTN_HOLD = 0xFF;
VAR_MOUSE_BUTTONS = 0xFF;
VAR_MOUSE_HOLD = 0xFF;
renamed VAR_UNK_SCRIPT to VAR_SAVELOAD_SCRIPT; fixed V8 save/load (no (known) VAR_SAVELOAD_SCRIPT value for V8) svn-id: r7485
2003-05-13 17:51:56 +00:00
VAR_SAVELOAD_SCRIPT = 0xFF;
VAR_SAVELOAD_SCRIPT2 = 0xFF;
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR_DEFAULT_TALK_DELAY = 0xFF;
VAR_CHARSET_MASK = 0xFF;
VAR_CUSTOMSCALETABLE = 0xFF;
VAR_V6_SOUNDMODE = 0xFF;
yet another V2 sentence fix (now clicking on objects in Zak causes Zak to talk to it - but he gets stuck after some time) svn-id: r7613
2003-05-17 18:42:31 +00:00
VAR_ACTIVE_VERB = 0xFF;
VAR_ACTIVE_OBJECT1 = 0xFF;
VAR_ACTIVE_OBJECT2 = 0xFF;
VAR_VERB_ALLOWED = 0xFF;
init vars to 255 if they are not defined for all Scumm versions svn-id: r7603
2003-05-17 10:04:30 +00:00
VAR_CLICK_AREA = 0xFF;
Variable should be checked at this point. svn-id: r12942
2004-02-20 15:04:51 +00:00
VAR_BLAST_ABOVE_TEXT = 0xFF;
Enable and use VAR_VOICE_MODE svn-id: r12979
2004-02-22 03:08:18 +00:00
VAR_VOICE_MODE = 0xFF;
Variable should be checked at this point. svn-id: r12942
2004-02-20 15:04:51 +00:00
MAJOR change to the way how Engine objects are instantiated svn-id: r4758
2002-08-18 17:48:18 +00:00
// Use g_scumm from error() ONLY
g_scumm = this;
cleanup; got rid of Gdi::_palette_mod in favor of Gdi::_roomPalette svn-id: r10778
2003-10-13 12:56:53 +00:00
// Read settings from the detector & config manager
fix debug mode 0 svn-id: r10791
2003-10-14 07:52:34 +00:00
_debugMode = ConfMan.hasKey("debuglevel");
get rid of DUMP_SCRIPTS; in its place, added run time option '-u' to enabled script dumping svn-id: r6284
2002-12-31 02:09:57 +00:00
_dumpScripts = detector->_dumpScripts;
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
_bootParam = ConfMan.getInt("boot_param");
some more target<->game cleanup svn-id: r10769
2003-10-12 19:10:17 +00:00
// Allow the user to override the game name with a custom string.
// This allows some game versions to work which use filenames
// differing from the regular version(s) of that game.
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
_gameName = ConfMan.hasKey("basename") ? ConfMan.get("basename") : gs.baseFilename ? gs.baseFilename : gs.name;
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
_midiDriver = GameDetector::detectMusicDriver(gs.midi);
set _version to detector value svn-id: r8367
2003-06-06 23:56:56 +00:00
Add option to enable copy protection in SCUMM games, which ScummVM disable it by default. svn-id: r11571
2003-12-11 06:08:43 +00:00
_copyProtection = ConfMan.getBool("copy_protection");
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
_demoMode = ConfMan.getBool("demo_mode");
Backwards compatbility svn-id: r11459
2003-12-02 08:12:39 +00:00
if (ConfMan.hasKey("nosubtitles")) {
warning("Configuration key 'nosubtitles' is deprecated. Use 'subtitles' instead");
get rid of _noSubtitles, use ConfigManager directly instead; clean up some IMuseDigital oddities svn-id: r11966
2003-12-27 15:22:59 +00:00
if (!ConfMan.hasKey("subtitles"))
ConfMan.set("subtitles", !ConfMan.getBool("nosubtitles"));
Backwards compatbility svn-id: r11459
2003-12-02 08:12:39 +00:00
}
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
_confirmExit = ConfMan.getBool("confirm_exit");
_native_mt32 = ConfMan.getBool("native_mt32");
moved platform/language constants to common/util.* svn-id: r10862
2003-10-17 15:35:46 +00:00
// TODO: We shouldn't rely on the global Language values matching those COMI etc. expect.
// Rather we should explicitly translate them.
_language = Common::parseLanguage(ConfMan.get("language"));
Some other inits added to prepare for the 'new / delete' overloading removal. svn-id: r5537
2002-11-13 15:44:33 +00:00
memset(&res, 0, sizeof(res));
cleanup svn-id: r7488
2003-05-13 23:33:01 +00:00
_hexdumpScripts = false;
_showStack = false;
Some other inits added to prepare for the 'new / delete' overloading removal. svn-id: r5537
2002-11-13 15:44:33 +00:00
Make use of the MD5-based game detection in the launcher svn-id: r12766
2004-02-07 17:12:10 +00:00
if (_features & GF_FMTOWNS) { // FMTowns V3 games use 320x240
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive) svn-id: r7423
2003-05-10 21:49:59 +00:00
_screenWidth = 320;
_screenHeight = 240;
Move HE games together. svn-id: r13370
2004-03-23 03:33:23 +00:00
} else if (_features & GF_DEFAULT_TO_1X_SCALER) {
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive) svn-id: r7423
2003-05-10 21:49:59 +00:00
_screenWidth = 640;
_screenHeight = 480;
add maniacnes target, rather prelimary so people would be well advised not to add to compatibility at this point svn-id: r9690
2003-08-14 11:40:50 +00:00
} else if (_features & GF_NES) {
_screenWidth = 256;
_screenHeight = 240;
MAJOR change to the way how Engine objects are instantiated svn-id: r4758
2002-08-18 17:48:18 +00:00
} else {
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive) svn-id: r7423
2003-05-10 21:49:59 +00:00
_screenWidth = 320;
_screenHeight = 200;
MAJOR change to the way how Engine objects are instantiated svn-id: r4758
2002-08-18 17:48:18 +00:00
}
cleanup; got rid of Gdi::_palette_mod in favor of Gdi::_roomPalette svn-id: r10778
2003-10-13 12:56:53 +00:00
// Initialize backend
the OSystem changes we discussed on the ML (note: renaming of the existing OSystem API is not yet finished); porters will have to fix their ports to get them to compile again svn-id: r13036
2004-02-24 22:39:42 +00:00
syst->initSize(_screenWidth, _screenHeight);
int cd_num = ConfMan.getInt("cdrom");
if (cd_num >= 0 && (_features & GF_AUDIOTRACKS))
syst->openCD(cd_num);
cleanup; got rid of Gdi::_palette_mod in favor of Gdi::_roomPalette svn-id: r10778
2003-10-13 12:56:53 +00:00
// Setup GDI object
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive) svn-id: r7423
2003-05-10 21:49:59 +00:00
gdi._numStrips = _screenWidth / 8;
changed number strips to dynamic and increased arrays tdirty and bdirty to 80 svn-id: r5296
2002-10-24 06:28:54 +00:00
cleanup; got rid of Gdi::_palette_mod in favor of Gdi::_roomPalette svn-id: r10778
2003-10-13 12:56:53 +00:00
_sound = new Sound(this);
some more cleanup svn-id: r4761
2002-08-18 18:39:42 +00:00
gp32 port stuff svn-id: r5761
2002-11-30 16:03:46 +00:00
#ifndef __GP32__ //ph0x FIXME, "quick dirty hack"
some more cleanup svn-id: r4761
2002-08-18 18:39:42 +00:00
/* Bind the mixer to the system => mixer will be invoked
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
* automatically when samples need to be generated */
o Added SoundMixer::isReady() o Removed SoundMixer::bindToSystem() o In scumm, replaced _silentMixer, _silentDigitalImuse and _noDigitalSamples by SoundMixer::isReady() svn-id: r11893
2003-12-24 17:42:22 +00:00
if (!_mixer->isReady()) {
Added PC Speaker and PCjr command line options, in preparation for Kirben's addition of WA support for games that already have AD tracks. svn-id: r9656
2003-08-13 14:08:21 +00:00
warning("Sound mixer initialization failed");
We proudly present the latest installment of our hit series 'Untangle the mess': 'Help! Space Invaders refactored the music detector'... in other news, I obviously need to sleep now svn-id: r10883
2003-10-18 00:22:46 +00:00
if (_midiDriver == MD_ADLIB ||
cleanup whitespaces svn-id: r11217
2003-11-08 21:59:32 +00:00
_midiDriver == MD_PCSPK ||
_midiDriver == MD_PCJR) {
We proudly present the latest installment of our hit series 'Untangle the mess': 'Help! Space Invaders refactored the music detector'... in other news, I obviously need to sleep now svn-id: r10883
2003-10-18 00:22:46 +00:00
_midiDriver = MD_NULL;
Added PC Speaker and PCjr command line options, in preparation for Kirben's addition of WA support for games that already have AD tracks. svn-id: r9656
2003-08-13 14:08:21 +00:00
warning("MIDI driver depends on sound mixer, switching to null MIDI driver");
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
}
}
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
_mixer->setVolume(ConfMan.getInt("sfx_volume") * ConfMan.getInt("master_volume") / 255);
_mixer->setMusicVolume(ConfMan.getInt("music_volume"));
some more cleanup svn-id: r4761
2002-08-18 18:39:42 +00:00
// Init iMuse
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_features & GF_DIGI_IMUSE) {
added common base class MusicEngine for iMuse/iMuseDigital/Player_V123 (initial stab, more work to follow) svn-id: r10066
2003-09-07 16:16:19 +00:00
_musicEngine = _imuseDigital = new IMuseDigital(this);
added voice group volume to scumm engine for imuse digital and implemeted volume groups control svn-id: r13468
2004-04-05 18:24:36 +00:00
_mixer->setVolume(ConfMan.getInt("master_volume"));
_imuseDigital->setGroupMusicVolume(ConfMan.getInt("music_volume") / 2);
_imuseDigital->setGroupSfxVolume(ConfMan.getInt("sfx_volume") / 2);
voice_volume is now speech_volume svn-id: r13485
2004-04-06 18:42:53 +00:00
_imuseDigital->setGroupVoiceVolume(ConfMan.getInt("speech_volume") / 2);
More Amiga V2/V3 sound updates from _Q_: 1. A Player_MOD class, basically acts as a simplified mixer that mixes at 60Hz intervals (or whatever interval you specify), this gives smooth music playback in player_v3a 2. Some changes to player_v3a as a result of #1, including reduced music volume 3. player_v2a, and the necessary additions to scummvm.cpp/scumm.h svn-id: r10392
2003-09-24 06:56:30 +00:00
} else if ((_features & GF_AMIGA) && (_version == 2)) {
added getMusicTimer() to class MusicEngine; this allows some nice code cleanup; also added an error() invocation to find out if certain code is still needed svn-id: r10556
2003-10-03 01:07:35 +00:00
_musicEngine = new Player_V2A(this);
Add music player for Amiga versions of indy3ega/loom from unused. Revert last change to common.rules for now, it broke compile. svn-id: r10061
2003-09-07 07:23:20 +00:00
} else if ((_features & GF_AMIGA) && (_version == 3)) {
added getMusicTimer() to class MusicEngine; this allows some nice code cleanup; also added an error() invocation to find out if certain code is still needed svn-id: r10556
2003-10-03 01:07:35 +00:00
_musicEngine = new Player_V3A(this);
Fix regressions in MI1 Amiga Revert last change to MI1 demo fix and make it monkeyega target only. svn-id: r9732
2003-08-17 02:34:34 +00:00
} else if ((_features & GF_AMIGA) && (_version < 5)) {
make even more use of Scumm::_musicEngine; added MusicEngine::setMasterVolume svn-id: r10097
2003-09-08 17:06:44 +00:00
_musicEngine = NULL;
Inital support for v1 maniac sound from Hoenicke Had to move music init for v1/v2 games to get this working svn-id: r9675
2003-08-14 02:28:19 +00:00
} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
cleanup svn-id: r10620
2003-10-05 17:32:38 +00:00
_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);
Don't create imuse for v1 and v2 games (otherwise getSoundStatus doesn't work). PCjr support for V1 games, bug fix in speaker support. set_pcjr is now called by Player_V2 constructor according to midi driver. Renaming of member variables to begin with an underscore. svn-id: r9692
2003-08-14 19:41:40 +00:00
} else if (_version > 2) {
cut down on unnecessary GameDetector references svn-id: r11239
2003-11-10 01:04:12 +00:00
MidiDriver *driver = GameDetector::createMidi(_midiDriver);
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
if (driver && _native_mt32)
Fix for Bug [810564] ALL: missing instruments with native MT-32 As defined in Patch [811623] MT-32 patch for Bug 810564 Added a channel mask to MPU-401 devices so that --native-mt32 may force the device to use only the subset of MIDI channels actually supported by the MT-32. Also added a best-guess interpretation of iMuse Part priority in the SysEx 0x00 msg, since part priorities become more of an issue when the channel count is cramped. svn-id: r10409
2003-09-25 22:32:05 +00:00
driver->property (MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
_musicEngine = _imuse = IMuse::create(syst, _mixer, driver);
Fixed problem with multiple IMuseDrivers being created. svn-id: r6045
2002-12-21 20:12:14 +00:00
if (_imuse) {
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
if (ConfMan.hasKey("tempo"))
_imuse->property(IMuse::PROP_TEMPO_BASE, ConfMan.getInt("tempo"));
getting rid of g_mixer; removing lots of whitespace svn-id: r9527
2003-08-05 23:58:24 +00:00
_imuse->property(IMuse::PROP_OLD_ADLIB_INSTRUMENTS, (_features & GF_SMALL_HEADER) ? 1 : 0);
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
_imuse->property(IMuse::PROP_MULTI_MIDI, ConfMan.getBool("multi_midi") &&
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
_midiDriver != MD_NULL && (gs.midi & MDT_ADLIB));
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
_imuse->property(IMuse::PROP_NATIVE_MT32, _native_mt32);
Make use of the MD5-based game detection in the launcher svn-id: r12766
2004-02-07 17:12:10 +00:00
if (_features & GF_HUMONGOUS || gs.midi == MDT_TOWNS) {
getting rid of g_mixer; removing lots of whitespace svn-id: r9527
2003-08-05 23:58:24 +00:00
_imuse->property(IMuse::PROP_LIMIT_PLAYERS, 1);
_imuse->property(IMuse::PROP_RECYCLE_PLAYERS, 1);
Added XMIDI support to IMuse. IMuse now plays music from Humongous games. Added some IMuse property options to support some assumptions that seem to be made by Humongous games. This is still preliminary. It will play music, and it will switch between songs. But I don't know if it's switching to the right song at the right time. svn-id: r7869
2003-05-23 18:35:53 +00:00
}
Make use of the MD5-based game detection in the launcher svn-id: r12766
2004-02-07 17:12:10 +00:00
if (gs.midi == MDT_TOWNS)
Preliminary preparation for new YM2612 FM emulator. All the hooks are in, but actual implementation needs to be checked for portability. svn-id: r10615
2003-10-05 15:36:52 +00:00
_imuse->property(IMuse::PROP_DIRECT_PASSTHROUGH, 1);
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
_imuse->set_music_volume(ConfMan.getInt("music_volume"));
Fixed problem with multiple IMuseDrivers being created. svn-id: r6045
2002-12-21 20:12:14 +00:00
}
some more cleanup svn-id: r4761
2002-08-18 18:39:42 +00:00
}
gp32 port stuff svn-id: r5761
2002-11-30 16:03:46 +00:00
#endif // ph0x-hack
some more cleanup svn-id: r4761
2002-08-18 18:39:42 +00:00
// Load game from specified slot, if any
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
if (ConfMan.hasKey("save_slot")) {
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
requestLoad(ConfMan.getInt("save_slot"));
some more cleanup svn-id: r4761
2002-08-18 18:39:42 +00:00
}
added support for nonenglish the dig(dialogs, descriptions, warnings), not gui yet svn-id: r4959
2002-09-17 15:33:31 +00:00
loadLanguageBundle();
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
// Load CJK font
init _CJKMode properly, in all cases svn-id: r8297
2003-06-04 20:06:55 +00:00
_CJKMode = false;
moved platform/language constants to common/util.* svn-id: r10862
2003-10-17 15:35:46 +00:00
if ((_gameId == GID_DIG || _gameId == GID_CMI) && (_language == Common::KO_KOR || _language == Common::JA_JPN || _language == Common::ZH_TWN)) {
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
File fp;
const char *fontFile = NULL;
switch(_language) {
moved platform/language constants to common/util.* svn-id: r10862
2003-10-17 15:35:46 +00:00
case Common::KO_KOR:
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
fontFile = "korean.fnt";
break;
moved platform/language constants to common/util.* svn-id: r10862
2003-10-17 15:35:46 +00:00
case Common::JA_JPN:
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
fontFile = (_gameId == GID_DIG) ? "kanji16.fnt" : "japanese.fnt";
break;
moved platform/language constants to common/util.* svn-id: r10862
2003-10-17 15:35:46 +00:00
case Common::ZH_TWN:
follow our coding conventions svn-id: r8377
2003-06-07 00:49:36 +00:00
if (_gameId == GID_CMI) {
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
fontFile = "chinese.fnt";
}
break;
cleanup svn-id: r12259
2004-01-08 17:41:11 +00:00
default:
break;
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
}
cleanup; fix File::open usage (do not hardocde constant values, rather use the symbolic namescvs diff | bbeditcvs diff | bbedit svn-id: r11911
2003-12-25 15:09:23 +00:00
if (fontFile && fp.open(fontFile, getGameDataPath())) {
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
debug(2, "Loading CJK Font");
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
_CJKMode = true;
fp.seek(2, SEEK_CUR);
_2byteWidth = fp.readByte();
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
_2byteHeight = fp.readByte();
int numChar = 0;
switch(_language) {
moved platform/language constants to common/util.* svn-id: r10862
2003-10-17 15:35:46 +00:00
case Common::KO_KOR:
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
numChar = 2350;
break;
moved platform/language constants to common/util.* svn-id: r10862
2003-10-17 15:35:46 +00:00
case Common::JA_JPN:
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
numChar = (_gameId == GID_DIG) ? 1024 : 2048; //FIXME
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
break;
moved platform/language constants to common/util.* svn-id: r10862
2003-10-17 15:35:46 +00:00
case Common::ZH_TWN:
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
numChar = 1; //FIXME
break;
cleanup svn-id: r12259
2004-01-08 17:41:11 +00:00
default:
break;
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
}
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
_2byteFontPtr = new byte[((_2byteWidth + 7) / 8) * _2byteHeight * numChar];
fp.read(_2byteFontPtr, ((_2byteWidth + 7) / 8) * _2byteHeight * numChar);
fp.close();
}
Kanji support only seems to work in scumm5 games svn-id: r11293
2003-11-14 10:19:28 +00:00
} else if (_language == Common::JA_JPN && _version == 5) { //FM Towns Kanji
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
File fp;
int numChar = 256 * 32;
_2byteWidth = 16;
_2byteHeight = 16;
//use FM Towns font rom, since game files don't have kanji font resources
cleanup; fix File::open usage (do not hardocde constant values, rather use the symbolic namescvs diff | bbeditcvs diff | bbedit svn-id: r11911
2003-12-25 15:09:23 +00:00
if (fp.open("fmt_fnt.rom", getGameDataPath()) || fp.open("fmt_fnt.rom", "./")) {
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
_CJKMode = true;
debug(2, "Loading FM Towns Kanji rom");
_2byteFontPtr = new byte[((_2byteWidth + 7) / 8) * _2byteHeight * numChar];
fp.read(_2byteFontPtr, ((_2byteWidth + 7) / 8) * _2byteHeight * numChar);
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
fp.close();
}
}
cleanup; got rid of Gdi::_palette_mod in favor of Gdi::_roomPalette svn-id: r10778
2003-10-13 12:56:53 +00:00
// Create the charset renderer
if (_version <= 2)
cleanup svn-id: r12259
2004-01-08 17:41:11 +00:00
_charset = new CharsetRendererV2(this, _language);
cleanup; got rid of Gdi::_palette_mod in favor of Gdi::_roomPalette svn-id: r10778
2003-10-13 12:56:53 +00:00
else if (_version == 3)
_charset = new CharsetRendererV3(this);
else if (_version == 8)
_charset = new CharsetRendererNut(this);
else
_charset = new CharsetRendererClassic(this);
// Create the costume renderer
if (_features & GF_NEW_COSTUMES)
_costumeRenderer = new AkosRenderer(this);
else
_costumeRenderer = new CostumeRenderer(this);
Preliminary support for FT INSANE is added. To enable the code define INSANE in config.h. But only non-interactive parts work and there is no insane scene skip. Only one choice during those scenes is Ctrl+X. svn-id: r11507
2003-12-06 05:47:24 +00:00
// Create FT INSANE object
if (_gameId == GID_FT)
smush and insane only work with V6 (this will allow moving some stuff from ScummEngine to ScummEngine_v6) svn-id: r12516
2004-01-19 19:34:48 +00:00
_insane = new Insane((ScummEngine_v6 *)this);
pedantic correction svn-id: r12410
2004-01-15 13:45:57 +00:00
else
_insane = 0;
got rid of init.cpp svn-id: r4736
2002-08-14 00:01:39 +00:00
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
ScummEngine::~ScummEngine() {
fixed crash on exit when using imuse digital svn-id: r12389
2004-01-14 16:00:24 +00:00
if (_musicEngine) {
_musicEngine->terminate();
delete _musicEngine;
}
Potential fix for bug #816086 svn-id: r10566
2003-10-03 13:43:07 +00:00
_mixer->stopAll();
cleanup whitespaces svn-id: r11217
2003-11-08 21:59:32 +00:00
got rid of init.cpp svn-id: r4736
2002-08-14 00:01:39 +00:00
delete [] _actors;
cleanup whitespaces svn-id: r11217
2003-11-08 21:59:32 +00:00
Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough) svn-id: r8293
2003-06-04 14:37:43 +00:00
delete _2byteFontPtr;
more cleanup svn-id: r6149
2002-12-25 21:42:22 +00:00
delete _charset;
delete _pauseDialog;
delete _optionsDialog;
remade the in-game GUI/menu svn-id: r11119
2003-11-03 23:26:13 +00:00
delete _mainMenuDialog;
removed even more scumm dependencies from NewGUI; fixed some redraw issues (this might help the inventory-display issue in The Dig, and definitly fixes the 'vanishing volcanoe' in the FOA extro) svn-id: r4974
2002-09-19 21:45:56 +00:00
moved to Sound class svn-id: r4744
2002-08-14 20:43:56 +00:00
delete _sound;
don't try to delete calloc'd mem either svn-id: r8602
2003-06-22 07:15:00 +00:00
free(_languageBuffer);
don't try to delete malloc'd memory svn-id: r8601
2003-06-22 06:53:28 +00:00
free(_audioNames);
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
renamed _bcr -> _costumeRenderer svn-id: r8473
2003-06-14 13:38:22 +00:00
delete _costumeRenderer;
added a global CostumeRenderer in the VM, to avoid actors reinstancing it every time svn-id: r8307
2003-06-05 02:44:18 +00:00
cleanup svn-id: r8492
2003-06-15 00:33:16 +00:00
free(_shadowPalette);
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
added some const qualifiers; moved _bundle & _current_cd_sound from class Scumm to class Sound; some other tweaks svn-id: r8648
2003-06-25 23:25:52 +00:00
freeResources();
free(_objectStateTable);
free(_objectRoomTable);
free(_objectOwnerTable);
free(_inventory);
free(_verbs);
free(_objs);
free(_scummVars);
free(_bitVars);
free(_newNames);
free(_classData);
free(_roomStrips);
free(_languageIndex);
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
cleanup svn-id: r10764
2003-10-12 17:49:52 +00:00
delete _debugger;
got rid of init.cpp svn-id: r4736
2002-08-14 00:01:39 +00:00
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::go() {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
launch();
mainRun();
}
#pragma mark -
#pragma mark --- Initialization ---
#pragma mark -
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::launch() {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#ifdef __PALM_OS__
Added memory auto-configuration on PalmOS for better speed and compatibility svn-id: r11472
2003-12-02 11:17:21 +00:00
if (_features & GF_NEW_COSTUMES)
_maxHeapThreshold = gVars->memory[kMemScummNewCostGames];
else
_maxHeapThreshold = gVars->memory[kMemScummOldCostGames];
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#else
// Since the new costumes are very big, we increase the heap limit, to avoid having
// to constantly reload stuff from the data files.
if (_features & GF_NEW_COSTUMES)
_maxHeapThreshold = 2500000;
else
_maxHeapThreshold = 550000;
#endif
_minHeapThreshold = 400000;
_verbRedraw = false;
allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0);
setupScummVars();
setupOpcodes();
if (_version == 8)
_numActors = 80;
else if ((_version == 7) || (_gameId == GID_SAMNMAX))
_numActors = 30;
else if (_gameId == GID_MANIAC)
_numActors = 25;
else
_numActors = 13;
if (_version >= 7)
OF_OWNER_ROOM = 0xFF;
else
OF_OWNER_ROOM = 0x0F;
// if (_gameId==GID_MONKEY2 && _bootParam == 0)
// _bootParam = 10001;
Allow copy protection in FOA (Disk) to be enabled. svn-id: r13536
2004-04-11 04:20:09 +00:00
if (!_copyProtection && _gameId == GID_INDY4 && _bootParam == 0) {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_bootParam = -7873;
}
if (_features & GF_OLD_BUNDLE)
_resourceHeaderSize = 4; // FIXME - to be rechecked
else if (_features & GF_SMALL_HEADER)
_resourceHeaderSize = 6;
else
_resourceHeaderSize = 8;
readIndexFile();
scummInit();
if (_version > 2) {
if (_version < 7)
VAR(VAR_VERSION) = 21;
Oops svn-id: r10008
2003-09-05 15:53:20 +00:00
if (!((_features & GF_MACINTOSH) && (_version == 3))) {
fix debug mode 0 svn-id: r10791
2003-10-14 07:52:34 +00:00
// This is NOT for the Mac version of Indy3/Loom
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
VAR(VAR_DEBUGMODE) = _debugMode;
}
}
if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
_scummVars[74] = 1225;
got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables svn-id: r11953
2003-12-26 23:11:35 +00:00
if (_imuse) {
_imuse->setBase(res.address[rtSound]);
_imuse->setMasterVolume(ConfMan.getInt("master_volume"));
_imuse->set_music_volume(ConfMan.getInt("music_volume"));
}
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_sound->setupSound();
Move SCUMM debugger init later on. With this _numVariables is set, so theoretically the Debugger's scumm_vars[] array should work again. Although it doesn't, for some reason I have yet to look into. svn-id: r12377
2004-01-14 10:02:33 +00:00
// Create debugger
if (!_debugger)
_debugger = new ScummDebugger(this);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// If requested, load a save game instead of running the boot script
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveTemporaryState)) {
Set these to zero just to be safe. svn-id: r12407
2004-01-15 10:14:17 +00:00
int args[16];
memset(args, 0, sizeof(args));
Hack for Launcher Scaler dropdown. Backends using the Launcher will need to implement the OSystem HAS_SCALER property. The global options dialog still needs doing. svn-id: r12436
2004-01-16 16:28:56 +00:00
args[0] = _bootParam;
_saveLoadFlag = 0;
Allow --demo-mode with maniac (Enchanced) svn-id: r13173
2004-03-04 02:47:39 +00:00
if (_gameId == GID_MANIAC && _demoMode)
Set these to zero just to be safe. svn-id: r12407
2004-01-15 10:14:17 +00:00
runScript(9, 0, 0, args);
Add option for the demo included in Maniac Mansion (Classic version) svn-id: r9279
2003-07-29 12:13:39 +00:00
else
Set these to zero just to be safe. svn-id: r12407
2004-01-15 10:14:17 +00:00
runScript(1, 0, 0, args);
Fix bug #815853 - Cannot load during intro SMUSH movies svn-id: r12423
2004-01-16 07:58:55 +00:00
} else {
_saveLoadFlag = 0;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::scummInit() {
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
int i;
moved to Sound class svn-id: r4744
2002-08-14 20:43:56 +00:00
tempMusic = 0;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
debug(9, "scummInit");
very simple full throttle support, use the FULL_THROTTLE define. (will fix later) modified some actor parts to work better with full throttle (most likely new bugs because of that). directions are now stored as angles instead of left/right/up/down implemented loadFlObject (flobjects are currently saved in the savestate, will fix that also) svn-id: r3505
2001-11-26 19:57:57 +00:00
V1 Zak fixes and hacks. (Woo, it rhymes! :) svn-id: r8996
2003-07-14 06:00:17 +00:00
if ((_gameId == GID_MANIAC) && (_version == 1)) {
cleanup svn-id: r12139
2004-01-04 14:49:14 +00:00
initScreens(16, 152);
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
} else if (_version >= 7) {
cleanup svn-id: r12139
2004-01-04 14:49:14 +00:00
initScreens(0, _screenHeight);
reuse the old (ugly nasty dreaded) string system for V8, too (by supplying a NUT based CharsetRenderer) svn-id: r6162
2002-12-26 01:47:40 +00:00
} else {
cleanup svn-id: r12139
2004-01-04 14:49:14 +00:00
initScreens(16, 144);
reuse the old (ugly nasty dreaded) string system for V8, too (by supplying a NUT based CharsetRenderer) svn-id: r6162
2002-12-26 01:47:40 +00:00
}
sufficient to set _roomPalette at the start for V6+ games, since they don't modify the _roomPalette, ever svn-id: r10777
2003-10-13 12:17:26 +00:00
for (i = 0; i < 256; i++)
_roomPalette[i] = i;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version == 1) {
Add comment svn-id: r11661
2003-12-15 16:11:43 +00:00
// Use 17 color table for v1 games to allow
// correct color for inventory and sentence
// line
// Original games used some kind of dynamic
// color table remapping between rooms
Add extra color table entry for v1 games, for inventory/sentence color. svn-id: r11653
2003-12-15 14:54:35 +00:00
if (_gameId == GID_MANIAC)
Split the v1 palette, since there is a minor difference. svn-id: r8999
2003-07-14 06:44:47 +00:00
setupV1ManiacPalette();
Add extra color table entry for v1 games, for inventory/sentence color. svn-id: r11653
2003-12-15 14:54:35 +00:00
else
Split the v1 palette, since there is a minor difference. svn-id: r8999
2003-07-14 06:44:47 +00:00
setupV1ZakPalette();
added v1 gfx codec, (not working) svn-id: r8329
2003-06-05 17:22:15 +00:00
} else if (_features & GF_16COLOR) {
sufficient to set _roomPalette at the start for V6+ games, since they don't modify the _roomPalette, ever svn-id: r10777
2003-10-13 12:17:26 +00:00
for (i = 0; i < 16; i++)
Update the 16-colour palette if the user changes the Amiga setting from the options dialog. svn-id: r8910
2003-07-11 14:54:16 +00:00
_shadowPalette[i] = i;
Add atarist and macintosh options, since there seem to be no way to detect version been used. svn-id: r9999
2003-09-05 07:36:05 +00:00
if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST))
Using Amiga palette with 16 color Amiga versions only svn-id: r8905
2003-07-11 10:13:42 +00:00
setupAmigaPalette();
Update the 16-colour palette if the user changes the Amiga setting from the options dialog. svn-id: r8910
2003-07-11 14:54:16 +00:00
else
Using Amiga palette with 16 color Amiga versions only svn-id: r8905
2003-07-11 10:13:42 +00:00
setupEGAPalette();
added definition of 16 colors palette to gfx backend for V2/V3 games I hope it's correct :) svn-id: r6941
2003-04-08 20:10:51 +00:00
}
Modified version of erik's patch #745986: Experimental V2 mouseover stuff svn-id: r8142
2003-05-30 14:29:07 +00:00
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 2) {
Cleanup v1/v2 color settings for sentance/inventory/verb area. Add highlight color for v1 maniac svn-id: r9774
2003-08-19 04:15:14 +00:00
initV2MouseOver();
Add correct palette for pc versions of v1 games Add some correct colors for v1 games svn-id: r8988
2003-07-13 15:13:43 +00:00
make V2 games use transition effects svn-id: r8271
2003-06-02 11:33:48 +00:00
// Seems in V2 there was only a single room effect (iris),
// so we set that here.
_switchRoomEffect2 = 1;
Inverse iris transition effect for V2 games. Also, some transition effects weren't working properly unless the entire screen was first marked as not dirty. I hope fixing that didn't break anything else. svn-id: r8314
2003-06-05 07:05:37 +00:00
_switchRoomEffect = 5;
Modified version of erik's patch #745986: Experimental V2 mouseover stuff svn-id: r8142
2003-05-30 14:29:07 +00:00
}
added definition of 16 colors palette to gfx backend for V2/V3 games I hope it's correct :) svn-id: r6941
2003-04-08 20:10:51 +00:00
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
if (_version > 3 && _version < 8)
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
loadCharset(1);
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
loadCharset(0) for GF_OLD_BUNDLE - 'fixes' indydemo to an extent svn-id: r6996
2003-04-12 20:07:08 +00:00
if (_features & GF_OLD_BUNDLE)
loadCharset(0); // FIXME - HACK ?
better full throttle support, a couple of MI2 fixes. svn-id: r3532
2001-12-27 17:51:58 +00:00
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
setShake(0);
full screen flag, better mouse cursors, removed change log from individual files svn-id: r3462
2001-11-06 20:00:47 +00:00
setupCursor();
DIG: preliminarily support for music in the game svn-id: r4701
2002-08-04 16:30:59 +00:00
cleanup svn-id: r6262
2002-12-29 19:54:11 +00:00
// Allocate and Initialize actors
added enum's for the known actor/object claasses; extended putClass/getClass to translate the X/Y flip classes; made code use the new enum's; some other cleanup svn-id: r7753
2003-05-20 20:42:28 +00:00
Actor::initActorClass(this);
NUM_ACTORS -> _numActors (for consistency) svn-id: r7489
2003-05-13 23:42:41 +00:00
_actors = new Actor[_numActors];
Allowed derefActor() and derefActorSafe() to treat actor 0 as a valid actor since the original interpreters appear to have allowed it. This fixes bug #786380 ("FOA - FISTS, script crash in Crete"). I do not know what the purpose of actor 0 was in the original. Either it's a no-op, or it's used to store actor default values. Note that in the FOA case the room-33-200 script will loop - at least with the provided savegame - until you leave the room. However, this is quite harmless. svn-id: r9650
2003-08-12 16:43:43 +00:00
for (i = 0; i < _numActors; i++) {
when iterating from 1 to _numActors over all actors, use _actors[] directly instead of derefActor() (unnecessary overhead); added range check to derefActor, and error out if invalid actor is accessed svn-id: r7858
2003-05-23 12:48:50 +00:00
_actors[i].number = i;
_actors[i].initActor(1);
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
init costumes for v1 games svn-id: r8378
2003-06-07 04:24:57 +00:00
// this is from IDB
Adjustments for Enchanced Maniac Mansion demo. svn-id: r13161
2004-03-03 02:53:12 +00:00
if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode))
fix set costumes for v1 svn-id: r8382
2003-06-07 14:02:07 +00:00
_actors[i].setActorCostume(i);
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
and more cleanup svn-id: r6718
2003-03-06 17:58:13 +00:00
Add hack for demo script in maniac (Enchanced) svn-id: r13174
2004-03-04 03:08:42 +00:00
// HACK Some palette changes needed for demo script
// in Maniac Mansion (Enchanced)
if (_gameId == GID_MANIAC && _version == 2 && _demoMode) {
_actors[3].setPalette(3, 1);
_actors[9].talkColor = 15;
_actors[10].talkColor = 7;
_actors[11].talkColor = 2;
_actors[13].talkColor = 5;
_actors[23].talkColor = 14;
}
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
vm.numNestedScripts = 0;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
vm.cutSceneStackPointer = 0;
memset(vm.cutScenePtr, 0, sizeof(vm.cutScenePtr));
memset(vm.cutSceneData, 0, sizeof(vm.cutSceneData));
got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables svn-id: r11953
2003-12-26 23:11:35 +00:00
for (i = 0; i < _numVerbs; i++) {
preliminary DOTT support svn-id: r3433
2001-10-16 10:01:48 +00:00
_verbs[i].verbid = 0;
use Rect in struct VerbSlot svn-id: r12413
2004-01-15 19:25:17 +00:00
_verbs[i].curRect.right = _screenWidth - 1;
_verbs[i].oldRect.left = -1;
preliminary DOTT support svn-id: r3433
2001-10-16 10:01:48 +00:00
_verbs[i].type = 0;
_verbs[i].color = 2;
_verbs[i].hicolor = 0;
_verbs[i].charset_nr = 1;
_verbs[i].curmode = 0;
_verbs[i].saveid = 0;
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
_verbs[i].center = 0;
preliminary DOTT support svn-id: r3433
2001-10-16 10:01:48 +00:00
_verbs[i].key = 0;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (!(_features & GF_NEW_CAMERA)) {
Next episode in V7 reimplementation. Nearly working svn-id: r3658
2002-03-05 23:41:41 +00:00
camera._leftTrigger = 10;
camera._rightTrigger = 30;
camera._mode = 0;
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
camera._follows = 0;
virtscr[0].xstart = 0;
move the charset mask to the charset renderer class; some other related changes svn-id: r12263
2004-01-08 21:21:40 +00:00
if (VAR_CURRENT_LIGHTS != 0xFF) {
set proper initial values for flashlight size svn-id: r4808
2002-08-23 22:40:26 +00:00
// Setup light
cleanup svn-id: r7550
2003-05-15 22:48:06 +00:00
_flashlight.xStrips = 7;
_flashlight.yStrips = 7;
completly decoupled engine.h/.cpp from simon.h and scumm.h; removed some static variables from drawFlashlight() and made them members of class Scumm instead svn-id: r5506
2002-11-10 17:19:43 +00:00
_flashlight.buffer = NULL;
Next episode in V7 reimplementation. Nearly working svn-id: r3658
2002-03-05 23:41:41 +00:00
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
make some more use of ScummVM::Point; cleanup svn-id: r7549
2003-05-15 22:41:35 +00:00
_mouse.x = 104;
_mouse.y = 56;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
_ENCD_offs = 0;
_EXCD_offs = 0;
_currentScript = 0xFF;
very simple full throttle support, use the FULL_THROTTLE define. (will fix later) modified some actor parts to work better with full throttle (most likely new bugs because of that). directions are now stored as angles instead of left/right/up/down implemented loadFlObject (flobjects are currently saved in the savestate, will fix that also) svn-id: r3505
2001-11-26 19:57:57 +00:00
_sentenceNum = 0;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
_currentRoom = 0;
_numObjectsInRoom = 0;
_actorToPrintStrFor = 0;
fixed save/load; more restructuring of the charset rendering code svn-id: r6154
2002-12-26 00:21:19 +00:00
_charsetBufPos = 0;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
_haveMsg = 0;
Fixed some more Sam and Max bugs. Is now playable to BumpusVille. Added two new debug commands, one to read and set variables, the other to set a 'watch' on variables. svn-id: r3662
2002-03-06 10:03:00 +00:00
_varwatch = -1;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
_screenStartStrip = 0;
Ooops svn-id: r12954
2004-02-21 06:44:10 +00:00
_defaultTalkDelay = 3;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
_talkDelay = 0;
_keepText = false;
lots of cleanup to the graphics code; removed various global states (makes it easier to understand the code) svn-id: r5831
2002-12-04 13:36:27 +00:00
_currentCursor = 0;
even more cleanup svn-id: r5839
2002-12-04 22:31:36 +00:00
_cursor.state = 0;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
_userPut = 0;
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
_newEffect = 129;
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
_fullRedraw = true;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
clearDrawObjectQueue();
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
for (i = 0; i < 6; i++) {
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version == 3) { // FIXME - what is this?
Renamed StringTab::backup to StringTab::_default, as that describes better what it does svn-id: r13476
2004-04-05 23:54:58 +00:00
_string[i]._default.xpos = 0;
_string[i]._default.ypos = 0;
Fixed getStringWidth. Fixed various text misspositions. Reworked the the redraw text background to make it more acqurate. Added support for colored strings. svn-id: r3611
2002-02-19 22:36:09 +00:00
} else {
Renamed StringTab::backup to StringTab::_default, as that describes better what it does svn-id: r13476
2004-04-05 23:54:58 +00:00
_string[i]._default.xpos = 2;
_string[i]._default.ypos = 5;
Fixed getStringWidth. Fixed various text misspositions. Reworked the the redraw text background to make it more acqurate. Added support for colored strings. svn-id: r3611
2002-02-19 22:36:09 +00:00
}
Renamed StringTab::backup to StringTab::_default, as that describes better what it does svn-id: r13476
2004-04-05 23:54:58 +00:00
_string[i]._default.right = _screenWidth - 1;
_string[i]._default.color = 0xF;
_string[i]._default.center = 0;
_string[i]._default.charset = 0;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
Add keyboard support for derby in FT and cannon battle in COMI, patch #853099 svn-id: r11496
2003-12-05 00:02:01 +00:00
// all keys are released
for (i = 0; i < 512; i++)
_keyDownMap[i] = false;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
initScummVars();
cleaned up autosave code svn-id: r5926
2002-12-13 03:23:17 +00:00
_lastSaveTime = _system->get_msecs();
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::initScummVars() {
more v2 var fixes svn-id: r7396
2003-05-08 21:02:46 +00:00
// FIXME
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 2) {
Fix typo in previous commit svn-id: r8174
2003-05-31 13:45:45 +00:00
// This needs to be at least greater than 40 to get the more
Set the "machine speed" variable for V2 games. I think it's safe to assume that modern hardware will handle the more elaborate version of the EGA Zak intro without any problems. svn-id: r8173
2003-05-31 13:43:05 +00:00
// elaborate version of the EGA Zak into. I don't know where
// else it makes any difference.
VAR(VAR_MACHINE_SPEED) = 0x7FFF;
more v2 var fixes svn-id: r7396
2003-05-08 21:02:46 +00:00
return;
Set the "machine speed" variable for V2 games. I think it's safe to assume that modern hardware will handle the more elaborate version of the EGA Zak intro without any problems. svn-id: r8173
2003-05-31 13:43:05 +00:00
}
more v2 var fixes svn-id: r7396
2003-05-08 21:02:46 +00:00
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version < 6)
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_V5_TALK_STRING_Y) = -0x50;
Add somewhat hacky 'restart' command to debugger. Still needs work :) svn-id: r7071
2003-04-22 04:40:30 +00:00
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version == 8) { // Fixme: How do we deal with non-cd installs?
various V8 tweaks svn-id: r7494
2003-05-14 09:47:53 +00:00
VAR(VAR_CURRENTDISK) = 1;
VAR(VAR_LANGUAGE) = _language;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
} else if (_version >= 7) {
various V8 tweaks svn-id: r7494
2003-05-14 09:47:53 +00:00
VAR(VAR_V6_EMSSPACE) = 10000;
Exclude some var settings for HE7 svn-id: r13132
2004-03-02 02:12:30 +00:00
} else if (_features & GF_AFTER_HEV7) {
VAR(VAR_SOUNDPARAM) = 1; // soundblaster for music
VAR(VAR_SOUNDPARAM2) = 1; // soundblaster for sfx
various V8 tweaks svn-id: r7494
2003-05-14 09:47:53 +00:00
} else {
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_CURRENTDRIVE) = 0;
VAR(VAR_FIXEDDISK) = true;
Added support for Roland MT-32 music tracks in monkeyvga/ega. Tested in monkeyvga, but not in monkeyega yet. There are still wrinkles to work out, but the parser for the new format is in and hooked up. svn-id: r9684
2003-08-14 08:26:59 +00:00
switch (_midiDriver) {
Changed VAR_SOUNDCARD to 0 for MD_NULL MidiDriver, and 1 for PC speaker and PCjr. This fixes a hang in LoomCD if the default MidiDriver happens to be a native driver. (For some reason the CD version still has script variations based on whether a Roland soundcard was selected. WTH?) LoomCD now always reverts to MD_NULL, so VAR_SOUNDCARD will always be set appropriately. svn-id: r9716
2003-08-16 07:19:28 +00:00
case MD_NULL: VAR(VAR_SOUNDCARD) = 0; break;
Added support for Roland MT-32 music tracks in monkeyvga/ega. Tested in monkeyvga, but not in monkeyega yet. There are still wrinkles to work out, but the parser for the new format is in and hooked up. svn-id: r9684
2003-08-14 08:26:59 +00:00
case MD_ADLIB: VAR(VAR_SOUNDCARD) = 3; break;
case MD_PCSPK:
Changed VAR_SOUNDCARD to 0 for MD_NULL MidiDriver, and 1 for PC speaker and PCjr. This fixes a hang in LoomCD if the default MidiDriver happens to be a native driver. (For some reason the CD version still has script variations based on whether a Roland soundcard was selected. WTH?) LoomCD now always reverts to MD_NULL, so VAR_SOUNDCARD will always be set appropriately. svn-id: r9716
2003-08-16 07:19:28 +00:00
case MD_PCJR: VAR(VAR_SOUNDCARD) = 1; break;
Fix monkey2 missing sfx regression svn-id: r9708
2003-08-15 14:41:28 +00:00
default:
Roland updates only applies ot PC versions. svn-id: r10165
2003-09-11 04:06:18 +00:00
if ((_gameId == GID_MONKEY_EGA || _gameId == GID_MONKEY_VGA || _gameId == GID_LOOM)
Add PC game feature flag, to match others. svn-id: r11344
2003-11-18 09:44:58 +00:00
&& (_features & GF_PC)) {
Check for Roland patch in loom and monkeyega, give better error if patch not found. svn-id: r10148
2003-09-10 11:43:19 +00:00
if (_gameId == GID_LOOM) {
char buf[50];
uint i = 82;
File f;
Fix #807291 svn-id: r10344
2003-09-21 04:54:34 +00:00
while (i < 85) {
Check for Roland patch in loom and monkeyega, give better error if patch not found. svn-id: r10148
2003-09-10 11:43:19 +00:00
sprintf(buf, "%d.LFL", i);
f.open(buf, _gameDataPath);
if (f.isOpen() == false)
error("Native MIDI support requires Roland patch from LucasArts");
f.close();
i++;
}
} else if (_gameId == GID_MONKEY_EGA) {
File f;
f.open("DISK09.LEC", _gameDataPath);
if (f.isOpen() == false)
error("Native MIDI support requires Roland patch from LucasArts");
}
Typo svn-id: r9709
2003-08-15 15:10:19 +00:00
VAR(VAR_SOUNDCARD) = 4;
Check for Roland patch in loom and monkeyega, give better error if patch not found. svn-id: r10148
2003-09-10 11:43:19 +00:00
} else
Fix monkey2 missing sfx regression svn-id: r9708
2003-08-15 14:41:28 +00:00
VAR(VAR_SOUNDCARD) = 3;
Added support for Roland MT-32 music tracks in monkeyvga/ega. Tested in monkeyvga, but not in monkeyega yet. There are still wrinkles to work out, but the parser for the new format is in and hooked up. svn-id: r9684
2003-08-14 08:26:59 +00:00
}
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_VIDEOMODE) = 0x13;
VAR(VAR_HEAPSPACE) = 1400;
VAR(VAR_MOUSEPRESENT) = true; // FIXME - used to be 0, but that seems odd?!?
Use digital sfx for HE games svn-id: r11937
2003-12-26 07:31:39 +00:00
if (_features & GF_HUMONGOUS) {
enable midi for non puttdemo humongous games. need to properly return the result of whether music is running though... svn-id: r7673
2003-05-19 08:04:47 +00:00
VAR(VAR_SOUNDPARAM) = 1; // soundblaster for music
Use digital sfx for HE games svn-id: r11937
2003-12-26 07:31:39 +00:00
VAR(VAR_SOUNDPARAM2) = 1; // soundblaster for sfx
} else {
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_SOUNDPARAM) = 0;
Use digital sfx for HE games svn-id: r11937
2003-12-26 07:31:39 +00:00
VAR(VAR_SOUNDPARAM2) = 0;
}
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_SOUNDPARAM3) = 0;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version >= 6 && VAR_V6_EMSSPACE != 0xFF)
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_V6_EMSSPACE) = 10000;
Add somewhat hacky 'restart' command to debugger. Still needs work :) svn-id: r7071
2003-04-22 04:40:30 +00:00
Disable var setting which could cause possible script issues. Update comment svn-id: r13053
2004-02-25 14:01:46 +00:00
// Sets fade delay
// byte VAR_FADE_DELAY = (_version == 7) ? 117 : 59;
// VAR(VAR_FADE_DELAY) = 3;
added some very limited support for Mac Loom (text is now properly centered around x:160 instead of x:0); added (commented out) copyprot bypass (but since I am not sure if there was ever a Mac Loom w/o codes, am not sure if this ever should be enabled); added comment regarding the Mac Loom sound format svn-id: r8737
2003-07-04 12:34:09 +00:00
}
Add mac check. svn-id: r10005
2003-09-05 15:25:31 +00:00
if ((_features & GF_MACINTOSH) && (_version == 3)) {
// This is the for the Mac version of Indy3/Loom
added some very limited support for Mac Loom (text is now properly centered around x:160 instead of x:0); added (commented out) copyprot bypass (but since I am not sure if there was ever a Mac Loom w/o codes, am not sure if this ever should be enabled); added comment regarding the Mac Loom sound format svn-id: r8737
2003-07-04 12:34:09 +00:00
VAR(39) = 320;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
}
move the charset mask to the charset renderer class; some other related changes svn-id: r12263
2004-01-08 21:21:40 +00:00
if (VAR_CURRENT_LIGHTS != 0xFF) {
Add somewhat hacky 'restart' command to debugger. Still needs work :) svn-id: r7071
2003-04-22 04:40:30 +00:00
// Setup light
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_CURRENT_LIGHTS) = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen;
Next episode in V7 reimplementation. Nearly working svn-id: r3658
2002-03-05 23:41:41 +00:00
}
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
Reset more for a restart and avoid some code duplication. svn-id: r13022
2004-02-24 10:52:40 +00:00
if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
_scummVars[74] = 1225;
Fix VAR_VOICE_MODE in COMI svn-id: r13051
2004-02-25 10:48:35 +00:00
if (_version == 7)
Enable and use VAR_VOICE_MODE svn-id: r12979
2004-02-22 03:08:18 +00:00
VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_CHARINC) = 4;
disambiguate the two talkingActor() methods (one was a getter, one a setter -- reflect that in the name) svn-id: r13301
2004-03-15 03:33:08 +00:00
setTalkingActor(0);
and more cleanup svn-id: r6718
2003-03-06 17:58:13 +00:00
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#pragma mark -
#pragma mark --- Main loop ---
#pragma mark -
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::mainRun() {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
int delta = 0;
int diff = _system->get_msecs();
while (!_quit) {
updatePalette();
renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend svn-id: r13087
2004-02-28 12:58:13 +00:00
_system->updateScreen();
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
diff -= _system->get_msecs();
waitForTimer(delta * 15 + diff);
diff = _system->get_msecs();
delta = scummLoop(delta);
if (delta < 1) // Ensure we don't get into a loop
delta = 1; // by not decreasing sleepers.
if (_quit) {
// TODO: Maybe perform an autosave on exit?
// TODO: Also, we could optionally show a "Do you really want to quit?" dialog here
}
}
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::waitForTimer(int msec_delay) {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
uint32 start_time;
if (_fastMode & 2)
msec_delay = 0;
else if (_fastMode & 1)
msec_delay = 10;
start_time = _system->get_msecs();
while (!_quit) {
parseEvents();
_sound->updateCD(); // Loop CD Audio if needed
if (_system->get_msecs() >= start_time + msec_delay)
break;
_system->delay_msecs(10);
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
int ScummEngine::scummLoop(int delta) {
cleanup svn-id: r10764
2003-10-12 17:49:52 +00:00
if (_debugger->isAttached())
_debugger->onFrame();
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
make PRNG a bit less predictable svn-id: r4597
2002-07-19 01:40:24 +00:00
// Randomize the PRNG by calling it at regular intervals. This ensures
// that it will be in a different state each time you run the program.
moved RNG to common/util.cpp svn-id: r5778
2002-12-01 14:57:50 +00:00
_rnd.getRandomNumber(2);
make PRNG a bit less predictable svn-id: r4597
2002-07-19 01:40:24 +00:00
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version > 2) {
fixed various cases of bad var access svn-id: r7394
2003-05-08 15:58:30 +00:00
VAR(VAR_TMR_1) += delta;
VAR(VAR_TMR_2) += delta;
VAR(VAR_TMR_3) += delta;
}
work around some illegal var access' in COMI/V8 - there are more, but I am not always sure if avoiding the access is the proper fix; maybe in some cases we should just define that var for V8 to the proper value? svn-id: r7425
2003-05-10 22:35:12 +00:00
if (VAR_TMR_4 != 0xFF)
VAR(VAR_TMR_4) += delta;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
if (delta > 15)
delta = 15;
recompile not needed when switching games debugger skeleton implemented svn-id: r3442
2001-10-23 19:51:50 +00:00
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
decreaseScriptDelay(delta);
bug fixes, speech in dott svn-id: r3454
2001-11-05 19:21:49 +00:00
Patch 617937 / Bug 617939 + modifications: Fix FT text masking svn-id: r5081
2002-10-03 07:38:03 +00:00
// If _talkDelay is -1, that means the text should never time out.
// This is used for drawing verb texts, e.g. the Full Throttle
// dialogue choices.
if (_talkDelay != -1) {
_talkDelay -= delta;
if (_talkDelay < 0)
_talkDelay = 0;
}
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
fix existing ego actor change detection code svn-id: r8941
2003-07-12 12:16:17 +00:00
// Record the current ego actor before any scripts (including input scripts)
// get a chance to run.
int oldEgo = 0;
if (VAR_EGO != 0xFF)
oldEgo = VAR(VAR_EGO);
fix for bug #770042 (LOOM: Some bits of dialogue are repeated) svn-id: r10145
2003-09-10 00:28:26 +00:00
// In V1-V3 games, CHARSET_1 is called much earlier than in newer games.
// See also bug #770042 for a case were this makes a difference.
// FIXME: Actually I am only sure that this is correct for V1-V2 and Loom.
// We should also check Indy3 & Zak256.
if (_version <= 3)
CHARSET_1();
get rid of ScummEngine::_insaneState (I think we should eventually stop calling processKbd() from inside smush and replace it with special code there) svn-id: r12589
2004-01-25 12:20:59 +00:00
processKbd(false);
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_features & GF_NEW_CAMERA) {
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_CAMERA_POS_X) = camera._cur.x;
VAR(VAR_CAMERA_POS_Y) = camera._cur.y;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
} else if (_version <= 2) {
V2 camera fix (again thanks MadMoose) svn-id: r7587
2003-05-16 23:54:58 +00:00
VAR(VAR_CAMERA_POS_X) = camera._cur.x / 8;
Final part of V7 merging process. The FULL_THROTTLE define is not required any more svn-id: r3660
2002-03-06 00:18:22 +00:00
} else {
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_CAMERA_POS_X) = camera._cur.x;
Final part of V7 merging process. The FULL_THROTTLE define is not required any more svn-id: r3660
2002-03-06 00:18:22 +00:00
}
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_HAVE_MSG) = (_haveMsg == 0xFE) ? 0xFF : _haveMsg;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 2) {
make some more use of ScummVM::Point; cleanup svn-id: r7549
2003-05-15 22:41:35 +00:00
VAR(VAR_VIRT_MOUSE_X) = _virtualMouse.x / 8;
VAR(VAR_VIRT_MOUSE_Y) = _virtualMouse.y / 2;
walkbox & putActor coords in V2 are in 'character coordinates' - x has to multiplied by 8 and y by 2 svn-id: r7426
2003-05-10 23:47:39 +00:00
} else {
make some more use of ScummVM::Point; cleanup svn-id: r7549
2003-05-15 22:41:35 +00:00
VAR(VAR_VIRT_MOUSE_X) = _virtualMouse.x;
VAR(VAR_VIRT_MOUSE_Y) = _virtualMouse.y;
VAR(VAR_MOUSE_X) = _mouse.x;
VAR(VAR_MOUSE_Y) = _mouse.y;
Should have been disabled for Mac. indy3/loom. Fixes distaff position svn-id: r13423
2004-03-29 07:12:14 +00:00
if (!((_features & GF_MACINTOSH) && (_version == 3))) {
// This is NOT for the Mac version of Indy3/Loom
added some very limited support for Mac Loom (text is now properly centered around x:160 instead of x:0); added (commented out) copyprot bypass (but since I am not sure if there was ever a Mac Loom w/o codes, am not sure if this ever should be enabled); added comment regarding the Mac Loom sound format svn-id: r8737
2003-07-04 12:34:09 +00:00
VAR(VAR_DEBUGMODE) = _debugMode;
}
more v2 var access fixes svn-id: r7395
2003-05-08 20:37:06 +00:00
}
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
various music related changes and cleanup; also modified MonkeyVGA music sync, at least the intro is much better synced now; not sure about other parts of it / other games svn-id: r7237
2003-05-01 00:04:05 +00:00
if (_features & GF_AUDIOTRACKS) {
// Covered automatically by the Sound class
added getMusicTimer() to class MusicEngine; this allows some nice code cleanup; also added an error() invocation to find out if certain code is still needed svn-id: r10556
2003-10-03 01:07:35 +00:00
} else if (_musicEngine && VAR_MUSIC_TIMER != 0xFF) {
// The music engine generates the timer data for us.
VAR(VAR_MUSIC_TIMER) = _musicEngine->getMusicTimer();
tweaked music syncing once more. This approach should be much more flexible, and also works with different delta values. svn-id: r7254
2003-05-01 21:41:31 +00:00
} else if (_features & GF_SMALL_HEADER) {
This is used in Amiga version of Monkey Island 1. svn-id: r10558
2003-10-03 01:31:39 +00:00
// Used for Money Island 1 (Amiga)
tweaked music syncing once more. This approach should be much more flexible, and also works with different delta values. svn-id: r7254
2003-05-01 21:41:31 +00:00
// TODO: The music delay (given in milliseconds) might have to be tuned a little
// to get it correct for all games. Without the ability to watch/listen to the
// original games, I can't do that myself.
Adjust timer for Amiga version of Monkey Island 1. svn-id: r10559
2003-10-03 01:35:21 +00:00
const int MUSIC_DELAY = 350;
tweaked music syncing once more. This approach should be much more flexible, and also works with different delta values. svn-id: r7254
2003-05-01 21:41:31 +00:00
tempMusic += delta * 15; // Convert delta to milliseconds
if (tempMusic >= MUSIC_DELAY) {
added getMusicTimer() to class MusicEngine; this allows some nice code cleanup; also added an error() invocation to find out if certain code is still needed svn-id: r10556
2003-10-03 01:07:35 +00:00
tempMusic -= MUSIC_DELAY;
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_MUSIC_TIMER) += 1;
Refixed getActorY in indy3. Fixed class (dunno if the fix doesn't break something else. Fixed intro by slowing down music rate by 3. svn-id: r4018
2002-04-19 21:06:50 +00:00
}
}
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
cleaned up autosave code svn-id: r5926
2002-12-13 03:23:17 +00:00
// Trigger autosave all 5 minutes.
if (!_saveLoadFlag && _system->get_msecs() > _lastSaveTime + 5 * 60 * 1000) {
added Scumm::displayError() method; make use of that to display errors if save/load failed; changed runDialog() to return the result of Dialog::runModal(); changed the order in which autosave is performed a little bit svn-id: r5493
2002-11-10 14:59:15 +00:00
_saveLoadSlot = 0;
sprintf(_saveLoadName, "Autosave %d", _saveLoadSlot);
_saveLoadFlag = 1;
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
_saveTemporaryState = false;
added Scumm::displayError() method; make use of that to display errors if save/load failed; changed runDialog() to return the result of Dialog::runModal(); changed the order in which autosave is performed a little bit svn-id: r5493
2002-11-10 14:59:15 +00:00
}
Remove \M's, add IRIX support. svn-id: r4019
2002-04-20 04:09:02 +00:00
Always reset the VAR_GAME_LOADED variable (if it's available). This seems to fix bug #740148, at least partially. svn-id: r8362
2003-06-06 21:59:56 +00:00
if (VAR_GAME_LOADED != 0xFF)
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_GAME_LOADED) = 0;
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
if (_saveLoadFlag) {
if a script triggers a load, immediatly perform it (this also covers the case where the user requests a load while a SMUSH video is playing. This avoids the annoying affect of seeing 1 frame of the old room immediately after you requested the load svn-id: r6687
2003-03-04 03:18:12 +00:00
load_game:
added Scumm::displayError() method; make use of that to display errors if save/load failed; changed runDialog() to return the result of Dialog::runModal(); changed the order in which autosave is performed a little bit svn-id: r5493
2002-11-10 14:59:15 +00:00
bool success;
fix warning svn-id: r8865
2003-07-08 18:09:22 +00:00
const char *errMsg = 0;
popup message when save was succesful svn-id: r6040
2002-12-21 12:09:28 +00:00
char filename[256];
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
if (_saveLoadFlag == 1) {
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
success = saveState(_saveLoadSlot, _saveTemporaryState);
added Scumm::displayError() method; make use of that to display errors if save/load failed; changed runDialog() to return the result of Dialog::runModal(); changed the order in which autosave is performed a little bit svn-id: r5493
2002-11-10 14:59:15 +00:00
if (!success)
fixed typo svn-id: r5823
2002-12-03 23:53:42 +00:00
errMsg = "Failed to save game state to file:\n\n%s";
implement temporary state saving for CMI svn-id: r6321
2003-01-02 08:39:33 +00:00
// Ender: Disabled for small_header games, as can overwrite game
// variables (eg, Zak256 cashcard values). Temp disabled for V8
// because of odd timing issue with scripts and the variable reset
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
if (success && _saveTemporaryState && !(_features & GF_SMALL_HEADER) && _version < 8)
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_GAME_LOADED) = 201;
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
} else {
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
success = loadState(_saveLoadSlot, _saveTemporaryState);
added Scumm::displayError() method; make use of that to display errors if save/load failed; changed runDialog() to return the result of Dialog::runModal(); changed the order in which autosave is performed a little bit svn-id: r5493
2002-11-10 14:59:15 +00:00
if (!success)
fixed typo svn-id: r5823
2002-12-03 23:53:42 +00:00
errMsg = "Failed to load game state from file:\n\n%s";
implement temporary state saving for CMI svn-id: r6321
2003-01-02 08:39:33 +00:00
// Ender: Disabled for small_header games, as can overwrite game
// variables (eg, Zak256 cashcard values).
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
if (success && _saveTemporaryState && !(_features & GF_SMALL_HEADER))
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
VAR(VAR_GAME_LOADED) = 203;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
makeSavegameName(filename, _saveLoadSlot, _saveTemporaryState);
added Scumm::displayError() method; make use of that to display errors if save/load failed; changed runDialog() to return the result of Dialog::runModal(); changed the order in which autosave is performed a little bit svn-id: r5493
2002-11-10 14:59:15 +00:00
if (!success) {
rename displayError() to displayMessage(); fix slightly incorrect usage of that method svn-id: r13402
2004-03-28 13:28:44 +00:00
displayMessage(0, errMsg, filename);
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
} else if (_saveLoadFlag == 1 && _saveLoadSlot != 0 && !_saveTemporaryState) {
more spelling fixes svn-id: r11176
2003-11-07 02:11:41 +00:00
// Display "Save successful" message, except for auto saves
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
#ifdef __PALM_OS__
char buf[256]; // 1024 is too big overflow the stack
#else
popup message when save was succesful svn-id: r6040
2002-12-21 12:09:28 +00:00
char buf[1024];
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
#endif
spelling (bug #781028) svn-id: r9342
2003-07-31 18:55:29 +00:00
sprintf(buf, "Successfully saved game state in file:\n\n%s", filename);
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
GUI::TimedMessageDialog dialog(buf, 1500);
popup message when save was succesful svn-id: r6040
2002-12-21 12:09:28 +00:00
runDialog(dialog);
added Scumm::displayError() method; make use of that to display errors if save/load failed; changed runDialog() to return the result of Dialog::runModal(); changed the order in which autosave is performed a little bit svn-id: r5493
2002-11-10 14:59:15 +00:00
}
fix for bug #755166 (clear click state after loading a game) svn-id: r8638
2003-06-22 23:01:06 +00:00
if (success && _saveLoadFlag != 1)
clearClickedStatus();
Fix bug #815853 - Cannot load during intro SMUSH movies svn-id: r12423
2004-01-16 07:58:55 +00:00
added Scumm::displayError() method; make use of that to display errors if save/load failed; changed runDialog() to return the result of Dialog::runModal(); changed the order in which autosave is performed a little bit svn-id: r5493
2002-11-10 14:59:15 +00:00
_saveLoadFlag = 0;
cleaned up autosave code svn-id: r5926
2002-12-13 03:23:17 +00:00
_lastSaveTime = _system->get_msecs();
Add autosave support, fix sm and max midi. svn-id: r4099
2002-04-27 04:31:25 +00:00
}
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
if (_completeScreenRedraw) {
_completeScreenRedraw = false;
move the charset mask to the charset renderer class; some other related changes svn-id: r12263
2004-01-08 21:21:40 +00:00
_charset->clearCharsetMask();
moved CharsetRendere into its own header/source file; changed Scumm::_charset into a pointer, to make it possible to use different implementations of it svn-id: r6147
2002-12-25 21:04:47 +00:00
_charset->_hasMask = false;
Fix problem of verbs areas always been shown after reload in V1-V2 games. Seems to fix problem of distaff highlights after reload in loom [ega]. Could cause regression in fm towns games. svn-id: r10455
2003-09-28 03:19:26 +00:00
correct for towns version svn-id: r10602
2003-10-05 06:38:07 +00:00
// HACK as in game save stuff isn't supported currently
This should fix distaff display after reload in loom/loomcd. svn-id: r10601
2003-10-05 06:11:15 +00:00
if (_gameId == GID_LOOM || _gameId == GID_LOOM256) {
Set these to zero just to be safe. svn-id: r12407
2004-01-15 10:14:17 +00:00
int args[16];
mac loom uses different var. svn-id: r10749
2003-10-12 13:44:37 +00:00
uint value;
Set these to zero just to be safe. svn-id: r12407
2004-01-15 10:14:17 +00:00
memset(args, 0, sizeof(args));
args[0] = 2;
mac loom uses different var. svn-id: r10749
2003-10-12 13:44:37 +00:00
if (_features & GF_MACINTOSH)
value = 105;
else
value = (_gameId == GID_LOOM256) ? 150 : 100;
correct for towns version svn-id: r10602
2003-10-05 06:38:07 +00:00
byte restoreScript = (_features & GF_FMTOWNS) ? 17 : 18;
// if verbs should be shown restore them
This should fix distaff display after reload in loom/loomcd. svn-id: r10601
2003-10-05 06:11:15 +00:00
if (VAR(value) == 2)
Set these to zero just to be safe. svn-id: r12407
2004-01-15 10:14:17 +00:00
runScript(restoreScript, 0, 0, args);
This should fix distaff display after reload in loom/loomcd. svn-id: r10601
2003-10-05 06:11:15 +00:00
} else if (_version > 3) {
got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables svn-id: r11953
2003-12-26 23:11:35 +00:00
for (int i = 0; i < _numVerbs; i++)
Fix problem of verbs areas always been shown after reload in V1-V2 games. Seems to fix problem of distaff highlights after reload in loom [ega]. Could cause regression in fm towns games. svn-id: r10455
2003-09-28 03:19:26 +00:00
drawVerb(i, 0);
} else {
redrawVerbs();
}
fixed verb regression in older games svn-id: r6884
2003-03-29 20:48:57 +00:00
verbMouseOver(0);
Fix V2 userface stuff in savestate svn-id: r7816
2003-05-22 05:21:48 +00:00
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 2) {
Fix V2 userface stuff in savestate svn-id: r7816
2003-05-22 05:21:48 +00:00
redrawV2Inventory();
Modified version of erik's patch #745986: Experimental V2 mouseover stuff svn-id: r8142
2003-05-30 14:29:07 +00:00
checkV2MouseOver(_mouse);
}
Fix V2 userface stuff in savestate svn-id: r7816
2003-05-22 05:21:48 +00:00
fixed verb regression in older games svn-id: r6884
2003-03-29 20:48:57 +00:00
_verbRedraw = false;
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
_fullRedraw = true;
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
runAllScripts();
checkExecVerbs();
cleanup svn-id: r5893
2002-12-09 01:27:40 +00:00
checkAndRunSentenceScript();
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
allow quit during smush playback; cleanup svn-id: r8411
2003-06-09 01:32:36 +00:00
if (_quit)
return 0;
if a script triggers a load, immediatly perform it (this also covers the case where the user requests a load while a SMUSH video is playing. This avoids the annoying affect of seeing 1 frame of the old room immediately after you requested the load svn-id: r6687
2003-03-04 03:18:12 +00:00
// HACK: If a load was requested, immediately perform it. This avoids
// drawing the current room right after the load is request but before
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
// it is performed. That was annoying esp. if you loaded while a SMUSH
if a script triggers a load, immediatly perform it (this also covers the case where the user requests a load while a SMUSH video is playing. This avoids the annoying affect of seeing 1 frame of the old room immediately after you requested the load svn-id: r6687
2003-03-04 03:18:12 +00:00
// cutscene was playing.
if (_saveLoadFlag && _saveLoadFlag != 1) {
goto load_game;
}
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
if (_currentRoom == 0) {
fix for bug #770042 (LOOM: Some bits of dialogue are repeated) svn-id: r10145
2003-09-10 00:28:26 +00:00
if (_version > 3)
CHARSET_1();
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
drawDirtyScreenParts();
} else {
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
walkActors();
moveCamera();
fixObjectFlags();
fix for bug #770042 (LOOM: Some bits of dialogue are repeated) svn-id: r10145
2003-09-10 00:28:26 +00:00
if (_version > 3)
CHARSET_1();
cleanup svn-id: r4776
2002-08-20 02:13:41 +00:00
if (camera._cur.x != camera._last.x || _BgNeedsRedraw || _fullRedraw
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
|| ((_features & GF_NEW_CAMERA) && camera._cur.y != camera._last.y)) {
cleanup svn-id: r4776
2002-08-20 02:13:41 +00:00
redrawBGAreas();
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
cleanup svn-id: r4776
2002-08-20 02:13:41 +00:00
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
processDrawQue();
Patch #616092: Full Throttle dialog fix svn-id: r5058
2002-10-01 09:27:09 +00:00
fixed verb drawing in COMI (and maybe FT, too?) svn-id: r6874
2003-03-28 19:11:16 +00:00
if (_verbRedraw) {
Patch #616092: Full Throttle dialog fix svn-id: r5058
2002-10-01 09:27:09 +00:00
redrawVerbs();
fixed verb drawing in COMI (and maybe FT, too?) svn-id: r6874
2003-03-28 19:11:16 +00:00
}
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
rewrote Actor::needBgReset related code (this could cause regressions...) svn-id: r8126
2003-05-30 00:55:21 +00:00
setActorRedrawFlags();
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
resetActorBgs();
move the charset mask to the charset renderer class; some other related changes svn-id: r12263
2004-01-08 21:21:40 +00:00
if (VAR_CURRENT_LIGHTS != 0xFF &&
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
!(VAR(VAR_CURRENT_LIGHTS) & LIGHTMODE_screen) &&
VAR(VAR_CURRENT_LIGHTS) & LIGHTMODE_flashlight) {
added lights support to the costume renderer; begun work on flashlight support (no real code yet :-) svn-id: r4774
2002-08-19 17:23:48 +00:00
drawFlashlight();
rewrote Actor::needBgReset related code (this could cause regressions...) svn-id: r8126
2003-05-30 00:55:21 +00:00
setActorRedrawFlags();
renamed fadeToBlackEffect to fadeOut; renamed screenEffect to fadeIn; implemented oldRoomEffect (fixes room transitions in MonkeyVGA and Indy3) svn-id: r4536
2002-07-13 14:07:37 +00:00
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
very simple full throttle support, use the FULL_THROTTLE define. (will fix later) modified some actor parts to work better with full throttle (most likely new bugs because of that). directions are now stored as angles instead of left/right/up/down implemented loadFlObject (flobjects are currently saved in the savestate, will fix that also) svn-id: r3505
2001-11-26 19:57:57 +00:00
processActors();
removed even more scumm dependencies from NewGUI; fixed some redraw issues (this might help the inventory-display issue in The Dig, and definitly fixes the 'vanishing volcanoe' in the FOA extro) svn-id: r4974
2002-09-19 21:45:56 +00:00
_fullRedraw = false;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
cyclePalette();
palManipulate();
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
bug fixes, code cleanup svn-id: r3446
2001-10-26 17:34:50 +00:00
if (_doEffect) {
_doEffect = false;
renamed fadeToBlackEffect to fadeOut; renamed screenEffect to fadeIn; implemented oldRoomEffect (fixes room transitions in MonkeyVGA and Indy3) svn-id: r4536
2002-07-13 14:07:37 +00:00
fadeIn(_newEffect);
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
clearClickedStatus();
}
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
super hackish mouse click support for Zak (doesn't do anything useful in MM yet; and in Zak, all clicks are for the scene, i.e. no verb clicks etc.) svn-id: r7408
2003-05-09 22:26:00 +00:00
fixed verb drawing in COMI (and maybe FT, too?) svn-id: r6874
2003-03-28 19:11:16 +00:00
if (!_verbRedraw && _cursor.state > 0) {
make some more use of ScummVM::Point; cleanup svn-id: r7549
2003-05-15 22:41:35 +00:00
verbMouseOver(checkMouseOver(_mouse.x, _mouse.y));
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
fixed verb drawing in COMI (and maybe FT, too?) svn-id: r6874
2003-03-28 19:11:16 +00:00
_verbRedraw = false;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
fix for bug #752860 (based on patch #748675) svn-id: r8457
2003-06-13 09:11:31 +00:00
if (_version <= 2) {
if (oldEgo != VAR(VAR_EGO)) {
fix existing ego actor change detection code svn-id: r8941
2003-07-12 12:16:17 +00:00
// FIXME/TODO: Reset and redraw the sentence line
fix for bug #752860 (based on patch #748675) svn-id: r8457
2003-06-13 09:11:31 +00:00
oldEgo = VAR(VAR_EGO);
this hack isn't necessary anymore (at least I found no cases where it would be needed) svn-id: r9017
2003-07-14 17:36:27 +00:00
_inventoryOffset = 0;
fix for bug #752860 (based on patch #748675) svn-id: r8457
2003-06-13 09:11:31 +00:00
redrawV2Inventory();
}
Modified version of erik's patch #745986: Experimental V2 mouseover stuff svn-id: r8142
2003-05-30 14:29:07 +00:00
checkV2MouseOver(_mouse);
fix for bug #752860 (based on patch #748675) svn-id: r8457
2003-06-13 09:11:31 +00:00
}
Modified version of erik's patch #745986: Experimental V2 mouseover stuff svn-id: r8142
2003-05-30 14:29:07 +00:00
Actually, we used to draw blast text after blast objects. I changed the order to fix the Full Throttle end credits. I guess I should have added a comment about that. :-) svn-id: r9866
2003-08-26 06:35:38 +00:00
// For the Full Throttle credits to work properly, the blast
// texts have to be drawn before the blast objects. Unless
// someone can think of a better way to achieve this effect.
Variable should be checked at this point. svn-id: r12942
2004-02-20 15:04:51 +00:00
if (_version >= 7 && VAR(VAR_BLAST_ABOVE_TEXT) == 1) {
Actually, we used to draw blast text after blast objects. I changed the order to fix the Full Throttle end credits. I guess I should have added a comment about that. :-) svn-id: r9866
2003-08-26 06:35:38 +00:00
drawBlastTexts();
drawBlastObjects();
} else {
drawBlastObjects();
drawBlastTexts();
}
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version == 8)
patch #689164 comi verb coin hack by erik, fixes the verb coin drawing behind the inventory svn-id: r6642
2003-02-27 10:17:29 +00:00
processUpperActors();
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
drawDirtyScreenParts();
first blastText version. this is work in progress (note that e.g. text is not clipped, and the extra information is not removed) svn-id: r6472
2003-01-16 00:40:19 +00:00
removeBlastTexts();
fix for bug #782727 (COMI: no sentence line while inventory is shown) by drawing blast text after blast objects svn-id: r9853
2003-08-24 21:58:16 +00:00
removeBlastObjects();
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 5)
recompile not needed when switching games debugger skeleton implemented svn-id: r3442
2001-10-23 19:51:50 +00:00
playActorSounds();
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
}
cleanup svn-id: r8698
2003-07-02 00:49:03 +00:00
_sound->processSoundQues();
it seems to be needed for comi too, hmm svn-id: r13525
2004-04-09 21:42:37 +00:00
if (_imuseDigital &&
( ((_gameId == GID_DIG) && (!(_features & GF_DEMO))) || (_gameId == GID_CMI) ))
back refreshScript only for DIG, add stopping music while changing bundle svn-id: r13513
2004-04-09 05:43:24 +00:00
_imuseDigital->refreshScripts();
synced local imuse. many bug fixes, and few new bugs :) svn-id: r13153
2004-03-02 20:35:48 +00:00
cleanup svn-id: r8698
2003-07-02 00:49:03 +00:00
camera._last = camera._cur;
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
if (!(++_expire_counter)) {
increaseResourceCounter();
}
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
new video engine (expect broken non-sdl builds), simon the sorcerer 1 & 2 support (non SCUMM games) svn-id: r3912
2002-04-12 21:26:59 +00:00
animateCursor();
/* show or hide mouse */
Renamed more OSystem methods svn-id: r13410
2004-03-28 16:30:50 +00:00
_system->showMouse(_cursor.state > 0);
new video engine (expect broken non-sdl builds), simon the sorcerer 1 & 2 support (non SCUMM games) svn-id: r3912
2002-04-12 21:26:59 +00:00
work around some illegal var access' in COMI/V8 - there are more, but I am not always sure if avoiding the access is the proper fix; maybe in some cases we should just define that var for V8 to the proper value? svn-id: r7425
2003-05-10 22:35:12 +00:00
if (VAR_TIMER != 0xFF)
fixed various cases of bad var access svn-id: r7394
2003-05-08 15:58:30 +00:00
VAR(VAR_TIMER) = 0;
init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning svn-id: r7393
2003-05-08 15:48:50 +00:00
return VAR(VAR_TIMER_NEXT);
save/load dialog by pressing F5, multiple sounds at the same time, some other fixes svn-id: r3477
2001-11-09 18:54:15 +00:00
}
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#pragma mark -
#pragma mark --- Events / Input ---
#pragma mark -
bug fixes, speech in dott svn-id: r3454
2001-11-05 19:21:49 +00:00
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::parseEvents() {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
OSystem::Event event;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
while (_system->poll_event(&event)) {
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
switch(event.event_code) {
case OSystem::EVENT_KEYDOWN:
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
if (event.kbd.keycode >= '0' && event.kbd.keycode <= '9'
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
&& (event.kbd.flags == OSystem::KBD_ALT ||
event.kbd.flags == OSystem::KBD_CTRL)) {
_saveLoadSlot = event.kbd.keycode - '0';
hack to get Indydemo to work svn-id: r7183
2003-04-28 16:57:53 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// don't overwrite autosave (slot 0)
if (_saveLoadSlot == 0)
_saveLoadSlot = 10;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
sprintf(_saveLoadName, "Quicksave %d", _saveLoadSlot);
_saveLoadFlag = (event.kbd.flags == OSystem::KBD_ALT) ? 1 : 2;
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave svn-id: r12691
2004-01-31 22:12:35 +00:00
_saveTemporaryState = false;
implemented FOA keyboard fighting svn-id: r10052
2003-09-06 23:29:35 +00:00
} else if (event.kbd.flags == OSystem::KBD_CTRL) {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (event.kbd.keycode == 'f')
_fastMode ^= 1;
else if (event.kbd.keycode == 'g')
_fastMode ^= 2;
else if (event.kbd.keycode == 'd')
cleanup svn-id: r10764
2003-10-12 17:49:52 +00:00
_debugger->attach();
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
else if (event.kbd.keycode == 's')
resourceStats();
else
_keyPressed = event.kbd.ascii; // Normal key press, pass on to the game.
} else if (event.kbd.flags & OSystem::KBD_ALT) {
// The result must be 273 for Alt-W
// because that's what MI2 looks for in
// its "instant win" cheat.
_keyPressed = event.kbd.keycode + 154;
Don't reamp F1 in COMI demo svn-id: r13067
2004-02-27 05:51:04 +00:00
} else if (event.kbd.ascii == 315 && (_gameId == GID_CMI && !(_features & GF_DEMO))) {
implemented FOA keyboard fighting svn-id: r10052
2003-09-06 23:29:35 +00:00
// FIXME: support in-game menu screen. For now, this remaps F1 to F5 in COMI
remap F1 to F5 for comi so people don't get the broken in game menu svn-id: r9613
2003-08-10 06:10:07 +00:00
_keyPressed = 319;
implemented FOA keyboard fighting svn-id: r10052
2003-09-06 23:29:35 +00:00
} else if (_gameId == GID_INDY4 && event.kbd.ascii >= '0' && event.kbd.ascii <= '9') {
// To support keyboard fighting in FOA, we need to remap the number keys.
// FOA apparently expects PC scancode values (see script 46 if you want
// to know where I got these numbers from).
static const int numpad[10] = {
'0',
335, 336, 337,
331, 332, 333,
327, 328, 329
};
_keyPressed = numpad[event.kbd.ascii - '0'];
Add keyboard support for derby in FT and cannon battle in COMI, patch #853099 svn-id: r11496
2003-12-05 00:02:01 +00:00
} else if (event.kbd.ascii < 273 || event.kbd.ascii > 276 || _gameId == GID_FT) {
implemented FOA keyboard fighting svn-id: r10052
2003-09-06 23:29:35 +00:00
// don't let game have arrow keys as we currently steal them
// for keyboard cursor control
// this fixes bug with up arrow (273) corresponding to
// "instant win" cheat in MI2 mentioned above
Add keyboard support for derby in FT and cannon battle in COMI, patch #853099 svn-id: r11496
2003-12-05 00:02:01 +00:00
//
// This is not applicable to Full Throttle as it processes keyboard
// cursor control by itself. Also it fixes derby scene
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_keyPressed = event.kbd.ascii; // Normal key press, pass on to the game.
implemented FOA keyboard fighting svn-id: r10052
2003-09-06 23:29:35 +00:00
}
Add keyboard support for derby in FT and cannon battle in COMI, patch #853099 svn-id: r11496
2003-12-05 00:02:01 +00:00
if (_keyPressed >= 512)
turn down verbosity svn-id: r13345
2004-03-19 17:58:47 +00:00
debugC(DEBUG_GENERAL, "_keyPressed > 512 (%d)", _keyPressed);
Add keyboard support for derby in FT and cannon battle in COMI, patch #853099 svn-id: r11496
2003-12-05 00:02:01 +00:00
else
_keyDownMap[_keyPressed] = true;
break;
case OSystem::EVENT_KEYUP:
// FIXME: for some reason OSystem::KBD_ALT is set sometimes
// possible to a bug in sdl-common.cpp
if (event.kbd.ascii >= 512)
turn down verbosity svn-id: r13345
2004-03-19 17:58:47 +00:00
debugC(DEBUG_GENERAL, "keyPressed > 512 (%d)", event.kbd.ascii);
Add keyboard support for derby in FT and cannon battle in COMI, patch #853099 svn-id: r11496
2003-12-05 00:02:01 +00:00
else
_keyDownMap[event.kbd.ascii] = false;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
break;
Reapply the Zak cashcard var exclusions... two of them somehow vanished out of the code during rewrites. svn-id: r4542
2002-07-14 03:01:36 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
case OSystem::EVENT_MOUSEMOVE:
_mouse.x = event.mouse.x;
_mouse.y = event.mouse.y;
break;
better full throttle support, a couple of MI2 fixes. svn-id: r3532
2001-12-27 17:51:58 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
case OSystem::EVENT_LBUTTONDOWN:
_leftBtnPressed |= msClicked|msDown;
#if defined(_WIN32_WCE) || defined(__PALM_OS__)
_mouse.x = event.mouse.x;
_mouse.y = event.mouse.y;
#endif
break;
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
case OSystem::EVENT_RBUTTONDOWN:
_rightBtnPressed |= msClicked|msDown;
#if defined(_WIN32_WCE) || defined(__PALM_OS__)
_mouse.x = event.mouse.x;
_mouse.y = event.mouse.y;
#endif
break;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
case OSystem::EVENT_LBUTTONUP:
_leftBtnPressed &= ~msDown;
break;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
case OSystem::EVENT_RBUTTONUP:
_rightBtnPressed &= ~msDown;
break;
case OSystem::EVENT_QUIT:
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if (_confirmExit)
Patch #715991: Quit Confirmation Dialog (feature request #642721) with some tweaks by me svn-id: r9210
2003-07-28 01:36:16 +00:00
confirmexitDialog();
else
Let's spell it out: c-o-d-e r-e-u-s-e :-) svn-id: r11640
2003-12-14 20:36:37 +00:00
_quit = true;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
break;
default:
break;
}
}
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::clearClickedStatus() {
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
_keyPressed = 0;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_mouseButStat = 0;
_leftBtnPressed &= ~msClicked;
_rightBtnPressed &= ~msClicked;
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
get rid of ScummEngine::_insaneState (I think we should eventually stop calling processKbd() from inside smush and replace it with special code there) svn-id: r12589
2004-01-25 12:20:59 +00:00
void ScummEngine::processKbd(bool smushMode) {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
int saveloadkey;
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
_lastKeyHit = _keyPressed;
_keyPressed = 0;
Fix restart key in fm towns games svn-id: r11700
2003-12-17 02:23:30 +00:00
if (((_version <= 2) || (_features & GF_FMTOWNS)) && 315 <= _lastKeyHit && _lastKeyHit < 315+12) {
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
// Convert F-Keys for V1/V2 games (they start at 1 instead of at 315)
_lastKeyHit -= 314;
}
//
// Clip the mouse coordinates, and compute _virtualMouse.x (and clip it, too)
//
if (_mouse.x < 0)
_mouse.x = 0;
if (_mouse.x > _screenWidth-1)
_mouse.x = _screenWidth-1;
if (_mouse.y < 0)
_mouse.y = 0;
if (_mouse.y > _screenHeight-1)
_mouse.y = _screenHeight-1;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_virtualMouse.x = _mouse.x + virtscr[0].xstart;
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
_virtualMouse.y = _mouse.y - virtscr[0].topline;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (_features & GF_NEW_CAMERA)
cleanup; fix for bug #795942 (COMI: text display off screen) and #785760 (COMI: Lockup/crash on Skull Island) svn-id: r10144
2003-09-09 20:54:19 +00:00
_virtualMouse.y += _screenTop;
Patch 671031: Fix for MI1 intro crash + others (move new object clearing code into a more generic function, and call it earlier) svn-id: r6548
2003-01-26 10:57:01 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (_virtualMouse.y < 0)
_virtualMouse.y = -1;
if (_virtualMouse.y >= virtscr[0].height)
_virtualMouse.y = -1;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
//
// Determine the mouse button state.
//
_mouseButStat = 0;
// Interpret 'return' as left click and 'tab' as right click
if (_lastKeyHit && _cursor.state > 0) {
if (_lastKeyHit == 9) {
_mouseButStat = MBS_RIGHT_CLICK;
_lastKeyHit = 0;
} else if (_lastKeyHit == 13) {
_mouseButStat = MBS_LEFT_CLICK;
_lastKeyHit = 0;
}
}
Allow right mouse click to skip cutscene (Instead of both) in old games, since originals were this way. svn-id: r9724
2003-08-16 14:24:17 +00:00
if (_leftBtnPressed & msClicked && _rightBtnPressed & msClicked && _version > 3) {
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
// Pressing both mouse buttons is treated as if you pressed
// the cutscene exit key (i.e. ESC in most games). That mimicks
// the behaviour of the original engine where pressing both
// mouse buttons also skips the current cutscene.
_mouseButStat = 0;
_lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY);
Allow right mouse click to skip cutscene (Instead of both) in old games, since originals were this way. svn-id: r9724
2003-08-16 14:24:17 +00:00
} else if (_rightBtnPressed & msClicked && (_version < 4 && _gameId != GID_LOOM)) {
// Pressing right mouse button is treated as if you pressed
// the cutscene exit key (i.e. ESC in most games). That mimicks
// the behaviour of the original engine where pressing right
// mouse button also skips the current cutscene.
_mouseButStat = 0;
_lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY);
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
} else if (_leftBtnPressed & msClicked) {
_mouseButStat = MBS_LEFT_CLICK;
} else if (_rightBtnPressed & msClicked) {
_mouseButStat = MBS_RIGHT_CLICK;
}
if (_version == 8) {
VAR(VAR_MOUSE_BUTTONS) = 0;
VAR(VAR_MOUSE_HOLD) = 0;
VAR(VAR_RIGHTBTN_HOLD) = 0;
if (_leftBtnPressed & msClicked)
VAR(VAR_MOUSE_BUTTONS) += 1;
if (_rightBtnPressed & msClicked)
VAR(VAR_MOUSE_BUTTONS) += 2;
if (_leftBtnPressed & msDown)
VAR(VAR_MOUSE_HOLD) += 1;
if (_rightBtnPressed & msDown) {
VAR(VAR_RIGHTBTN_HOLD) = 1;
VAR(VAR_MOUSE_HOLD) += 2;
}
} else if (_version == 7) {
VAR(VAR_LEFTBTN_HOLD) = (_leftBtnPressed & msDown) != 0;
VAR(VAR_RIGHTBTN_HOLD) = (_rightBtnPressed & msDown) != 0;
}
_leftBtnPressed &= ~msClicked;
_rightBtnPressed &= ~msClicked;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (!_lastKeyHit)
return;
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
// If a key script was specified (a V8 feature), and it's trigger
// key was pressed, run it.
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (_keyScriptNo && (_keyScriptKey == _lastKeyHit)) {
runScript(_keyScriptNo, 0, 0, 0);
return;
Final part of V7 merging process. The FULL_THROTTLE define is not required any more svn-id: r3660
2002-03-06 00:18:22 +00:00
}
bug fixes, code cleanup svn-id: r3446
2001-10-26 17:34:50 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#ifdef _WIN32_WCE
if (_lastKeyHit == KEY_SET_OPTIONS) {
//_newgui->optionsDialog();
return;
bug fixes, code cleanup svn-id: r3446
2001-10-26 17:34:50 +00:00
}
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (_lastKeyHit == KEY_ALL_SKIP) {
// Skip cutscene
get rid of ScummEngine::_insaneState (I think we should eventually stop calling processKbd() from inside smush and replace it with special code there) svn-id: r12589
2004-01-25 12:20:59 +00:00
if (smushMode) {
Fix for bug #751670, thanks to MadMoose (I am not quite happy with the situation, but hey, at least this helps :-) svn-id: r11662
2003-12-15 20:33:40 +00:00
// Eek this is literally shouting for trouble...
// Probably should set _lastKey to VAR_CUTSCENEEXIT_KEY instead!
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_videoFinished = true;
return;
}
else
if (vm.cutScenePtr[vm.cutSceneStackPointer])
_lastKeyHit = (uint16)VAR(VAR_CUTSCENEEXIT_KEY);
else
// Skip talk
if (_talkDelay > 0)
_lastKeyHit = (uint16)VAR(VAR_TALKSTOP_KEY);
else
// Escape
_lastKeyHit = 27;
}
#endif
trivial cleanup svn-id: r4988
2002-09-21 16:20:52 +00:00
Detect restart key in v1-v2 games and use confirmation. svn-id: r11648
2003-12-15 05:16:34 +00:00
if (VAR_RESTART_KEY != 0xFF && _lastKeyHit == VAR(VAR_RESTART_KEY) ||
Fix restart key in fm towns games svn-id: r11700
2003-12-17 02:23:30 +00:00
(((_version <= 2) || (_features & GF_FMTOWNS)) && _lastKeyHit == 8)) {
Always confirm restart svn-id: r11635
2003-12-14 15:04:05 +00:00
confirmrestartDialog();
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
return;
Final part of V7 merging process. The FULL_THROTTLE define is not required any more svn-id: r3660
2002-03-06 00:18:22 +00:00
}
better full throttle support, a couple of MI2 fixes. svn-id: r3532
2001-12-27 17:51:58 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if ((VAR_PAUSE_KEY != 0xFF && _lastKeyHit == VAR(VAR_PAUSE_KEY)) ||
(VAR_PAUSE_KEY == 0xFF && _lastKeyHit == ' ')) {
pauseGame();
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
return;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
Adjust load/key for FM Towns games, since values have changed. svn-id: r11731
2003-12-18 06:22:33 +00:00
if ((_version <= 2) || (_features & GF_FMTOWNS))
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
saveloadkey = 5; // F5
samdemo doesn't set VAR_SAVELOADDIALOG_KEY svn-id: r10774
2003-10-13 11:28:56 +00:00
else if ((_version <= 3) || (_gameId == GID_SAMNMAX) || (_gameId == GID_CMI))
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
saveloadkey = 319; // F5
else
remade the in-game GUI/menu svn-id: r11119
2003-11-03 23:26:13 +00:00
saveloadkey = VAR(VAR_MAINMENU_KEY);
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (_lastKeyHit == VAR(VAR_CUTSCENEEXIT_KEY) ||
(VAR(VAR_CUTSCENEEXIT_KEY) == 4 && _lastKeyHit == 27)) {
merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code svn-id: r9085
2003-07-20 00:02:24 +00:00
// Skip cutscene (or active SMUSH video). For the V2 games, which
// normally use F4 for this, we add in a hack that makes escape work,
// too (just for convenience).
get rid of ScummEngine::_insaneState (I think we should eventually stop calling processKbd() from inside smush and replace it with special code there) svn-id: r12589
2004-01-25 12:20:59 +00:00
if (smushMode) {
oops. svn-id: r11510
2003-12-06 07:02:43 +00:00
if (_gameId == GID_FT)
_insane->escapeKeyHandler();
else
_videoFinished = true;
Fix for bug #751670, thanks to MadMoose (I am not quite happy with the situation, but hey, at least this helps :-) svn-id: r11662
2003-12-15 20:33:40 +00:00
}
get rid of ScummEngine::_insaneState (I think we should eventually stop calling processKbd() from inside smush and replace it with special code there) svn-id: r12589
2004-01-25 12:20:59 +00:00
if (!smushMode || _videoFinished)
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
abortCutscene();
fix for bug #770704 svn-id: r9115
2003-07-22 01:03:10 +00:00
if (_version <= 2) {
// Ensure that the input script also sees the key press.
// This is necessary so you can abort the airplane travel
// in Zak.
VAR(VAR_KEYPRESS) = VAR(VAR_CUTSCENEEXIT_KEY);
}
fix for bug #758542 svn-id: r9088
2003-07-20 01:09:42 +00:00
} else if (_lastKeyHit == saveloadkey) {
if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0);
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
remade the in-game GUI/menu svn-id: r11119
2003-11-03 23:26:13 +00:00
mainMenuDialog(); // Display NewGui
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
fix for bug #758542 svn-id: r9088
2003-07-20 01:09:42 +00:00
if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0);
return;
} else if (VAR_TALKSTOP_KEY != 0xFF && _lastKeyHit == VAR(VAR_TALKSTOP_KEY)) {
Fix for bug #856624, "FT: '.' key wipes out conversation responses". svn-id: r11678
2003-12-16 08:03:14 +00:00
// Some text never times out, and should never be skipped. The
// Full Throttle conversation menus is the main - perhaps the
// only - example of this.
if (_talkDelay != -1) {
_talkDelay = 0;
if (_sound->_sfxMode & 2)
stopTalk();
}
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
return;
} else if (_lastKeyHit == '[') { // [ Music volume down
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
int vol = ConfMan.getInt("music_volume");
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (!(vol & 0xF) && vol)
vol -= 16;
vol = vol & 0xF0;
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
ConfMan.set("music_volume", vol);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (_imuse)
_imuse->set_music_volume (vol);
} else if (_lastKeyHit == ']') { // ] Music volume up
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
int vol = ConfMan.getInt("music_volume");
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
vol = (vol + 16) & 0xFF0;
if (vol > 255) vol = 255;
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
ConfMan.set("music_volume", vol);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (_imuse)
_imuse->set_music_volume (vol);
} else if (_lastKeyHit == '-') { // - text speed down
Adjust again for V1/V2 games. svn-id: r12953
2004-02-21 06:36:40 +00:00
if (_defaultTalkDelay < 9)
_defaultTalkDelay++;
if (VAR_CHARINC != 0xFF)
VAR(VAR_CHARINC) = _defaultTalkDelay;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
} else if (_lastKeyHit == '+') { // + text speed up
Adjust again for V1/V2 games. svn-id: r12953
2004-02-21 06:36:40 +00:00
if (_defaultTalkDelay > 0)
_defaultTalkDelay--;
if (VAR_CHARINC != 0xFF)
VAR(VAR_CHARINC) = _defaultTalkDelay;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
} else if (_lastKeyHit == '~' || _lastKeyHit == '#') { // Debug console
cleanup svn-id: r10764
2003-10-12 17:49:52 +00:00
_debugger->attach();
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
} else if (_version <= 2) {
// Store the input type. So far we can't distinguish
// between 1, 3 and 5.
// 1) Verb 2) Scene 3) Inv. 4) Key
// 5) Sentence Bar
if (_lastKeyHit) { // Key Input
VAR(VAR_KEYPRESS) = _lastKeyHit;
Final part of V7 merging process. The FULL_THROTTLE define is not required any more svn-id: r3660
2002-03-06 00:18:22 +00:00
}
better full throttle support, a couple of MI2 fixes. svn-id: r3532
2001-12-27 17:51:58 +00:00
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_mouseButStat = _lastKeyHit;
new video engine (expect broken non-sdl builds), simon the sorcerer 1 & 2 support (non SCUMM games) svn-id: r3912
2002-04-12 21:26:59 +00:00
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#pragma mark -
#pragma mark --- SCUMM ---
#pragma mark -
/**
* Start a 'scene' by loading the specified room with the given main actor.
* The actor is placed next to the object indicated by objectNr.
*/
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::startScene(int room, Actor *a, int objectNr) {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
int i, where;
CHECK_HEAP;
More conversion to debug channels svn-id: r12293
2004-01-10 11:01:47 +00:00
debugC(DEBUG_GENERAL, "Loading room %d", room);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
clearMsgQueue now just is a synonym for stopTalk -> remove it svn-id: r13300
2004-03-15 03:24:29 +00:00
stopTalk();
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
fadeOut(_switchRoomEffect2);
_newEffect = _switchRoomEffect;
ScriptSlot *ss = &vm.slot[_currentScript];
if (_currentScript != 0xFF) {
if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) {
if (ss->cutsceneOverride != 0)
error("Object %d stopped with active cutscene/override in exit", ss->number);
_currentScript = 0xFF;
} else if (ss->where == WIO_LOCAL) {
if (ss->cutsceneOverride != 0) {
This is normal for earlier games svn-id: r12967
2004-02-21 15:08:36 +00:00
// Earlier games only checked global scripts at this point
if (_version >= 5)
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
error("Script %d stopped with active cutscene/override in exit", ss->number);
}
_currentScript = 0xFF;
}
}
if (!(_features & GF_SMALL_HEADER) && VAR_NEW_ROOM != 0xFF) // Disable for SH games. Overwrites
VAR(VAR_NEW_ROOM) = room; // gamevars, eg Zak cashcards
Fix regressions in MI1 Amiga Revert last change to MI1 demo fix and make it monkeyega target only. svn-id: r9732
2003-08-17 02:34:34 +00:00
runExitScript();
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
killScriptsAndResources();
clearEnqueue();
stopCycle(0);
Fix for Bug [785373] SAM: Overlapping music at Bigfoot convention Included the ImDeferredCommand list when checking for sounds that have been queued to play. Also added sound queue processing between execution of exit script and entry script. In the case of this bug, the entry script required that the iMuse state be fully up to date, including last-moment changes from the previous exit script. svn-id: r9622
2003-08-10 11:44:43 +00:00
_sound->processSoundQues();
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
for (i = 1; i < _numActors; i++) {
_actors[i].hideActor();
}
sufficient to set _roomPalette at the start for V6+ games, since they don't modify the _roomPalette, ever svn-id: r10777
2003-10-13 12:17:26 +00:00
if (_version < 7) {
for (i = 0; i < 256; i++) {
_roomPalette[i] = i;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_shadowPalette[i] = i;
sufficient to set _roomPalette at the start for V6+ games, since they don't modify the _roomPalette, ever svn-id: r10777
2003-10-13 12:17:26 +00:00
}
if (_features & GF_SMALL_HEADER)
setDirtyColors(0, 255);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
clearDrawObjectQueue();
VAR(VAR_ROOM) = room;
_fullRedraw = true;
increaseResourceCounter();
_currentRoom = room;
VAR(VAR_ROOM) = room;
if (room >= 0x80 && _version < 7)
_roomResource = _resourceMapper[room & 0x7F];
else
_roomResource = room;
if (VAR_ROOM_RESOURCE != 0xFF)
VAR(VAR_ROOM_RESOURCE) = _roomResource;
if (room != 0)
ensureResourceLoaded(rtRoom, room);
clearRoomObjects();
if (_currentRoom == 0) {
_ENCD_offs = _EXCD_offs = 0;
_numObjectsInRoom = 0;
return;
}
initRoomSubBlocks();
if (_features & GF_OLD_BUNDLE)
loadRoomObjectsOldBundle();
else if (_features & GF_SMALL_HEADER)
loadRoomObjectsSmall();
else
loadRoomObjects();
oops svn-id: r10171
2003-09-11 13:02:13 +00:00
fix for room-scroll regression in V1/V2 (essentially, we never init the camera y-values, except here, for these games) svn-id: r10174
2003-09-11 13:43:30 +00:00
if (VAR_V6_SCREEN_WIDTH != 0xFF && VAR_V6_SCREEN_HEIGHT != 0xFF) {
VAR(VAR_V6_SCREEN_WIDTH) = _roomWidth;
VAR(VAR_V6_SCREEN_HEIGHT) = _roomHeight;
}
Fix COMI regression for now, seems to require x min/max values for camera to be set first. svn-id: r10191
2003-09-12 09:50:33 +00:00
VAR(VAR_CAMERA_MIN_X) = _screenWidth / 2;
VAR(VAR_CAMERA_MAX_X) = _roomWidth - (_screenWidth / 2);
fix for room-scroll regression in V1/V2 (essentially, we never init the camera y-values, except here, for these games) svn-id: r10174
2003-09-11 13:43:30 +00:00
if (_features & GF_NEW_CAMERA) {
VAR(VAR_CAMERA_MIN_Y) = _screenHeight / 2;
VAR(VAR_CAMERA_MAX_Y) = _roomHeight - (_screenHeight / 2);
setCameraAt(_screenWidth / 2, _screenHeight / 2);
} else {
added & renamed some constants; fixed & added some doxygen comments; cleaned up the dirty screen code a bit (this should also fix a bug in V1/V2 games where part of the screen was not redrawn properly) svn-id: r12118
2004-01-03 21:22:07 +00:00
camera._mode = kNormalCameraMode;
fix for room-scroll regression in V1/V2 (essentially, we never init the camera y-values, except here, for these games) svn-id: r10174
2003-09-11 13:43:30 +00:00
if (_version > 2)
oops svn-id: r10171
2003-09-11 13:02:13 +00:00
camera._cur.x = camera._dest.x = _screenWidth / 2;
fix for room-scroll regression in V1/V2 (essentially, we never init the camera y-values, except here, for these games) svn-id: r10174
2003-09-11 13:43:30 +00:00
camera._cur.y = camera._dest.y = _screenHeight / 2;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
oops svn-id: r10171
2003-09-11 13:02:13 +00:00
if (_roomResource == 0)
return;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
memset(gfxUsageBits, 0, sizeof(gfxUsageBits));
if (a) {
where = whereIsObject(objectNr);
if (where != WIO_ROOM && where != WIO_FLOBJECT)
error("startScene: Object %d is not in room %d", objectNr,
_currentRoom);
int x, y, dir;
getObjectXYPos(objectNr, x, y, dir);
a->putActor(x, y, _currentRoom);
a->setDirection(dir + 180);
a->moving = 0;
}
showActors();
_egoPositioned = false;
runEntryScript();
if (_version <= 2)
runScript(5, 0, 0, 0);
Version 4 games should use older code style too, checked against loomcd/monkeyvga disasm. svn-id: r10805
2003-10-15 02:38:23 +00:00
else if (_version >= 5 && _version <= 6) {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (a && !_egoPositioned) {
int x, y;
getObjectXYPos(objectNr, x, y);
a->putActor(x, y, _currentRoom);
a->moving = 0;
}
Fix for bug #866453 (MI1EGA: Background pushed to side at end of game) svn-id: r11987
2003-12-28 02:08:13 +00:00
} else if (_version >= 7) {
Restrict hack svn-id: r13059
2004-02-26 03:13:20 +00:00
if ((_gameId == GID_DIG) && a) {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// FIXME: This hack mostly is there to fix the tomb/statue room
// in The Dig. What happens there is that when you enter, you are
// placed at object 399, coords (307,141), which is in box 25.
// But then the entry script locks that and other boxes. Hence
// after the entry script runs, you basically can only do one thing
// in that room, and that is to leave it - which means the game
// is unfinishable.
// By calling adjustActorPos, we can solve the problem in this case:
// there is a very close box (box 12) which contains point (307,144).
// If we call adjustActorPos, Commander Low is moved into that box,
// and we can go on. But aqudran looked this up in his IMB DB for
// The DIG; and nothing like this is done there. Also I am pretty
// sure this used to work in 0.3.1. So apparently something broke
// down here, and I have no clue what that might be :-/
a->adjustActorPos();
}
if (camera._follows) {
a = derefActor(camera._follows, "startScene: follows");
moved Actor x/y to _pos.x/_pos.y -> this makes it much easier to grep for access of the actor position svn-id: r10253
2003-09-14 18:16:45 +00:00
setCameraAt(a->_pos.x, a->_pos.y);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
}
_doEffect = true;
CHECK_HEAP;
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::initRoomSubBlocks() {
replaced all use of scale items with scale slots. This allowed me to get rid of two big FIXME's, and might fix other scaling bugs in FT/DIG svn-id: r10140
2003-09-09 17:29:22 +00:00
int i;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
const byte *ptr;
byte *roomptr, *searchptr, *roomResPtr;
const RoomHeader *rmhd;
_ENCD_offs = 0;
_EXCD_offs = 0;
_CLUT_offs = 0;
_PALS_offs = 0;
nukeResource(rtMatrix, 1);
nukeResource(rtMatrix, 2);
got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables svn-id: r11953
2003-12-26 23:11:35 +00:00
for (i = 1; i < res.num[rtScaleTable]; i++)
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
nukeResource(rtScaleTable, i);
memset(_localScriptList, 0, sizeof(_localScriptList));
memset(_extraBoxFlags, 0, sizeof(_extraBoxFlags));
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
// Determine the room and room script base address
roomResPtr = roomptr = getResourceAddress(rtRoom, _roomResource);
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version == 8)
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
roomResPtr = getResourceAddress(rtRoomScripts, _roomResource);
added some asserts; added a hack that helps the COMI demo svn-id: r6684
2003-03-04 02:43:43 +00:00
if (!roomptr || !roomResPtr)
error("Room %d: data not found (" __FILE__ ":%d)", _roomResource, __LINE__);
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
Change zak room color remapping, so it work correctly after load/save in room with remapped colors. svn-id: r9905
2003-08-29 06:46:12 +00:00
// Reset room color for V1 zak
if (_version == 1)
_roomPalette[0] = 0;
fixed my box size hack svn-id: r6999
2003-04-13 01:51:24 +00:00
//
// Determine the room dimensions (width/height)
//
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
if (_features & GF_OLD_BUNDLE)
const as const can! svn-id: r8058
2003-05-28 20:01:47 +00:00
rmhd = (const RoomHeader *)(roomptr + 4);
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
else
const as const can! svn-id: r8058
2003-05-28 20:01:47 +00:00
rmhd = (const RoomHeader *)findResourceData(MKID('RMHD'), roomptr);
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version == 1) {
added v1 gfx codec, (not working) svn-id: r8329
2003-06-05 17:22:15 +00:00
_roomWidth = roomptr[4] * 8;
_roomHeight = roomptr[5] * 8;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
} else if (_version == 8) {
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive) svn-id: r7423
2003-05-10 21:49:59 +00:00
_roomWidth = READ_LE_UINT32(&(rmhd->v8.width));
_roomHeight = READ_LE_UINT32(&(rmhd->v8.height));
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
} else if (_version == 7) {
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive) svn-id: r7423
2003-05-10 21:49:59 +00:00
_roomWidth = READ_LE_UINT16(&(rmhd->v7.width));
_roomHeight = READ_LE_UINT16(&(rmhd->v7.height));
Fixed struct RoomHeader for v7 implementation svn-id: r3650
2002-03-05 20:13:47 +00:00
} else {
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive) svn-id: r7423
2003-05-10 21:49:59 +00:00
_roomWidth = READ_LE_UINT16(&(rmhd->old.width));
_roomHeight = READ_LE_UINT16(&(rmhd->old.height));
Fixed struct RoomHeader for v7 implementation svn-id: r3650
2002-03-05 20:13:47 +00:00
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
//
// Find the room image data
//
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version == 1) {
added v1 gfx codec, (not working) svn-id: r8329
2003-06-05 17:22:15 +00:00
_IM00_offs = 0;
follow our coding conventions svn-id: r8377
2003-06-07 00:49:36 +00:00
for (i = 0; i < 4; i++){
cleanup svn-id: r8341
2003-06-06 00:16:34 +00:00
gdi._C64Colors[i] = roomptr[6 + i];
}
fixed almost object drawing for v1 games, (ugly hack for drawBitmap) svn-id: r8345
2003-06-06 05:27:45 +00:00
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 10), gdi._C64CharMap, 2048);
added v1 gfx codec, (not working) svn-id: r8329
2003-06-05 17:22:15 +00:00
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 12), gdi._C64PicMap, roomptr[4] * roomptr[5]);
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 14), gdi._C64ColorMap, roomptr[4] * roomptr[5]);
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 16), gdi._C64MaskMap, roomptr[4] * roomptr[5]);
fixed gdi._C64MaskChar decoding svn-id: r8973
2003-07-13 11:40:19 +00:00
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 18) + 2, gdi._C64MaskChar, READ_LE_UINT16(roomptr + READ_LE_UINT16(roomptr + 18)));
fixed almost object drawing for v1 games, (ugly hack for drawBitmap) svn-id: r8345
2003-06-06 05:27:45 +00:00
gdi._C64ObjectMode = true;
added v1 gfx codec, (not working) svn-id: r8329
2003-06-05 17:22:15 +00:00
} else if (_features & GF_OLD_BUNDLE) {
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
_IM00_offs = READ_LE_UINT16(roomptr + 0x0A);
oops svn-id: r8472
2003-06-14 13:26:11 +00:00
if (_version == 2)
restricted check to V2, stupid mistake svn-id: r8323
2003-06-05 10:33:13 +00:00
_roomStrips = gdi.generateStripTable(roomptr + _IM00_offs, _roomWidth, _roomHeight, _roomStrips);
added getOBIMFromObject and getObjectImage methods; changed code to use those svn-id: r8651
2003-06-26 01:46:41 +00:00
} else if (_version == 8) {
_IM00_offs = getObjectImage(roomptr, 1) - roomptr;
} else if (_features & GF_SMALL_HEADER) {
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
_IM00_offs = findResourceData(MKID('IM00'), roomptr) - roomptr;
added getOBIMFromObject and getObjectImage methods; changed code to use those svn-id: r8651
2003-06-26 01:46:41 +00:00
} else {
_IM00_offs = findResource(MKID('IM00'), findResource(MKID('RMIM'), roomptr)) - roomptr;
}
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
//
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
// Look for an exit script
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
//
make it possible to override dump length in Scumm::dumpResource; fix V2 entry script offset (I believe); fix exit script dumping for GF_OLD_BUNDLE games svn-id: r7176
2003-04-28 13:16:16 +00:00
int EXCD_len = -1;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 2) {
changes for v2 resources svn-id: r7053
2003-04-21 11:19:56 +00:00
_EXCD_offs = READ_LE_UINT16(roomptr + 0x18);
make it possible to override dump length in Scumm::dumpResource; fix V2 entry script offset (I believe); fix exit script dumping for GF_OLD_BUNDLE games svn-id: r7176
2003-04-28 13:16:16 +00:00
EXCD_len = READ_LE_UINT16(roomptr + 0x1A) - _EXCD_offs + _resourceHeaderSize; // HACK
} else if (_features & GF_OLD_BUNDLE) {
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
_EXCD_offs = READ_LE_UINT16(roomptr + 0x19);
make it possible to override dump length in Scumm::dumpResource; fix V2 entry script offset (I believe); fix exit script dumping for GF_OLD_BUNDLE games svn-id: r7176
2003-04-28 13:16:16 +00:00
EXCD_len = READ_LE_UINT16(roomptr + 0x1B) - _EXCD_offs + _resourceHeaderSize; // HACK
} else {
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
ptr = findResourceData(MKID('EXCD'), roomResPtr);
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
if (ptr)
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
_EXCD_offs = ptr - roomResPtr;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
if (_dumpScripts && _EXCD_offs)
make it possible to override dump length in Scumm::dumpResource; fix V2 entry script offset (I believe); fix exit script dumping for GF_OLD_BUNDLE games svn-id: r7176
2003-04-28 13:16:16 +00:00
dumpResource("exit-", _roomResource, roomResPtr + _EXCD_offs - _resourceHeaderSize, EXCD_len);
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
//
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
// Look for an entry script
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
//
hack to fix entry script dumping in GF_OLD_BUNDLE (post V2) games svn-id: r7178
2003-04-28 13:35:36 +00:00
int ENCD_len = -1;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 2) {
make it possible to override dump length in Scumm::dumpResource; fix V2 entry script offset (I believe); fix exit script dumping for GF_OLD_BUNDLE games svn-id: r7176
2003-04-28 13:16:16 +00:00
_ENCD_offs = READ_LE_UINT16(roomptr + 0x1A);
fixed V2 entry script dumping svn-id: r7799
2003-05-21 18:53:00 +00:00
ENCD_len = READ_LE_UINT16(roomptr) - _ENCD_offs + _resourceHeaderSize; // HACK
hack to fix entry script dumping in GF_OLD_BUNDLE (post V2) games svn-id: r7178
2003-04-28 13:35:36 +00:00
} else if (_features & GF_OLD_BUNDLE) {
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
_ENCD_offs = READ_LE_UINT16(roomptr + 0x1B);
hack to fix entry script dumping in GF_OLD_BUNDLE (post V2) games svn-id: r7178
2003-04-28 13:35:36 +00:00
// FIXME - the following is a hack which assumes that immediately after
// the entry script the first local script follows.
int num_objects = *(roomResPtr + 20);
int num_sounds = *(roomResPtr + 23);
int num_scripts = *(roomResPtr + 24);
ptr = roomptr + 29 + num_objects * 4 + num_sounds + num_scripts;
fixed V2 entry script dumping svn-id: r7799
2003-05-21 18:53:00 +00:00
ENCD_len = READ_LE_UINT16(ptr + 1) - _ENCD_offs + _resourceHeaderSize; // HACK
hack to fix entry script dumping in GF_OLD_BUNDLE (post V2) games svn-id: r7178
2003-04-28 13:35:36 +00:00
} else {
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
ptr = findResourceData(MKID('ENCD'), roomResPtr);
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
if (ptr)
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
_ENCD_offs = ptr - roomResPtr;
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
if (_dumpScripts && _ENCD_offs)
hack to fix entry script dumping in GF_OLD_BUNDLE (post V2) games svn-id: r7178
2003-04-28 13:35:36 +00:00
dumpResource("entry-", _roomResource, roomResPtr + _ENCD_offs - _resourceHeaderSize, ENCD_len);
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too svn-id: r6985
2003-04-12 12:03:55 +00:00
//
// Load box data
//
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
if (_features & GF_SMALL_HEADER) {
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 2)
changes for v2 resources svn-id: r7053
2003-04-21 11:19:56 +00:00
ptr = roomptr + *(roomptr + 0x15);
arrgh (revert) svn-id: r7058
2003-04-21 13:19:19 +00:00
else if (_features & GF_OLD_BUNDLE)
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
ptr = roomptr + READ_LE_UINT16(roomptr + 0x15);
else
ptr = findResourceData(MKID('BOXD'), roomptr);
Further LFL additions. Zak256 plays bits of its intro, and LoomCD partially runs (may need to hit escape a few times, after selecting your difficulty). Still very incomplete and in progress. svn-id: r3568
2002-02-12 21:28:07 +00:00
if (ptr) {
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
byte numOfBoxes = *ptr;
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
int size;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 2)
implemented v2 walkboxes (at least the debugger output looks right now, though I might have overlooked something) svn-id: r7406
2003-05-09 21:46:34 +00:00
size = numOfBoxes * SIZEOF_BOX_V2 + 1;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
else if (_version == 3)
implemented v2 walkboxes (at least the debugger output looks right now, though I might have overlooked something) svn-id: r7406
2003-05-09 21:46:34 +00:00
size = numOfBoxes * SIZEOF_BOX_V3 + 1;
Zak/Indy box matrix fix. Still doesn't quite work :/ svn-id: r3684
2002-03-08 08:27:45 +00:00
else
size = numOfBoxes * SIZEOF_BOX + 1;
Further LFL additions. Zak256 plays bits of its intro, and LoomCD partially runs (may need to hit escape a few times, after selecting your difficulty). Still very incomplete and in progress. svn-id: r3568
2002-02-12 21:28:07 +00:00
createResource(rtMatrix, 2, size);
memcpy(getResourceAddress(rtMatrix, 2), ptr, size);
ptr += size;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 2) {
V2 walkbox matrix fixes svn-id: r7657
2003-05-19 00:17:34 +00:00
size = numOfBoxes * (numOfBoxes + 1);
} else if (_features & GF_OLD_BUNDLE)
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
// FIXME. This is an evil HACK!!!
fixed my box size hack svn-id: r6999
2003-04-13 01:51:24 +00:00
size = (READ_LE_UINT16(roomptr + 0x0A) - READ_LE_UINT16(roomptr + 0x15)) - size;
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
else
size = getResourceDataSize(ptr - size - 6) - size;
Very very big hack to kind-of make zak256 and indy3 capable of walking. Please, for the love of god, someone fix this. :) svn-id: r3628
2002-02-25 17:29:51 +00:00
Fix for bug #770690 and bug #774783 svn-id: r9110
2003-07-21 21:59:07 +00:00
if (size > 0) { // do this :)
Fixed the indy3 logo svn-id: r3622
2002-02-22 16:59:24 +00:00
createResource(rtMatrix, 1, size);
memcpy(getResourceAddress(rtMatrix, 1), ptr, size);
}
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
Further LFL additions. Zak256 plays bits of its intro, and LoomCD partially runs (may need to hit escape a few times, after selecting your difficulty). Still very incomplete and in progress. svn-id: r3568
2002-02-12 21:28:07 +00:00
}
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
} else {
ptr = findResourceData(MKID('BOXD'), roomptr);
if (ptr) {
int size = getResourceDataSize(ptr);
Further LFL additions. Zak256 plays bits of its intro, and LoomCD partially runs (may need to hit escape a few times, after selecting your difficulty). Still very incomplete and in progress. svn-id: r3568
2002-02-12 21:28:07 +00:00
createResource(rtMatrix, 2, size);
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
roomptr = getResourceAddress(rtRoom, _roomResource);
ptr = findResourceData(MKID('BOXD'), roomptr);
memcpy(getResourceAddress(rtMatrix, 2), ptr, size);
}
ptr = findResourceData(MKID('BOXM'), roomptr);
if (ptr) {
int size = getResourceDataSize(ptr);
createResource(rtMatrix, 1, size);
roomptr = getResourceAddress(rtRoom, _roomResource);
ptr = findResourceData(MKID('BOXM'), roomptr);
memcpy(getResourceAddress(rtMatrix, 1), ptr, size);
}
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
fixed (?) local script offests for OLD_BUNDLE games svn-id: r6990
2003-04-12 17:59:24 +00:00
//
typo/cleanup svn-id: r7174
2003-04-28 12:36:21 +00:00
// Load scale data
fixed (?) local script offests for OLD_BUNDLE games svn-id: r6990
2003-04-12 17:59:24 +00:00
//
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
if (_features & GF_OLD_BUNDLE)
replaced all use of scale items with scale slots. This allowed me to get rid of two big FIXME's, and might fix other scaling bugs in FT/DIG svn-id: r10140
2003-09-09 17:29:22 +00:00
ptr = 0;
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
else
ptr = findResourceData(MKID('SCAL'), roomptr);
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
if (ptr) {
code transformation on setScaleItem: this shows that rtScaleTable's are actually (almost) the same as scale slots in V8. svn-id: r8719
2003-07-03 01:24:50 +00:00
int s1, s2, y1, y2;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version == 8) {
got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables svn-id: r11953
2003-12-26 23:11:35 +00:00
for (i = 1; i < res.num[rtScaleTable]; i++, ptr += 16) {
replaced all use of scale items with scale slots. This allowed me to get rid of two big FIXME's, and might fix other scaling bugs in FT/DIG svn-id: r10140
2003-09-09 17:29:22 +00:00
s1 = READ_LE_UINT32(ptr);
y1 = READ_LE_UINT32(ptr + 4);
s2 = READ_LE_UINT32(ptr + 8);
y2 = READ_LE_UINT32(ptr + 12);
code transformation on setScaleItem: this shows that rtScaleTable's are actually (almost) the same as scale slots in V8. svn-id: r8719
2003-07-03 01:24:50 +00:00
setScaleSlot(i, 0, y1, s1, 0, y2, s2);
changed lots of stuff to read data in the V8 format; more changes still needed, and one open problem: V8 IMHD has no obj_id, we need to work around that somehow, not yet sure what the correct way is (two find out, we either need to get into a state where this actually matters, so that we can do trial & error, or we need a disassmbly) svn-id: r6094
2002-12-24 04:02:21 +00:00
}
} else {
got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables svn-id: r11953
2003-12-26 23:11:35 +00:00
for (i = 1; i < res.num[rtScaleTable]; i++, ptr += 8) {
replaced all use of scale items with scale slots. This allowed me to get rid of two big FIXME's, and might fix other scaling bugs in FT/DIG svn-id: r10140
2003-09-09 17:29:22 +00:00
s1 = READ_LE_UINT16(ptr);
y1 = READ_LE_UINT16(ptr + 2);
s2 = READ_LE_UINT16(ptr + 4);
y2 = READ_LE_UINT16(ptr + 6);
code transformation on setScaleItem: this shows that rtScaleTable's are actually (almost) the same as scale slots in V8. svn-id: r8719
2003-07-03 01:24:50 +00:00
if (s1 || y1 || s2 || y2) {
replaced all use of scale items with scale slots. This allowed me to get rid of two big FIXME's, and might fix other scaling bugs in FT/DIG svn-id: r10140
2003-09-09 17:29:22 +00:00
setScaleSlot(i, 0, y1, s1, 0, y2, s2);
changed lots of stuff to read data in the V8 format; more changes still needed, and one open problem: V8 IMHD has no obj_id, we need to work around that somehow, not yet sure what the correct way is (two find out, we either need to get into a state where this actually matters, so that we can do trial & error, or we need a disassmbly) svn-id: r6094
2002-12-24 04:02:21 +00:00
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
}
}
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
//
fixed (?) local script offests for OLD_BUNDLE games svn-id: r6990
2003-04-12 17:59:24 +00:00
// Setup local scripts
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
//
very simple full throttle support, use the FULL_THROTTLE define. (will fix later) modified some actor parts to work better with full throttle (most likely new bugs because of that). directions are now stored as angles instead of left/right/up/down implemented loadFlObject (flobjects are currently saved in the savestate, will fix that also) svn-id: r3505
2001-11-26 19:57:57 +00:00
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
// Determine the room script base address
roomResPtr = roomptr = getResourceAddress(rtRoom, _roomResource);
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version == 8)
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
roomResPtr = getResourceAddress(rtRoomScripts, _roomResource);
searchptr = roomResPtr;
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
if (_features & GF_OLD_BUNDLE) {
fixed setting local scripts for unblocked games svn-id: r6980
2003-04-12 07:06:19 +00:00
int num_objects = *(roomResPtr + 20);
changes for v2 resources svn-id: r7053
2003-04-21 11:19:56 +00:00
int num_sounds;
int num_scripts;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version <= 2) {
changes for v2 resources svn-id: r7053
2003-04-21 11:19:56 +00:00
num_sounds = *(roomResPtr + 22);
num_scripts = *(roomResPtr + 23);
ptr = roomptr + 28 + num_objects * 4;
while (num_sounds--)
loadResource(rtSound, *ptr++);
while (num_scripts--)
loadResource(rtScript, *ptr++);
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
} else if (_version == 3) {
changes for v2 resources svn-id: r7053
2003-04-21 11:19:56 +00:00
num_sounds = *(roomResPtr + 23);
num_scripts = *(roomResPtr + 24);
ptr = roomptr + 29 + num_objects * 4 + num_sounds + num_scripts;
fixed (?) local script offests for OLD_BUNDLE games svn-id: r6990
2003-04-12 17:59:24 +00:00
while (*ptr) {
int id = *ptr;
fixed setting local scripts for unblocked games svn-id: r6980
2003-04-12 07:06:19 +00:00
fixed (?) local script offests for OLD_BUNDLE games svn-id: r6990
2003-04-12 17:59:24 +00:00
_localScriptList[id - _numGlobalScripts] = READ_LE_UINT16(ptr + 1);
ptr += 3;
cleanup svn-id: r8408
2003-06-09 01:06:29 +00:00
dump local resources in OLD_BUNDLE games, too (requires some hackery) svn-id: r7179
2003-04-28 13:59:57 +00:00
if (_dumpScripts) {
char buf[32];
sprintf(buf, "room-%d-", _roomResource);
// HACK: to determine the sizes of the local scripts, we assume that
// a) their order in the data file is the same as in the index
// b) the last script at the same time is the last item in the room "header"
fixed two offsets for V2 and two warnings svn-id: r7185
2003-04-28 18:19:48 +00:00
int len = - (int)_localScriptList[id - _numGlobalScripts] + _resourceHeaderSize;
dump local resources in OLD_BUNDLE games, too (requires some hackery) svn-id: r7179
2003-04-28 13:59:57 +00:00
if (*ptr)
len += READ_LE_UINT16(ptr + 1);
else
len += READ_LE_UINT16(roomResPtr);
dumpResource(buf, id, roomResPtr + _localScriptList[id - _numGlobalScripts] - _resourceHeaderSize, len);
}
fixed setting local scripts for unblocked games svn-id: r6980
2003-04-12 07:06:19 +00:00
}
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
}
} else if (_features & GF_SMALL_HEADER) {
added ResourceIterator, replacing two of the old findResource/findResourceSmall function - contraty to those, this approach is thread safe svn-id: r8650
2003-06-26 00:47:39 +00:00
ResourceIterator localScriptIterator(searchptr, true);
while ((ptr = localScriptIterator.findNext(MKID('LSCR'))) != NULL) {
Apply some patches by syke to prevent buffer overruns, etc. svn-id: r3723
2002-03-10 17:33:04 +00:00
int id = 0;
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
ptr += _resourceHeaderSize; /* skip tag & size */
fixed script dumping for small header games (by MadMoose) svn-id: r4390
2002-06-01 21:39:57 +00:00
id = ptr[0];
get rid of DUMP_SCRIPTS; in its place, added run time option '-u' to enabled script dumping svn-id: r6284
2002-12-31 02:09:57 +00:00
if (_dumpScripts) {
Further LFL additions. Zak256 plays bits of its intro, and LoomCD partially runs (may need to hit escape a few times, after selecting your difficulty). Still very incomplete and in progress. svn-id: r3568
2002-02-12 21:28:07 +00:00
char buf[32];
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
sprintf(buf, "room-%d-", _roomResource);
dump local resources in OLD_BUNDLE games, too (requires some hackery) svn-id: r7179
2003-04-28 13:59:57 +00:00
dumpResource(buf, id, ptr - _resourceHeaderSize);
get rid of DUMP_SCRIPTS; in its place, added run time option '-u' to enabled script dumping svn-id: r6284
2002-12-31 02:09:57 +00:00
}
Further LFL additions. Zak256 plays bits of its intro, and LoomCD partially runs (may need to hit escape a few times, after selecting your difficulty). Still very incomplete and in progress. svn-id: r3568
2002-02-12 21:28:07 +00:00
_localScriptList[id - _numGlobalScripts] = ptr + 1 - roomptr;
}
} else {
added ResourceIterator, replacing two of the old findResource/findResourceSmall function - contraty to those, this approach is thread safe svn-id: r8650
2003-06-26 00:47:39 +00:00
ResourceIterator localScriptIterator(searchptr, false);
while ((ptr = localScriptIterator.findNext(MKID('LSCR'))) != NULL) {
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
int id = 0;
ptr += _resourceHeaderSize; /* skip tag & size */
better full throttle support, a couple of MI2 fixes. svn-id: r3532
2001-12-27 17:51:58 +00:00
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version == 8) {
changed lots of stuff to read data in the V8 format; more changes still needed, and one open problem: V8 IMHD has no obj_id, we need to work around that somehow, not yet sure what the correct way is (two find out, we either need to get into a state where this actually matters, so that we can do trial & error, or we need a disassmbly) svn-id: r6094
2002-12-24 04:02:21 +00:00
id = READ_LE_UINT32(ptr);
checkRange(NUM_LOCALSCRIPT + _numGlobalScripts, _numGlobalScripts, id, "Invalid local script %d");
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
_localScriptList[id - _numGlobalScripts] = ptr + 4 - roomResPtr;
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
} else if (_version == 7) {
Final part of V7 merging process. The FULL_THROTTLE define is not required any more svn-id: r3660
2002-03-06 00:18:22 +00:00
id = READ_LE_UINT16(ptr);
Use correct LocalScript range for check svn-id: r5160
2002-10-16 05:42:31 +00:00
checkRange(NUM_LOCALSCRIPT + _numGlobalScripts, _numGlobalScripts, id, "Invalid local script %d");
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
_localScriptList[id - _numGlobalScripts] = ptr + 2 - roomResPtr;
Final part of V7 merging process. The FULL_THROTTLE define is not required any more svn-id: r3660
2002-03-06 00:18:22 +00:00
} else {
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
id = ptr[0];
enabled room & local scripts in V8; some more opcodes svn-id: r6105
2002-12-24 23:26:37 +00:00
_localScriptList[id - _numGlobalScripts] = ptr + 1 - roomResPtr;
Final part of V7 merging process. The FULL_THROTTLE define is not required any more svn-id: r3660
2002-03-06 00:18:22 +00:00
}
get rid of DUMP_SCRIPTS; in its place, added run time option '-u' to enabled script dumping svn-id: r6284
2002-12-31 02:09:57 +00:00
if (_dumpScripts) {
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
char buf[32];
sprintf(buf, "room-%d-", _roomResource);
dump local resources in OLD_BUNDLE games, too (requires some hackery) svn-id: r7179
2003-04-28 13:59:57 +00:00
dumpResource(buf, id, ptr - _resourceHeaderSize);
get rid of DUMP_SCRIPTS; in its place, added run time option '-u' to enabled script dumping svn-id: r6284
2002-12-31 02:09:57 +00:00
}
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
}
}
Further LFL additions. Zak256 plays bits of its intro, and LoomCD partially runs (may need to hit escape a few times, after selecting your difficulty). Still very incomplete and in progress. svn-id: r3568
2002-02-12 21:28:07 +00:00
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
if (_features & GF_OLD_BUNDLE)
ptr = 0; // TODO ? do 16 bit games use a palette?!?
else if (_features & GF_SMALL_HEADER)
Further LFL additions. Zak256 plays bits of its intro, and LoomCD partially runs (may need to hit escape a few times, after selecting your difficulty). Still very incomplete and in progress. svn-id: r3568
2002-02-12 21:28:07 +00:00
ptr = findResourceSmall(MKID('CLUT'), roomptr);
else
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
ptr = findResourceData(MKID('CLUT'), roomptr);
Further LFL additions. Zak256 plays bits of its intro, and LoomCD partially runs (may need to hit escape a few times, after selecting your difficulty). Still very incomplete and in progress. svn-id: r3568
2002-02-12 21:28:07 +00:00
preliminary DOTT support svn-id: r3433
2001-10-16 10:01:48 +00:00
if (ptr) {
_CLUT_offs = ptr - roomptr;
setPaletteFromRes();
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
if (_version >= 6) {
very simple full throttle support, use the FULL_THROTTLE define. (will fix later) modified some actor parts to work better with full throttle (most likely new bugs because of that). directions are now stored as angles instead of left/right/up/down implemented loadFlObject (flobjects are currently saved in the savestate, will fix that also) svn-id: r3505
2001-11-26 19:57:57 +00:00
ptr = findResource(MKID('PALS'), roomptr);
recompile not needed when switching games debugger skeleton implemented svn-id: r3442
2001-10-23 19:51:50 +00:00
if (ptr) {
_PALS_offs = ptr - roomptr;
setPalette(0);
}
preliminary DOTT support svn-id: r3433
2001-10-16 10:01:48 +00:00
}
First part of Yazoo and mines work on making older scumm games work. Not enough here to actually work yet, just the base groundwork needed. svn-id: r3567
2002-02-12 18:20:37 +00:00
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
// Color cycling
Minor cleanup of color cycle resource loading svn-id: r9949
2003-09-01 06:11:41 +00:00
if (_version >= 4) {
if (_features & GF_SMALL_HEADER)
Fix for bug [770687] MI1: palette effect missing Added support for CC resources in small-header games. Right now this is enabled for monkeyvga only. loomcd has CC resources but they don't make any sense, and the game doesn't use palette effects anyway. svn-id: r9899
2003-08-29 03:35:15 +00:00
ptr = findResourceSmall (MKID('CYCL'), roomptr);
Minor cleanup of color cycle resource loading svn-id: r9949
2003-09-01 06:11:41 +00:00
else
ptr = findResourceData(MKID('CYCL'), roomptr);
if (ptr) {
initCycl(ptr);
}
Fix for bug [770687] MI1: palette effect missing Added support for CC resources in small-header games. Right now this is enabled for monkeyvga only. loomcd has CC resources but they don't make any sense, and the game doesn't use palette effects anyway. svn-id: r9899
2003-08-29 03:35:15 +00:00
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
// Transparent color
if (_features & GF_OLD_BUNDLE)
gdi._transparentColor = 255; // TODO - FIXME
else {
ptr = findResourceData(MKID('TRNS'), roomptr);
if (ptr)
gdi._transparentColor = ptr[0];
replaced GF_AFTER with _version svn-id: r8372
2003-06-07 00:13:26 +00:00
else if (_version == 8)
lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-) svn-id: r6977
2003-04-12 02:09:00 +00:00
gdi._transparentColor = 5; // FIXME
else
gdi._transparentColor = 255;
}
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive) svn-id: r7423
2003-05-10 21:49:59 +00:00
initBGBuffers(_roomHeight);
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::pauseGame() {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
pauseDialog();
Initial revision svn-id: r3408
2001-10-09 14:30:12 +00:00
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::shutDown() {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_quit = true;
added V8 scaling code svn-id: r6440
2003-01-13 01:29:45 +00:00
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::restart() {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// TODO: Check this function - we should probably be reinitting a lot more stuff, and I suspect
// this leaks memory like a sieve
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
int i;
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// Reset some stuff
_currentRoom = 0;
_currentScript = 0xFF;
killAllScriptsExceptCurrent();
setShake(0);
_sound->stopAllSounds();
Clean up debugger Restart function and move to SCUMM restart function svn-id: r8263
2003-06-02 05:38:45 +00:00
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
// Clear the script variables
for (i = 0; i < 255; i++)
Clean up debugger Restart function and move to SCUMM restart function svn-id: r8263
2003-06-02 05:38:45 +00:00
_scummVars[i] = 0;
// Empty inventory
cleanup svn-id: r11425
2003-11-29 14:36:55 +00:00
for (i = 0; i < _numGlobalObjects; i++)
Clean up debugger Restart function and move to SCUMM restart function svn-id: r8263
2003-06-02 05:38:45 +00:00
clearOwnerOf(i);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// Reinit things
allocateArrays(); // Reallocate arrays
readIndexFile(); // Reread index (reset objectstate etc)
Reset more for a restart and avoid some code duplication. svn-id: r13022
2004-02-24 10:52:40 +00:00
scummInit(); // Reinit scumm variables
got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables svn-id: r11953
2003-12-26 23:11:35 +00:00
if (_imuse) {
_imuse->setBase(res.address[rtSound]);
}
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_sound->setupSound(); // Reinit sound engine
patch #625603 film noir mode bugfix svn-id: r5190
2002-10-19 22:35:22 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// Re-run bootscript
Reset more for a restart and avoid some code duplication. svn-id: r13022
2004-02-24 10:52:40 +00:00
int args[16];
memset(args, 0, sizeof(args));
args[0] = _bootParam;
Add hack for demo script in maniac (Enchanced) svn-id: r13174
2004-03-04 03:08:42 +00:00
if (_gameId == GID_MANIAC && _demoMode)
Reset more for a restart and avoid some code duplication. svn-id: r13022
2004-02-24 10:52:40 +00:00
runScript(9, 0, 0, args);
else
runScript(1, 0, 0, args);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
new video engine (expect broken non-sdl builds), simon the sorcerer 1 & 2 support (non SCUMM games) svn-id: r3912
2002-04-12 21:26:59 +00:00
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::startManiac() {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
warning("stub startManiac()");
rename displayError() to displayMessage(); fix slightly incorrect usage of that method svn-id: r13402
2004-03-28 13:28:44 +00:00
displayMessage(0, "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory.");
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
noir mode refinement by eriktorbjorn svn-id: r4661
2002-07-28 01:40:24 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#pragma mark -
#pragma mark --- GUI ---
#pragma mark -
Patch #591581 to fix #558711. Please check SMALL_HEADER games to make sure this doesn't cause any sideeffects. svn-id: r4718
2002-08-08 11:14:45 +00:00
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
int ScummEngine::runDialog(Dialog &dialog) {
Fix pause mode during video/smush playback svn-id: r11899
2003-12-25 02:55:00 +00:00
// Pause sound & video
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
bool old_soundsPaused = _sound->_soundsPaused;
_sound->pauseSounds(true);
Fix pause mode during video/smush playback svn-id: r11899
2003-12-25 02:55:00 +00:00
bool oldSmushPaused = _smushPaused;
_smushPaused = true;
Patch #591581 to fix #558711. Please check SMALL_HEADER games to make sure this doesn't cause any sideeffects. svn-id: r4718
2002-08-08 11:14:45 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// Open & run the dialog
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
int result = dialog.runModal();
Patch #591581 to fix #558711. Please check SMALL_HEADER games to make sure this doesn't cause any sideeffects. svn-id: r4718
2002-08-08 11:14:45 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// Restore old cursor
updateCursor();
patch #625603 film noir mode bugfix svn-id: r5190
2002-10-19 22:35:22 +00:00
Fix pause mode during video/smush playback svn-id: r11899
2003-12-25 02:55:00 +00:00
// Resume sound & video
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
_sound->pauseSounds(old_soundsPaused);
Fix pause mode during video/smush playback svn-id: r11899
2003-12-25 02:55:00 +00:00
_smushPaused = oldSmushPaused;
new video engine (expect broken non-sdl builds), simon the sorcerer 1 & 2 support (non SCUMM games) svn-id: r3912
2002-04-12 21:26:59 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// Return the result
return result;
new video engine (expect broken non-sdl builds), simon the sorcerer 1 & 2 support (non SCUMM games) svn-id: r3912
2002-04-12 21:26:59 +00:00
}
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::pauseDialog() {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (!_pauseDialog)
turned NewGui into a singleton, and made OSystem a pseudo-singleton; added Widget::findWidget (preparing to add support for nested widgets, for the tab widget) svn-id: r11045
2003-11-02 02:18:16 +00:00
_pauseDialog = new PauseDialog(this);
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
runDialog(*_pauseDialog);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
added quit event svn-id: r8398
2003-06-08 12:11:14 +00:00
remade the in-game GUI/menu svn-id: r11119
2003-11-03 23:26:13 +00:00
void ScummEngine::mainMenuDialog() {
if (!_mainMenuDialog)
_mainMenuDialog = new MainMenuDialog(this);
runDialog(*_mainMenuDialog);
Completly change the way the Scumm object is handled. Now the main execution loop is done INSIDE the Scumm object. Low level system access (like delays, cd tracks,...) are called using the _system object. Changed the insane main loop to use _system calls svn-id: r3795
2002-03-21 00:40:18 +00:00
}
Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever.... svn-id: r3802
2002-03-23 20:34:47 +00:00
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::optionsDialog() {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (!_optionsDialog)
patch #858731 to work around MSVC6 compiler bugs svn-id: r11616
2003-12-13 17:10:47 +00:00
_optionsDialog = new ConfigDialog(this);
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
runDialog(*_optionsDialog);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever.... svn-id: r3802
2002-03-23 20:34:47 +00:00
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::confirmexitDialog() {
Let's spell it out: c-o-d-e r-e-u-s-e :-) svn-id: r11640
2003-12-14 20:36:37 +00:00
ConfirmDialog confirmExitDialog(this, "Do you really want to quit (y/n)?");
Patch #715991: Quit Confirmation Dialog (feature request #642721) with some tweaks by me svn-id: r9210
2003-07-28 01:36:16 +00:00
Let's spell it out: c-o-d-e r-e-u-s-e :-) svn-id: r11640
2003-12-14 20:36:37 +00:00
if (runDialog(confirmExitDialog)) {
Patch #715991: Quit Confirmation Dialog (feature request #642721) with some tweaks by me svn-id: r9210
2003-07-28 01:36:16 +00:00
_quit = true;
}
}
Always confirm restart svn-id: r11635
2003-12-14 15:04:05 +00:00
void ScummEngine::confirmrestartDialog() {
Let's spell it out: c-o-d-e r-e-u-s-e :-) svn-id: r11640
2003-12-14 20:36:37 +00:00
ConfirmDialog confirmRestartDialog(this, "Do you really want to restart (y/n)?");
Always confirm restart svn-id: r11635
2003-12-14 15:04:05 +00:00
Let's spell it out: c-o-d-e r-e-u-s-e :-) svn-id: r11640
2003-12-14 20:36:37 +00:00
if (runDialog(confirmRestartDialog)) {
Always confirm restart svn-id: r11635
2003-12-14 15:04:05 +00:00
restart();
}
}
rename displayError() to displayMessage(); fix slightly incorrect usage of that method svn-id: r13402
2004-03-28 13:28:44 +00:00
char ScummEngine::displayMessage(const char *altButton, const char *message, ...) {
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
#ifdef __PALM_OS__
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
char buf[256]; // 1024 is too big overflow the stack
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
#else
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
char buf[1024];
PalmOS changes svn-id: r7224
2003-04-30 13:23:31 +00:00
#endif
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
va_list va;
and more cleanup svn-id: r6718
2003-03-06 17:58:13 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
va_start(va, message);
Use vsprintf instead of vsnprintf: more portable, less safe (but then again, vsnprinft isn't that safe either) svn-id: r13434
2004-03-30 22:56:57 +00:00
vsprintf(buf, message, va);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
va_end(va);
Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever.... svn-id: r3802
2002-03-23 20:34:47 +00:00
Fix for bug #882083 (COMI: CD change cancel button) svn-id: r12744
2004-02-05 22:39:13 +00:00
GUI::MessageDialog dialog(buf, "OK", altButton);
cleanup svn-id: r10169
2003-09-11 10:32:15 +00:00
return runDialog(dialog);
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
cleanup svn-id: r6262
2002-12-29 19:54:11 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#pragma mark -
#pragma mark --- Miscellaneous ---
#pragma mark -
Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever.... svn-id: r3802
2002-03-23 20:34:47 +00:00
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
int SJIStoFMTChunk(int f, int s) //convert sjis code to fmt font offset
{
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
enum {
KANA = 0,
KANJI = 1,
EKANJI = 2
};
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
int base = s - (s % 32) - 1;
int c = 0, p = 0, chunk_f = 0, chunk = 0, cr, kanjiType = KANA;
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if (f >= 0x81 && f <= 0x84) kanjiType = KANA;
if (f >= 0x88 && f <= 0x9f) kanjiType = KANJI;
if (f >= 0xe0 && f <= 0xea) kanjiType = EKANJI;
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if ((f > 0xe8 || (f == 0xe8 && base >= 0x9f)) || (f > 0x90 || (f == 0x90 && base >= 0x9f))) {
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
c = 48; //correction
p = -8; //correction
}
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if (kanjiType == KANA) {//Kana
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
chunk_f = (f - 0x81) * 2;
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
} else if (kanjiType == KANJI) {//Standard Kanji
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
p += f - 0x88;
chunk_f = c + 2 * p;
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
} else if (kanjiType == EKANJI) {//Enhanced Kanji
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
p += f - 0xe0;
chunk_f = c + 2 * p;
}
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if (base == 0x7f && s == 0x7f)
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
base -= 0x20; //correction
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if ((base == 0x7f && s == 0x9e) || (base == 0x9f && s == 0xbe) || (base == 0xbf && s == 0xde))
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
base += 0x20; //correction
switch(base) {
case 0x3f:
cr = 0; //3f
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if (kanjiType == KANA) chunk = 1;
else if (kanjiType == KANJI) chunk = 31;
else if (kanjiType == EKANJI) chunk = 111;
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
break;
case 0x5f:
cr = 0; //5f
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if (kanjiType == KANA) chunk = 17;
else if (kanjiType == KANJI) chunk = 47;
else if (kanjiType == EKANJI) chunk = 127;
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
break;
case 0x7f:
cr = -1; //80
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if (kanjiType == KANA) chunk = 9;
else if (kanjiType == KANJI) chunk = 63;
else if (kanjiType == EKANJI) chunk = 143;
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
break;
case 0x9f:
cr = 1; //9e
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if (kanjiType == KANA) chunk = 2;
else if (kanjiType == KANJI) chunk = 32;
else if (kanjiType == EKANJI) chunk = 112;
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
break;
case 0xbf:
cr = 1; //be
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if (kanjiType == KANA) chunk = 18;
else if (kanjiType == KANJI) chunk = 48;
else if (kanjiType == EKANJI) chunk = 128;
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
break;
case 0xdf:
cr = 1; //de
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-11-11 00:40:35 +00:00
if (kanjiType == KANA) chunk = 10;
else if (kanjiType == KANJI) chunk = 64;
else if (kanjiType == EKANJI) chunk = 144;
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
break;
default:
return 0;
}
return ((chunk_f + chunk) * 32 + (s - base)) + cr;
}
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
byte *ScummEngine::get2byteCharPtr(int idx) {
Patch #820010: Support Kanji version svn-id: r11020
2003-11-01 15:19:30 +00:00
switch(_language) {
case Common::KO_KOR:
idx = ((idx % 256) - 0xb0) * 94 + (idx / 256) - 0xa1;
break;
case Common::JA_JPN:
idx = SJIStoFMTChunk((idx % 256), (idx / 256));
break;
case Common::ZH_TWN:
default:
idx = 0;
}
return _2byteFontPtr + ((_2byteWidth + 7) / 8) * _2byteHeight * idx;
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
Fix Indy4 bootparam, some more Zak256 work, and a few minor things. svn-id: r3887
2002-04-07 04:29:15 +00:00
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
const char *ScummEngine::getGameDataPath() const {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#ifdef MACOSX
fix OSX COMI cd changing hack svn-id: r12583
2004-01-24 18:20:21 +00:00
if (_version == 8 && !memcmp(_gameDataPath.c_str(), "/Volumes/MONKEY3_", 17)) {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// Special case for COMI on Mac OS X. The mount points on OS X depend
// on the volume name. Hence if playing from CD, we'd get a problem.
// So if loading of a resource file fails, we fall back to the (fixed)
// CD mount points (/Volumes/MONKEY3_1 and /Volumes/MONKEY3_2).
//
// The check for whether we play from CD or not is very hackish, though.
static char buf[256];
struct stat st;
int disk = (_scummVars && _scummVars[VAR_CURRENTDISK] == 2) ? 2 : 1;
sprintf(buf, "/Volumes/MONKEY3_%d", disk);
if (!stat(buf, &st)) {
return buf;
}
// Apparently that disk is not inserted. However since many data files
// (fonts, comi.la0) are on both disks, we also try the other CD.
disk = (disk == 1) ? 2 : 1;
sprintf(buf, "/Volumes/MONKEY3_%d", disk);
return buf;
Fix Indy4 bootparam, some more Zak256 work, and a few minor things. svn-id: r3887
2002-04-07 04:29:15 +00:00
}
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#endif
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
some cleanup svn-id: r10720
2003-10-10 13:55:08 +00:00
return _gameDataPath.c_str();
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever.... svn-id: r3802
2002-03-23 20:34:47 +00:00
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-10-02 22:42:03 +00:00
void ScummEngine::errorString(const char *buf1, char *buf2) {
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
if (_currentScript != 0xFF) {
ScriptSlot *ss = &vm.slot[_currentScript];
sprintf(buf2, "(%d:%d:0x%X): %s", _roomResource,
ss->number, _scriptPointer - _scriptOrgPointer, buf1);
} else {
strcpy(buf2, buf1);
}
Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever.... svn-id: r3802
2002-03-23 20:34:47 +00:00
Fix for #775275 : debugger support on WinCE svn-id: r9114
2003-07-21 22:30:15 +00:00
#ifdef _WIN32_WCE
if (isSmartphone())
return;
#endif
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
// Unless an error -originated- within the debugger, spawn the debugger. Otherwise
// exit out normally.
Don't segfault-on-exit when the game data files are missing. svn-id: r12422
2004-01-16 07:33:23 +00:00
if (_debugger && !_debugger->isAttached()) {
cleanup svn-id: r10764
2003-10-12 17:49:52 +00:00
printf("%s\n", buf2); // (Print it again in case debugger segfaults)
_debugger->attach(buf2);
_debugger->onFrame();
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
}
Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever.... svn-id: r3802
2002-03-23 20:34:47 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
#pragma mark -
#pragma mark --- Utilities ---
#pragma mark -
void checkRange(int max, int min, int no, const char *str) {
if (no < min || no > max) {
#ifdef __PALM_OS__
char buf[256]; // 1024 is too big overflow the stack
#else
char buf[1024];
#endif
sprintf(buf, str, no);
error("Value %d is out of bounds (%d,%d) (%s)", no, min, max, buf);
more v2 var fixes svn-id: r7396
2003-05-08 21:02:46 +00:00
}
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
}
Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever.... svn-id: r3802
2002-03-23 20:34:47 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
/**
* Convert an old style direction to a new style one (angle),
*/
int newDirToOldDir(int dir) {
if (dir >= 71 && dir <= 109)
return 1;
if (dir >= 109 && dir <= 251)
return 2;
if (dir >= 251 && dir <= 289)
return 0;
return 3;
}
Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever.... svn-id: r3802
2002-03-23 20:34:47 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
/**
* Convert an new style (angle) direction to an old style one.
*/
int oldDirToNewDir(int dir) {
assert(0 <= dir && dir <= 3);
const int new_dir_table[4] = { 270, 90, 180, 0 };
return new_dir_table[dir];
}
Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever.... svn-id: r3802
2002-03-23 20:34:47 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
/**
* Convert an angle to a simple direction.
*/
int toSimpleDir(int dirType, int dir) {
if (dirType) {
const int16 directions[] = { 22, 72, 107, 157, 202, 252, 287, 337 };
for (int i = 0; i < 7; i++)
if (dir >= directions[i] && dir <= directions[i+1])
return i+1;
} else {
const int16 directions[] = { 71, 109, 251, 289 };
for (int i = 0; i < 3; i++)
if (dir >= directions[i] && dir <= directions[i+1])
return i+1;
cleaned up the restart/pause/shutdown situation a bit; added comment that explains how restart might be implemented svn-id: r8260
2003-06-02 02:25:24 +00:00
}
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
return 0;
new video engine (expect broken non-sdl builds), simon the sorcerer 1 & 2 support (non SCUMM games) svn-id: r3912
2002-04-12 21:26:59 +00:00
}
Large pointless reindentation of all the code. Also fixed a few mistakes in the object flags code cleanup. Flags used: indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader -TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer svn-id: r3908
2002-04-11 17:19:16 +00:00
moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical svn-id: r9083
2003-07-19 18:18:01 +00:00
/**
* Convert a simple direction to an angle.
*/
int fromSimpleDir(int dirType, int dir) {
if (dirType)
return dir * 45;
else
return dir * 90;
}
/**
* Normalize the given angle - that means, ensure it is positive, and
* change it to the closest multiple of 45 degree by abusing toSimpleDir.
*/
int normalizeAngle(int angle) {
int temp;
temp = (angle + 360) % 360;
return toSimpleDir(1, temp) * 45;
code cleanup - prepares for simon inclusion svn-id: r3910
2002-04-12 10:34:46 +00:00
}
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
added tag2str helper function svn-id: r10866
2003-10-17 16:28:29 +00:00
const char *tag2str(uint32 tag) {
static char str[5];
str[0] = (char)(tag >> 24);
str[1] = (char)(tag >> 16);
str[2] = (char)(tag >> 8);
str[3] = (char)tag;
str[4] = '\0';
return str;
}
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
} // End of namespace Scumm
using namespace Scumm;
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
GameList Engine_SCUMM_gameList() {
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
const ScummGameSettings *g = scumm_settings;
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
GameList games;
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
while (g->name) {
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
games.push_back(g->toGameSettings());
g++;
}
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
return games;
}
Make it possible for game detection functions to detect language/platform (not yet done by any detector, but will come with the MD5 detection code) svn-id: r11811
2003-12-21 15:29:52 +00:00
DetectedGameList Engine_SCUMM_detectGames(const FSList &fslist) {
DetectedGameList detectedGames;
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
const ScummGameSettings *g;
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
char detectName[128];
char detectName2[128];
Make use of the MD5-based game detection in the launcher svn-id: r12766
2004-02-07 17:12:10 +00:00
typedef Common::Map<Common::String, bool> StringSet;
StringSet fileSet;
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
for (g = scumm_settings; g->name; ++g) {
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
// Determine the 'detectname' for this game, that is, the name of a
// file that *must* be presented if the directory contains the data
// for this game. For example, FOA requires atlantis.000
get rid of ScummGameSettings::detectname svn-id: r11023
2003-11-01 16:25:25 +00:00
if (g->version <= 3) {
strcpy(detectName, "00.LFL");
detectName2[0] = '\0';
} else if (g->version == 4) {
strcpy(detectName, "000.LFL");
detectName2[0] = '\0';
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
} else {
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
const char *base = g->baseFilename ? g->baseFilename : g->name;
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
strcpy(detectName, base);
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
strcat(detectName, ".000");
game targets can now have a base filename different from the target name; misc tweaks svn-id: r11417
2003-11-28 22:29:56 +00:00
strcpy(detectName2, base);
cleanup svn-id: r11022
2003-11-01 16:03:13 +00:00
if (g->features & GF_HUMONGOUS) {
strcat(detectName2, ".he0");
} else if (g->version >= 7) {
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
strcat(detectName2, ".la0");
} else
strcat(detectName2, ".sm0");
}
// Iterate over all files in the given directory
renamed (Const)Iterator to (const_)iterator; changed size() to return an uint svn-id: r12722
2004-02-05 00:19:57 +00:00
for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
const char *name = file->displayName().c_str();
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
if ((0 == scumm_stricmp(detectName, name)) ||
(0 == scumm_stricmp(detectName2, name))) {
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
// Match found, add to list of candidates, then abort inner loop.
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
detectedGames.push_back(g->toGameSettings());
Make use of the MD5-based game detection in the launcher svn-id: r12766
2004-02-07 17:12:10 +00:00
fileSet.addKey(file->path());
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
break;
}
}
}
Make use of the MD5-based game detection in the launcher svn-id: r12766
2004-02-07 17:12:10 +00:00
// Now, we check the MD5 sums of the 'candidate' files. If we have an exact match,
// only return that.
bool exactMatch = false;
for (StringSet::const_iterator iter = fileSet.begin(); iter != fileSet.end(); ++iter) {
uint8 md5sum[16];
const char *name = iter->_key.c_str();
if (md5_file(name, md5sum)) {
char md5str[32+1];
for (int j = 0; j < 16; j++) {
sprintf(md5str + j*2, "%02x", (int)md5sum[j]);
}
const MD5Table *elem;
elem = (const MD5Table *)bsearch(md5str, md5table, ARRAYSIZE(md5table)-1, sizeof(MD5Table), compareMD5Table);
if (elem) {
if (!exactMatch)
detectedGames.clear(); // Clear all the non-exact candidates
// Find the GameSettings for that target
for (g = scumm_settings; g->name; ++g) {
if (0 == scumm_stricmp(g->name, elem->target))
break;
}
assert(g->name);
// Insert the 'enhanced' game data into the candidate list
detectedGames.push_back(DetectedGame(g->toGameSettings(), elem->language, elem->platform));
exactMatch = true;
}
}
}
moved game detection code out to the plugins svn-id: r10882
2003-10-17 23:16:53 +00:00
return detectedGames;
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
}
Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
Engine *engine;
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
const ScummGameSettings *g = scumm_settings;
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
while (g->name) {
if (!scumm_stricmp(detector->_game.name, g->name))
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
break;
g++;
}
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-13 00:20:01 +00:00
if (!g->name)
error("Invalid game '%s'\n", detector->_game.name);
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
ScummGameSettings game = *g;
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
if (ConfMan.hasKey("amiga")) {
warning("Configuration key 'amiga' is deprecated. Use 'platform=amiga' instead");
if (ConfMan.getBool("amiga"))
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
game.features |= GF_AMIGA;
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
}
moved platform/language constants to common/util.* svn-id: r10862
2003-10-17 15:35:46 +00:00
switch (Common::parsePlatform(ConfMan.get("platform"))) {
oops, forgot to remove the old Platform enum svn-id: r10863
2003-10-17 15:38:56 +00:00
case Common::kPlatformAmiga:
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
game.features |= GF_AMIGA;
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
break;
oops, forgot to remove the old Platform enum svn-id: r10863
2003-10-17 15:38:56 +00:00
case Common::kPlatformAtariST:
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
game.features |= GF_ATARI_ST;
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
break;
oops, forgot to remove the old Platform enum svn-id: r10863
2003-10-17 15:38:56 +00:00
case Common::kPlatformMacintosh:
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
game.features |= GF_MACINTOSH;
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
break;
Make use of GF_WINDOWS in HE games svn-id: r13129
2004-03-02 01:01:36 +00:00
case Common::kPlatformWindows:
game.features |= GF_WINDOWS;
break;
Make use of the MD5-based game detection in the launcher svn-id: r12766
2004-02-07 17:12:10 +00:00
case Common::kPlatformFMTowns:
if (game.version == 3) {
// The V5 FM-TOWNS games are mostly identical to the PC versions, it seems?
game.features |= GF_FMTOWNS;
game.midi = MDT_TOWNS;
}
break;
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
default:
Ooops svn-id: r11351
2003-11-20 04:27:46 +00:00
if (!(game.features & GF_FMTOWNS))
game.features |= GF_PC;
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-08 21:59:23 +00:00
break;
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
}
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
switch (game.version) {
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
case 1:
case 2:
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
engine = new ScummEngine_v2(detector, syst, game);
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
break;
case 3:
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
engine = new ScummEngine_v3(detector, syst, game);
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
break;
case 4:
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
engine = new ScummEngine_v4(detector, syst, game);
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
break;
case 5:
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
engine = new ScummEngine_v5(detector, syst, game);
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
break;
case 6:
Started work on Freddi Fish. Since it is SPU version 7, added new class. Implemented some SPUv7 specific opcodes svn-id: r13108
2004-03-01 05:57:30 +00:00
if (game.features & GF_HUMONGOUS) {
// TODO: probably use another variable with version number
640x480 games not supported on PalmOS svn-id: r13145
2004-03-02 13:09:35 +00:00
#ifndef __PALM_OS__
Started work on Freddi Fish. Since it is SPU version 7, added new class. Implemented some SPUv7 specific opcodes svn-id: r13108
2004-03-01 05:57:30 +00:00
if (game.features & GF_AFTER_HEV7)
engine = new ScummEngine_v7he(detector, syst, game);
else
640x480 games not supported on PalmOS svn-id: r13145
2004-03-02 13:09:35 +00:00
#endif
Started work on Freddi Fish. Since it is SPU version 7, added new class. Implemented some SPUv7 specific opcodes svn-id: r13108
2004-03-01 05:57:30 +00:00
engine = new ScummEngine_v6he(detector, syst, game);
} else {
Add separate class for Humongous Entertainment games. svn-id: r12752
2004-02-07 02:23:24 +00:00
engine = new ScummEngine_v6(detector, syst, game);
Started work on Freddi Fish. Since it is SPU version 7, added new class. Implemented some SPUv7 specific opcodes svn-id: r13108
2004-03-01 05:57:30 +00:00
}
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
break;
case 7:
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
engine = new ScummEngine_v7(detector, syst, game);
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
break;
640x480 games not supported on PalmOS svn-id: r13145
2004-03-02 13:09:35 +00:00
#ifndef __PALM_OS__
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
case 8:
cleanup: removed version/id from GameSettings svn-id: r10995
2003-10-28 17:07:25 +00:00
engine = new ScummEngine_v8(detector, syst, game);
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
break;
640x480 games not supported on PalmOS svn-id: r13145
2004-03-02 13:09:35 +00:00
#endif
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly svn-id: r10571
2003-10-03 18:33:57 +00:00
default:
error("Engine_SCUMM_create(): Unknown version of game engine");
}
return engine;
}
Patch #847464: Remove spurious semicolons svn-id: r11445
2003-12-01 09:58:55 +00:00
REGISTER_PLUGIN("Scumm Engine", Engine_SCUMM_gameList, Engine_SCUMM_create, Engine_SCUMM_detectGames)
Reference in New Issue Copy Permalink