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

code cleanup - prepares for simon inclusion

Browse source 
svn-id: r3910
This commit is contained in:
Ludvig Strigeus 2002-04-12 10:34:46 +00:00
parent 6e508eed29
commit 3a4fa636ee
9 changed files with 244 additions and 878 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akos.h
View file

@ -20,10 +20,15 @@
* *
*/ */
#if !defined(__GNUC__) #if !defined(__GNUC__)
#pragma START_PACK_STRUCTS #pragma START_PACK_STRUCTS
#endif #endif
struct AkosHeader { struct AkosHeader {
byte x_1[2]; byte x_1[2];
byte flags; byte flags;

44
gameDetector.cpp
View file

@ -26,24 +26,27 @@
#include "gameDetector.h" #include "gameDetector.h"
#define USAGE_STRING "ScummVM - Scumm Interpreter\n" \
"Syntax:\n" \ static const char USAGE_STRING[] =
"\tscummvm [-v] [-d] [-n] [-b<num>] [-t<num>] [-s<num>] [-p<path>] [-m<num>] [-f] game\n" \ "ScummVM - Scumm Interpreter\n"
"Flags:\n" \ "Syntax:\n"
"\tv - show version info and exit\n" \ "\tscummvm [-v] [-d] [-n] [-b<num>] [-t<num>] [-s<num>] [-p<path>] [-m<num>] [-f] game\n"
"\tc<num> - use cdrom <num> for cd audio\n" \ "Flags:\n"
"\td - enable debug output\n" \ "\tv - show version info and exit\n"
"\tn - no subtitles for speech\n" \ "\tc<num> - use cdrom <num> for cd audio\n"
"\tb<num> - start in room <num>\n" \ "\td - enable debug output\n"
"\tt<num> - set music tempo. Suggested: 1F0000\n" \ "\tn - no subtitles for speech\n"
"\ts<num> - set scale factor to <num> (1, 2, or 3 - 2 by default)\n" \ "\tb<num> - start in room <num>\n"
"\tp<path> - look for game in <path>\n" \ "\tt<num> - set music tempo. Suggested: 1F0000\n"
"\tm<num> - set music volume to <num> (0-100)\n" \ "\ts<num> - set scale factor to <num> (1, 2, or 3 - 2 by default)\n"
"\te<num> - set music engine. see readme.txt for details\n" \ "\tp<path> - look for game in <path>\n"
"\tr - emulate roland mt32 instruments\n" \ "\tm<num> - set music volume to <num> (0-100)\n"
"\tf - fullscreen mode\n" \ "\te<num> - set music engine. see readme.txt for details\n"
"\tg - graphics mode. 1 for 2xSai anti-aliasing\n" \ "\tr - emulate roland mt32 instruments\n"
"\ta - load autosave game (for recovering from crashes)\n" "\tf - fullscreen mode\n"
"\tg - graphics mode. 1 for 2xSai anti-aliasing\n"
"\ta - load autosave game (for recovering from crashes)\n"
;
void GameDetector::parseCommandLine(int argc, char **argv) void GameDetector::parseCommandLine(int argc, char **argv)
{ {
@ -233,6 +236,11 @@ static const VersionSettings version_settings[] = {
{"dig", "The Dig", GID_DIG, 7, 5, 0, {"dig", "The Dig", GID_DIG, 7, 5, 0,
GF_NEW_OPCODES | GF_AFTER_V6 | GF_AFTER_V7}, GF_NEW_OPCODES | GF_AFTER_V6 | GF_AFTER_V7},
/* Simon the Sorcerer 1 & 2 (not SCUMM games) */
{"simon1dos", "Simon the Sorcerer 1 for DOS", GID_SIMON_FIRST+1, 99, 99, 99, 0},
{"simon1win", "Simon the Sorcerer 1 for Windows", GID_SIMON_FIRST+2, 99, 99, 99, 0},
{"simon2win", "Simon the Sorcerer 2 for Windows", GID_SIMON_FIRST+3, 99, 99, 99, 0},
/* Scumm Version 8 */ /* Scumm Version 8 */
// {"curse", "The Curse of Monkey Island", GID_CMI, 8, 1, 0,}, // {"curse", "The Curse of Monkey Island", GID_CMI, 8, 1, 0,},
{NULL, NULL} {NULL, NULL}

12
gameDetector.h
View file

@ -28,9 +28,15 @@ public:
char *getGameName(void); char *getGameName(void);
bool _fullScreen; bool _fullScreen;
bool _restore;
byte _gameId;
bool _simon;
uint16 _debugMode; uint16 _debugMode;
uint16 _noSubtitles; uint16 _noSubtitles;
uint16 _bootParam; uint16 _bootParam;
uint16 _soundCardType;
unsigned int _scale; unsigned int _scale;
char *_gameDataPath; char *_gameDataPath;
int _gameTempo; int _gameTempo;
@ -38,13 +44,11 @@ public:
int _midi_driver; int _midi_driver;
int _videoMode; int _videoMode;
char *_exe_name; char *_exe_name;
byte _gameId;
const char *_gameText; const char *_gameText;
uint32 _features; uint32 _features;
uint16 _soundCardType;
int _scummVersion; int _scummVersion;
int _cdrom; int _cdrom;
bool _restore;
}; };

33
gui.cpp
View file

@ -807,36 +807,15 @@ void Gui::addLetter(byte letter)
} }
} }
byte Gui::getDefaultColor(int color)
{
if ((_s->_features & GF_AFTER_V7) || (_s->_features & GF_SMALL_HEADER))
return 0;
if (_s->_features & GF_AFTER_V6) {
if (color == 8)
color = 1;
return _s->readArray(110, 0, color);
} else {
return _s->getStringAddress(21)[color];
}
}
void Gui::init(Scumm *s) void Gui::init(Scumm *s)
{ {
/* Default GUI colors */
_bgcolor = 0;
_color = 0;
_textcolor = 8; // 15 is nice
_textcolorhi = 15;
_shadowcolor = 0;
_s = s; _s = s;
if (_s->_gameId && !(_s->_features & GF_SMALL_HEADER)
&& !(_s->_features & GF_AFTER_V7)) {
_bgcolor = getDefaultColor(0);
_color = getDefaultColor(1);
_textcolor = getDefaultColor(2);
_textcolorhi = getDefaultColor(6);
_shadowcolor = getDefaultColor(8);
} else {
_bgcolor = 0;
_color = 0;
_textcolor = 8; // 15 is nice
_textcolorhi = 15;
_shadowcolor = 0;
}
} }
void Gui::loop(Scumm *s) void Gui::loop(Scumm *s)

1
object.cpp
View file

@ -49,7 +49,6 @@ void Scumm::putClass(int obj, int cls, bool set)
cls = 24; cls = 24;
} }
if (set) if (set)
_classData[obj] |= (1 << (cls - 1)); _classData[obj] |= (1 << (cls - 1));
else else

69
scumm.h
View file

@ -35,7 +35,7 @@
/* Initialized operator new */ /* Initialized operator new */
void * operator new(size_t size); void * operator new(size_t size);
class GameDetector;
class Scumm; class Scumm;
struct Actor; struct Actor;
struct ScummDebugger; struct ScummDebugger;
@ -43,6 +43,9 @@ struct Serializer;
typedef void (Scumm::*OpcodeProc)(); typedef void (Scumm::*OpcodeProc)();
/* Use this one from error() ONLY */
extern Scumm *g_scumm;
/* System Wide Constants */ /* System Wide Constants */
enum { enum {
SAMPLES_PER_SEC = 22050, SAMPLES_PER_SEC = 22050,
@ -502,7 +505,11 @@ enum GameId {
GID_INDY3_256 = 9, GID_INDY3_256 = 9,
GID_LOOM = 10, GID_LOOM = 10,
GID_FT = 11, GID_FT = 11,
GID_DIG = 12 GID_DIG = 12,
/* Simon the Sorcerer */
GID_SIMON_FIRST = 13,
GID_SIMON_LAST = GID_SIMON_FIRST+3,
}; };
enum GameFeatures { enum GameFeatures {
@ -1056,40 +1063,30 @@ public:
void stopTalk(); void stopTalk();
/* Akos Class */ /* Akos Class */
bool akos_drawCostume(AkosRenderer *ar); bool akos_drawCostume(AkosRenderer *ar);
void akos_setPalette(AkosRenderer *ar, byte *palette); void akos_setPalette(AkosRenderer *ar, byte *palette);
void akos_setCostume(AkosRenderer *ar, int costume); void akos_setCostume(AkosRenderer *ar, int costume);
void akos_setFacing(AkosRenderer *ar, Actor *a); void akos_setFacing(AkosRenderer *ar, Actor *a);
bool akos_drawCostumeChannel(AkosRenderer *ar, int chan); bool akos_drawCostumeChannel(AkosRenderer *ar, int chan);
void akos_codec1(AkosRenderer *ar); void akos_codec1(AkosRenderer *ar);
void akos_codec5(AkosRenderer *ar); void akos_codec5(AkosRenderer *ar);
void akos_codec16(AkosRenderer *ar); void akos_codec16(AkosRenderer *ar);
void akos_codec1_ignorePakCols(AkosRenderer *ar, int num); void akos_codec1_ignorePakCols(AkosRenderer *ar, int num);
void akos_c1_spec2(AkosRenderer *ar); void akos_c1_spec2(AkosRenderer *ar);
void akos_c1_spec3(AkosRenderer *ar); void akos_c1_spec3(AkosRenderer *ar);
void akos_c1_0_decode(AkosRenderer *ar); bool akos_increaseAnims(byte *akos, Actor *a);
void akos_c1_12_decode(AkosRenderer *ar); bool akos_increaseAnim(Actor *a, int i, byte *aksq, uint16 *akfo, int numakfo);
void akos_c1_12y_decode(AkosRenderer *ar);
void akos_c1_3_decode(AkosRenderer *ar);
void akos_c1_4_decode(AkosRenderer *ar);
void akos_c1_4y_decode(AkosRenderer *ar);
void akos_c1_56_decode(AkosRenderer *ar);
void akos_c1_56y_decode(AkosRenderer *ar);
void akos_c1_7_decode(AkosRenderer *ar);
bool akos_increaseAnims(byte *akos, Actor *a); int getAnimVar(Actor *a, byte var);
bool akos_increaseAnim(Actor *a, int i, byte *aksq, uint16 *akfo, int numakfo); void setAnimVar(Actor *a, byte var, int value);
int getAnimVar(Actor *a, byte var); void akos_queCommand(byte cmd, Actor *a, int param_1, int param_2);
void setAnimVar(Actor *a, byte var, int value); bool akos_compare(int a, int b, byte cmd);
void akos_decodeData(Actor *a, int frame, uint usemask);
void akos_queCommand(byte cmd, Actor *a, int param_1, int param_2); int akos_frameToAnim(Actor *a, int frame);
bool akos_compare(int a, int b, byte cmd); bool akos_hasManyDirections(Actor *a);
void akos_decodeData(Actor *a, int frame, uint usemask); int akos_findManyDirection(int16 ManyDirection, uint16 facing);
int akos_frameToAnim(Actor *a, int frame);
bool akos_hasManyDirections(Actor *a);
int akos_findManyDirection(int16 ManyDirection, uint16 facing);
@ -1676,6 +1673,12 @@ public:
byte VAR_CHARSET_MASK; byte VAR_CHARSET_MASK;
void launch(); void launch();
static Scumm *createFromDetector(GameDetector *detector);
void go();
void setupGUIColors();
byte getDefaultGUIColor(int color);
}; };
class Scumm_v3 : public Scumm class Scumm_v3 : public Scumm

92
scummvm.cpp
View file

@ -24,8 +24,8 @@
#include "scumm.h" #include "scumm.h"
#include "gui.h" #include "gui.h"
#include "string.h" #include "string.h"
#include "gameDetector.h"
extern void launcherLoop();
void Scumm::initRandSeeds() void Scumm::initRandSeeds()
{ {
_randSeed1 = 0xA943DE35; _randSeed1 = 0xA943DE35;
@ -1010,8 +1010,6 @@ int Scumm::normalizeAngle(int angle)
return (angle + 360) % 360; return (angle + 360) % 360;
} }
extern Scumm *scumm;
void NORETURN CDECL error(const char *s, ...) void NORETURN CDECL error(const char *s, ...)
{ {
char buf[1024]; char buf[1024];
@ -1021,12 +1019,12 @@ void NORETURN CDECL error(const char *s, ...)
vsprintf(buf, s, va); vsprintf(buf, s, va);
va_end(va); va_end(va);
if (scumm->_currentScript != 0xFF) { if (g_scumm->_currentScript != 0xFF) {
ScriptSlot *ss = &scumm->vm.slot[scumm->_currentScript]; ScriptSlot *ss = &g_scumm->vm.slot[g_scumm->_currentScript];
fprintf(stderr, "Error(%d:%d:0x%X): %s!\n", fprintf(stderr, "Error(%d:%d:0x%X): %s!\n",
scumm->_roomResource, g_scumm->_roomResource,
ss->number, ss->number,
scumm->_scriptPointer - scumm->_scriptOrgPointer, buf); g_scumm->_scriptPointer - g_scumm->_scriptOrgPointer, buf);
} else { } else {
fprintf(stderr, "Error: %s!\n", buf); fprintf(stderr, "Error: %s!\n", buf);
} }
@ -1145,3 +1143,83 @@ void Scumm::launch()
} }
Scumm *Scumm::createFromDetector(GameDetector *detector)
{
Scumm *scumm;
if (detector->_features & GF_OLD256)
scumm = new Scumm_v3;
else if (detector->_features & GF_SMALL_HEADER) // this force loomCD as v4
scumm = new Scumm_v4;
else if (detector->_features & GF_AFTER_V7)
scumm = new Scumm_v7;
else if (detector->_features & GF_AFTER_V6) // this force SamnmaxCD as v6
scumm = new Scumm_v6;
else
scumm = new Scumm_v5;
scumm->_fullScreen = detector->_fullScreen;
scumm->_debugMode = detector->_debugMode;
scumm->_bootParam = detector->_bootParam;
scumm->_scale = detector->_scale;
scumm->_gameDataPath = detector->_gameDataPath;
scumm->_gameTempo = detector->_gameTempo;
scumm->_soundEngine = detector->_soundEngine;
scumm->_videoMode = detector->_videoMode;
scumm->_exe_name = detector->_exe_name;
scumm->_gameId = detector->_gameId;
scumm->_gameText = detector->_gameText;
scumm->_features = detector->_features;
scumm->_soundCardType = detector->_soundCardType;
scumm->_noSubtitles = detector->_noSubtitles;
scumm->_midi_driver = detector->_midi_driver;
scumm->_cdrom = detector->_cdrom;
scumm->delta = 6;
if (detector->_restore) {
scumm->_saveLoadSlot = 0;
scumm->_saveLoadFlag = 2;
scumm->_saveLoadCompatible = false;
}
scumm->delta = 0;
return scumm;
}
void Scumm::go() {
launch();
setupGUIColors();
mainRun();
}
byte Scumm::getDefaultGUIColor(int color)
{
/* FIXME: strange IF line? */
if ((_features & GF_AFTER_V7) || (_features & GF_SMALL_HEADER))
return 0;
if (_features & GF_AFTER_V6) {
if (color == 8)
color = 1;
return readArray(110, 0, color);
} else {
return getStringAddress(21)[color];
}
}
void Scumm::setupGUIColors() {
Gui *gui = (Gui*)_gui;
/* FIXME: strange IF line? */
if (_gameId && !(_features & GF_SMALL_HEADER) && !(_features & GF_AFTER_V7)) {
gui->_bgcolor = getDefaultGUIColor(0);
gui->_color = getDefaultGUIColor(1);
gui->_textcolor = getDefaultGUIColor(2);
gui->_textcolorhi = getDefaultGUIColor(6);
gui->_shadowcolor = getDefaultGUIColor(8);
}
}

34
scummvm.dsp
View file

@ -154,6 +154,10 @@ SOURCE=.\v4\resource_v4.cpp
# End Group # End Group
# Begin Source File # Begin Source File
SOURCE=.\2xsai.cpp
# End Source File
# Begin Source File
SOURCE=.\actor.cpp SOURCE=.\actor.cpp
!IF "$(CFG)" == "scummvm - Win32 Release" !IF "$(CFG)" == "scummvm - Win32 Release"
@ -439,6 +443,18 @@ SOURCE=.\verbs.cpp
# PROP Default_Filter "h;hpp;hxx;hm;inl" # PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File # Begin Source File
SOURCE=.\akos.h
# End Source File
# Begin Source File
SOURCE=.\boxes.h
# End Source File
# Begin Source File
SOURCE=.\cdmusic.h
# End Source File
# Begin Source File
SOURCE=.\sound\fmopl.h SOURCE=.\sound\fmopl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -447,6 +463,10 @@ SOURCE=.\gameDetector.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\gfx.h
# End Source File
# Begin Source File
SOURCE=.\sound\gmidi.h SOURCE=.\sound\gmidi.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -455,6 +475,10 @@ SOURCE=.\gui.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp3_cd.h
# End Source File
# Begin Source File
SOURCE=.\scumm.h SOURCE=.\scumm.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -463,16 +487,20 @@ SOURCE=.\scummsys.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\smush.h
# End Source File
# Begin Source File
SOURCE=.\sound.h SOURCE=.\sound.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\StdAfx.h SOURCE=.\StdAfx.h
# End Source File # End Source File
# End Group # Begin Source File
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" SOURCE=.\system.h
# End Source File
# End Group # End Group
# Begin Source File # Begin Source File

832
sdl.cpp
View file

@ -33,7 +33,10 @@
static unsigned int scale; static unsigned int scale;
Scumm *scumm; /* FIXME: Global variable names should be prepended with g_
* Only member variables should have a _ in front of the name. */
Scumm *g_scumm;
ScummDebugger debugger; ScummDebugger debugger;
Gui gui; Gui gui;
OSystem _system; OSystem _system;
@ -264,7 +267,7 @@ void setShakePos(Scumm *s, int shake_pos)
int old_shake_pos = current_shake_pos; int old_shake_pos = current_shake_pos;
int dirty_height, dirty_blackheight; int dirty_height, dirty_blackheight;
int dirty_top, dirty_blacktop; int dirty_top, dirty_blacktop;
if (shake_pos != old_shake_pos) { if (shake_pos != old_shake_pos) {
current_shake_pos = shake_pos; current_shake_pos = shake_pos;
fullRedraw = true; fullRedraw = true;
@ -272,19 +275,9 @@ void setShakePos(Scumm *s, int shake_pos)
/* Old shake pos was current_shake_pos, new is shake_pos. /* Old shake pos was current_shake_pos, new is shake_pos.
* Move the screen up or down to account for the change. * Move the screen up or down to account for the change.
*/ */
if (scale == 3) { SDL_Rect dstr = { 0, shake_pos*scale, 320*scale, 200*scale };
SDL_Rect dstr = { 0, shake_pos * 3, 960, 600 }; SDL_Rect srcr = { 0, old_shake_pos*scale, 320*scale, 200*scale };
SDL_Rect srcr = { 0, old_shake_pos * 3, 960, 600 }; SDL_BlitSurface(screen, &srcr, screen, &dstr);
SDL_BlitSurface(screen, &srcr, screen, &dstr);
} else if (scale == 2) {
SDL_Rect dstr = { 0, shake_pos * 2, 640, 400 };
SDL_Rect srcr = { 0, old_shake_pos * 2, 640, 400 };
SDL_BlitSurface(screen, &srcr, screen, &dstr);
} else {
SDL_Rect dstr = { 0, shake_pos, 320, 200 };
SDL_Rect srcr = { 0, old_shake_pos, 320, 200 };
SDL_BlitSurface(screen, &srcr, screen, &dstr);
}
/* Also adjust the mouse pointer backup Y coordinate. /* Also adjust the mouse pointer backup Y coordinate.
* There is a minor mouse glitch when the mouse is moved * There is a minor mouse glitch when the mouse is moved
@ -306,22 +299,10 @@ void setShakePos(Scumm *s, int shake_pos)
} }
/* Fill the dirty area with blackness or the scumm image */ /* Fill the dirty area with blackness or the scumm image */
{ SDL_Rect blackrect = {0, dirty_blacktop*scale, 320*scale, dirty_blackheight*scale};
if (scale == 3) { SDL_FillRect(screen, &blackrect, 0);
SDL_Rect blackrect =
{ 0, dirty_blacktop * 3, 960, dirty_blackheight * 3 };
SDL_FillRect(screen, &blackrect, 0);
} else if (scale == 2) {
SDL_Rect blackrect =
{ 0, dirty_blacktop * 2, 640, dirty_blackheight * 2 };
SDL_FillRect(screen, &blackrect, 0);
} else {
SDL_Rect blackrect = { 0, dirty_blacktop, 320, dirty_blackheight };
SDL_FillRect(screen, &blackrect, 0);
}
s->redrawLines(dirty_top, dirty_top + dirty_height); s->redrawLines(dirty_top, dirty_top + dirty_height);
}
} }
} }
@ -473,7 +454,7 @@ void updateScreen2xSaI(Scumm *s)
updatePalette(s); updatePalette(s);
if (fullRedraw) { if (fullRedraw) {
r.x = 0; r.x = 0;
r.y = 0; r.y = 0;
r.w = 320; r.w = 320;
r.h = 200; r.h = 200;
@ -484,7 +465,6 @@ void updateScreen2xSaI(Scumm *s)
} else if (numDirtyRects) { } else if (numDirtyRects) {
SDL_Rect *dr; SDL_Rect *dr;
int i; int i;
for (i = 0; i < numDirtyRects; i++) { for (i = 0; i < numDirtyRects; i++) {
dr = &dirtyRects[i]; dr = &dirtyRects[i];
Draw2xSaI(dr, s->_videoMode); Draw2xSaI(dr, s->_videoMode);
@ -689,7 +669,7 @@ void drawMouse(Scumm *s, int xdraw, int ydraw, int w, int h, byte *buf,
void fill_sound(void *userdata, Uint8 * stream, int len) void fill_sound(void *userdata, Uint8 * stream, int len)
{ {
scumm->mixWaves((int16 *) stream, len >> 1); g_scumm->mixWaves((int16 *) stream, len >> 1);
} }
static int cd_track, cd_num_loops = 0, cd_start_frame, cd_end_frame; static int cd_track, cd_num_loops = 0, cd_start_frame, cd_end_frame;
@ -703,7 +683,8 @@ void cd_play(Scumm *s, int track, int num_loops, int start_frame,
int end_frame) int end_frame)
{ {
scumm->_vars[14] = 0; /* FIXME: what does this code do? */
g_scumm->_vars[14] = 0;
if (!num_loops && !start_frame) if (!num_loops && !start_frame)
return; return;
@ -856,7 +837,7 @@ void initGraphics(Scumm *s, bool fullScreen, unsigned int scaleFactor)
if (!snd_driv.wave_based()) { if (!snd_driv.wave_based()) {
/* Create Music Thread */ /* Create Music Thread */
SDL_CreateThread((int (*)(void *))&music_thread, &scumm); SDL_CreateThread((int (*)(void *))&music_thread, s);
} }
if (s->_videoMode == VIDEO_SCALE) { if (s->_videoMode == VIDEO_SCALE) {
@ -926,16 +907,16 @@ void launcherLoop()
int delta = 0; int delta = 0;
last_time = SDL_GetTicks(); last_time = SDL_GetTicks();
gui.launcher(scumm); gui.launcher(g_scumm);
do { do {
updateScreen(scumm); updateScreen(g_scumm);
new_time = SDL_GetTicks(); new_time = SDL_GetTicks();
waitForTimer(scumm, delta * 15 + last_time - new_time); waitForTimer(g_scumm, delta * 15 + last_time - new_time);
last_time = SDL_GetTicks(); last_time = SDL_GetTicks();
if (gui._active) { if (gui._active) {
gui.loop(scumm); gui.loop(g_scumm);
delta = 5; delta = 5;
} else } else
error("gui closed!"); error("gui closed!");
@ -979,63 +960,29 @@ int main(int argc, char *argv[])
#endif #endif
if (detector.detectMain(argc, argv)) if (detector.detectMain(argc, argv))
return (-1); return (-1);
if (detector._features & GF_OLD256) /* Simon the Sorcerer? */
scumm = new Scumm_v3; if (detector._gameId >= GID_SIMON_FIRST && detector._gameId <= GID_SIMON_LAST) {
else if (detector._features & GF_SMALL_HEADER) // this force loomCD as v4 /* Simon the Sorcerer. Completely different initialization */
scumm = new Scumm_v4; } else {
else if (detector._features & GF_AFTER_V7) Scumm *scumm = Scumm::createFromDetector(&detector);
scumm = new Scumm_v7; g_scumm = scumm;
else if (detector._features & GF_AFTER_V6) // this force SamnmaxCD as v6
scumm = new Scumm_v6;
else
scumm = new Scumm_v5;
scumm->_fullScreen = detector._fullScreen; sound.initialize(scumm, &snd_driv);
scumm->_debugMode = detector._debugMode;
scumm->_bootParam = detector._bootParam; /* bind to Gui */
scumm->_scale = detector._scale; scumm->_gui = &gui;
scumm->_gameDataPath = detector._gameDataPath; gui.init(scumm); /* Reinit GUI after loading a game */
scumm->_gameTempo = detector._gameTempo;
scumm->_soundEngine = detector._soundEngine;
scumm->_videoMode = detector._videoMode;
scumm->_exe_name = detector._exe_name;
scumm->_gameId = detector._gameId;
scumm->_gameText = detector._gameText;
scumm->_features = detector._features;
scumm->_soundCardType = detector._soundCardType;
scumm->_noSubtitles = detector._noSubtitles;
scumm->_midi_driver = detector._midi_driver;
scumm->_cdrom = detector._cdrom;
scumm->delta = 6; /* Bind to OSystem */
if (detector._restore) { scumm->_system = &_system;
scumm->_saveLoadSlot = 0; _system.last_time = 0;
scumm->_saveLoadFlag = 2;
scumm->_saveLoadCompatible = false; scumm->go();
} }
scumm->_gui = &gui;
// gui.init(scumm);
sound.initialize(scumm, &snd_driv);
scumm->delta = 0;
scumm->_system = &_system;
_system.last_time = 0;
scumm->launch();
// scumm->runScript(1,0,0,&scumm->_bootParam);
// scumm->scummMain(argc, argv); // Todo: need to change that as well
gui.init(scumm); /* Reinit GUI after loading a game */
scumm->mainRun();
return 0; return 0;
} }
@ -1243,12 +1190,15 @@ int gfxPrimitivesCompareInt(const void *a, const void *b)
return (*(const int *)a) - (*(const int *)b); return (*(const int *)a) - (*(const int *)b);
} }
/* FIXME: What's the purpose of this function?
* Functions should start with a small letter.
*/
void BoxTest(int num) void BoxTest(int num)
{ {
BoxCoords box; BoxCoords box;
Sint16 rx1[4], ry1[4]; Sint16 rx1[4], ry1[4];
scumm->getBoxCoordinates(num, &box); g_scumm->getBoxCoordinates(num, &box);
rx1[0] = box.ul.x * 2; rx1[0] = box.ul.x * 2;
ry1[0] = box.ul.y * 2 + 32; ry1[0] = box.ul.y * 2 + 32;
rx1[1] = box.ur.x * 2; rx1[1] = box.ur.x * 2;
@ -1263,711 +1213,23 @@ void BoxTest(int num)
} }
/* FIXME: 2xSAI Functions should be moved to a separate
* source file
*/
/********** 2XSAI Filter *****************/
static uint32 colorMask = 0xF7DEF7DE;
static uint32 lowPixelMask = 0x08210821;
static uint32 qcolorMask = 0xE79CE79C;
static uint32 qlowpixelMask = 0x18631863;
static uint32 redblueMask = 0xF81F;
static uint32 greenMask = 0x7E0;
int Init_2xSaI(uint32 BitFormat)
{
if (BitFormat == 565) {
colorMask = 0xF7DEF7DE;
lowPixelMask = 0x08210821;
qcolorMask = 0xE79CE79C;
qlowpixelMask = 0x18631863;
redblueMask = 0xF81F;
greenMask = 0x7E0;
} else if (BitFormat == 555) {
colorMask = 0x7BDE7BDE;
lowPixelMask = 0x04210421;
qcolorMask = 0x739C739C;
qlowpixelMask = 0x0C630C63;
redblueMask = 0x7C1F;
greenMask = 0x3E0;
} else {
return 0;
}
return 1;
}
static inline int GetResult1(uint32 A, uint32 B, uint32 C, uint32 D,
uint32 /* E */ )
{
int x = 0;
int y = 0;
int r = 0;
if (A == C)
x += 1;
else if (B == C)
y += 1;
if (A == D)
x += 1;
else if (B == D)
y += 1;
if (x <= 1)
r += 1;
if (y <= 1)
r -= 1;
return r;
}
static inline int GetResult2(uint32 A, uint32 B, uint32 C, uint32 D,
uint32 /* E */ )
{
int x = 0;
int y = 0;
int r = 0;
if (A == C)
x += 1;
else if (B == C)
y += 1;
if (A == D)
x += 1;
else if (B == D)
y += 1;
if (x <= 1)
r -= 1;
if (y <= 1)
r += 1;
return r;
}
static inline int GetResult(uint32 A, uint32 B, uint32 C, uint32 D)
{
int x = 0;
int y = 0;
int r = 0;
if (A == C)
x += 1;
else if (B == C)
y += 1;
if (A == D)
x += 1;
else if (B == D)
y += 1;
if (x <= 1)
r += 1;
if (y <= 1)
r -= 1;
return r;
}
static inline uint32 INTERPOLATE(uint32 A, uint32 B)
{
if (A != B) {
return (((A & colorMask) >> 1) + ((B & colorMask) >> 1) +
(A & B & lowPixelMask));
} else
return A;
}
static inline uint32 Q_INTERPOLATE(uint32 A, uint32 B, uint32 C, uint32 D)
{
register uint32 x = ((A & qcolorMask) >> 2) +
((B & qcolorMask) >> 2) +
((C & qcolorMask) >> 2) + ((D & qcolorMask) >> 2);
register uint32 y = (A & qlowpixelMask) +
(B & qlowpixelMask) + (C & qlowpixelMask) + (D & qlowpixelMask);
y = (y >> 2) & qlowpixelMask;
return x + y;
}
#define BLUE_MASK565 0x001F001F
#define RED_MASK565 0xF800F800
#define GREEN_MASK565 0x07E007E0
#define BLUE_MASK555 0x001F001F
#define RED_MASK555 0x7C007C00
#define GREEN_MASK555 0x03E003E0
void Super2xSaI(uint8 *srcPtr, uint32 srcPitch,
uint8 *deltaPtr, uint8 *dstPtr, uint32 dstPitch,
int width, int height)
{
uint16 *bP;
uint8 *dP;
uint32 inc_bP;
{
uint32 Nextline = srcPitch >> 1;
inc_bP = 1;
while (height--) {
bP = (uint16 *)srcPtr;
dP = (uint8 *)dstPtr;
for (uint32 finish = width; finish; finish -= inc_bP) {
uint32 color4, color5, color6;
uint32 color1, color2, color3;
uint32 colorA0, colorA1, colorA2, colorA3,
colorB0, colorB1, colorB2, colorB3, colorS1, colorS2;
uint32 product1a, product1b, product2a, product2b;
//--------------------------------------- B1 B2
// 4 5 6 S2
// 1 2 3 S1
// A1 A2
colorB0 = *(bP - Nextline - 1);
colorB1 = *(bP - Nextline);
colorB2 = *(bP - Nextline + 1);
colorB3 = *(bP - Nextline + 2);
color4 = *(bP - 1);
color5 = *(bP);
color6 = *(bP + 1);
colorS2 = *(bP + 2);
color1 = *(bP + Nextline - 1);
color2 = *(bP + Nextline);
color3 = *(bP + Nextline + 1);
colorS1 = *(bP + Nextline + 2);
colorA0 = *(bP + Nextline + Nextline - 1);
colorA1 = *(bP + Nextline + Nextline);
colorA2 = *(bP + Nextline + Nextline + 1);
colorA3 = *(bP + Nextline + Nextline + 2);
//--------------------------------------
if (color2 == color6 && color5 != color3) {
product2b = product1b = color2;
} else if (color5 == color3 && color2 != color6) {
product2b = product1b = color5;
} else if (color5 == color3 && color2 == color6) {
register int r = 0;
r += GetResult(color6, color5, color1, colorA1);
r += GetResult(color6, color5, color4, colorB1);
r += GetResult(color6, color5, colorA2, colorS1);
r += GetResult(color6, color5, colorB2, colorS2);
if (r > 0)
product2b = product1b = color6;
else if (r < 0)
product2b = product1b = color5;
else {
product2b = product1b = INTERPOLATE(color5, color6);
}
} else {
if (color6 == color3 && color3 == colorA1
&& color2 != colorA2 && color3 != colorA0)
product2b = Q_INTERPOLATE(color3, color3, color3, color2);
else if (color5 == color2 && color2 == colorA2
&& colorA1 != color3 && color2 != colorA3)
product2b = Q_INTERPOLATE(color2, color2, color2, color3);
else
product2b = INTERPOLATE(color2, color3);
if (color6 == color3 && color6 == colorB1
&& color5 != colorB2 && color6 != colorB0)
product1b = Q_INTERPOLATE(color6, color6, color6, color5);
else if (color5 == color2 && color5 == colorB2
&& colorB1 != color6 && color5 != colorB3)
product1b = Q_INTERPOLATE(color6, color5, color5, color5);
else
product1b = INTERPOLATE(color5, color6);
}
if (color5 == color3 && color2 != color6 && color4 == color5
&& color5 != colorA2)
product2a = INTERPOLATE(color2, color5);
else
if (color5 == color1 && color6 == color5
&& color4 != color2 && color5 != colorA0)
product2a = INTERPOLATE(color2, color5);
else
product2a = color2;
if (color2 == color6 && color5 != color3 && color1 == color2
&& color2 != colorB2)
product1a = INTERPOLATE(color2, color5);
else
if (color4 == color2 && color3 == color2
&& color1 != color5 && color2 != colorB0)
product1a = INTERPOLATE(color2, color5);
else
product1a = color5;
product1a = product1a | (product1b << 16);
product2a = product2a | (product2b << 16);
*((uint32 *)dP) = product1a;
*((uint32 *)(dP + dstPitch)) = product2a;
bP += inc_bP;
dP += sizeof(uint32);
} // end of for ( finish= width etc..)
srcPtr += srcPitch;
dstPtr += dstPitch * 2;
deltaPtr += srcPitch;
} // while (height--)
}
}
void SuperEagle(uint8 *srcPtr, uint32 srcPitch, uint8 *deltaPtr,
uint8 *dstPtr, uint32 dstPitch, int width, int height)
{
uint8 *dP;
uint16 *bP;
uint32 inc_bP;
{
inc_bP = 1;
uint32 Nextline = srcPitch >> 1;
while (height--) {
bP = (uint16 *)srcPtr;
dP = dstPtr;
for (uint32 finish = width; finish; finish -= inc_bP) {
uint32 color4, color5, color6;
uint32 color1, color2, color3;
uint32 colorA1, colorA2, colorB1, colorB2, colorS1, colorS2;
uint32 product1a, product1b, product2a, product2b;
colorB1 = *(bP - Nextline);
colorB2 = *(bP - Nextline + 1);
color4 = *(bP - 1);
color5 = *(bP);
color6 = *(bP + 1);
colorS2 = *(bP + 2);
color1 = *(bP + Nextline - 1);
color2 = *(bP + Nextline);
color3 = *(bP + Nextline + 1);
colorS1 = *(bP + Nextline + 2);
colorA1 = *(bP + Nextline + Nextline);
colorA2 = *(bP + Nextline + Nextline + 1);
// --------------------------------------
if (color2 == color6 && color5 != color3) {
product1b = product2a = color2;
if ((color1 == color2) || (color6 == colorB2)) {
product1a = INTERPOLATE(color2, color5);
product1a = INTERPOLATE(color2, product1a);
} else {
product1a = INTERPOLATE(color5, color6);
}
if ((color6 == colorS2) || (color2 == colorA1)) {
product2b = INTERPOLATE(color2, color3);
product2b = INTERPOLATE(color2, product2b);
} else {
product2b = INTERPOLATE(color2, color3);
}
} else if (color5 == color3 && color2 != color6) {
product2b = product1a = color5;
if ((colorB1 == color5) || (color3 == colorS1)) {
product1b = INTERPOLATE(color5, color6);
product1b = INTERPOLATE(color5, product1b);
} else {
product1b = INTERPOLATE(color5, color6);
}
if ((color3 == colorA2) || (color4 == color5)) {
product2a = INTERPOLATE(color5, color2);
product2a = INTERPOLATE(color5, product2a);
} else {
product2a = INTERPOLATE(color2, color3);
}
} else if (color5 == color3 && color2 == color6) {
register int r = 0;
r += GetResult(color6, color5, color1, colorA1);
r += GetResult(color6, color5, color4, colorB1);
r += GetResult(color6, color5, colorA2, colorS1);
r += GetResult(color6, color5, colorB2, colorS2);
if (r > 0) {
product1b = product2a = color2;
product1a = product2b = INTERPOLATE(color5, color6);
} else if (r < 0) {
product2b = product1a = color5;
product1b = product2a = INTERPOLATE(color5, color6);
} else {
product2b = product1a = color5;
product1b = product2a = color2;
}
} else {
product2b = product1a = INTERPOLATE(color2, color6);
product2b = Q_INTERPOLATE(color3, color3, color3, product2b);
product1a = Q_INTERPOLATE(color5, color5, color5, product1a);
product2a = product1b = INTERPOLATE(color5, color3);
product2a = Q_INTERPOLATE(color2, color2, color2, product2a);
product1b = Q_INTERPOLATE(color6, color6, color6, product1b);
}
product1a = product1a | (product1b << 16);
product2a = product2a | (product2b << 16);
*((uint32 *)dP) = product1a;
*((uint32 *)(dP + dstPitch)) = product2a;
bP += inc_bP;
dP += sizeof(uint32);
} // end of for ( finish= width etc..)
srcPtr += srcPitch;
dstPtr += dstPitch * 2;
deltaPtr += srcPitch;
} // endof: while (height--)
}
}
void _2xSaI(uint8 *srcPtr, uint32 srcPitch, uint8 *deltaPtr,
uint8 *dstPtr, uint32 dstPitch, int width, int height)
{
uint8 *dP;
uint16 *bP;
uint32 inc_bP;
{
inc_bP = 1;
uint32 Nextline = srcPitch >> 1;
while (height--) {
bP = (uint16 *)srcPtr;
dP = dstPtr;
for (uint32 finish = width; finish; finish -= inc_bP) {
register uint32 colorA, colorB;
uint32 colorC, colorD,
colorE, colorF, colorG, colorH,
colorI, colorJ, colorK, colorL, colorM, colorN, colorO, colorP;
uint32 product, product1, product2;
//---------------------------------------
// Map of the pixels: I|E F|J
// G|A B|K
// H|C D|L
// M|N O|P
colorI = *(bP - Nextline - 1);
colorE = *(bP - Nextline);
colorF = *(bP - Nextline + 1);
colorJ = *(bP - Nextline + 2);
colorG = *(bP - 1);
colorA = *(bP);
colorB = *(bP + 1);
colorK = *(bP + 2);
colorH = *(bP + Nextline - 1);
colorC = *(bP + Nextline);
colorD = *(bP + Nextline + 1);
colorL = *(bP + Nextline + 2);
colorM = *(bP + Nextline + Nextline - 1);
colorN = *(bP + Nextline + Nextline);
colorO = *(bP + Nextline + Nextline + 1);
colorP = *(bP + Nextline + Nextline + 2);
if ((colorA == colorD) && (colorB != colorC)) {
if (((colorA == colorE) && (colorB == colorL)) ||
((colorA == colorC) && (colorA == colorF)
&& (colorB != colorE) && (colorB == colorJ))) {
product = colorA;
} else {
product = INTERPOLATE(colorA, colorB);
}
if (((colorA == colorG) && (colorC == colorO)) ||
((colorA == colorB) && (colorA == colorH)
&& (colorG != colorC) && (colorC == colorM))) {
product1 = colorA;
} else {
product1 = INTERPOLATE(colorA, colorC);
}
product2 = colorA;
} else if ((colorB == colorC) && (colorA != colorD)) {
if (((colorB == colorF) && (colorA == colorH)) ||
((colorB == colorE) && (colorB == colorD)
&& (colorA != colorF) && (colorA == colorI))) {
product = colorB;
} else {
product = INTERPOLATE(colorA, colorB);
}
if (((colorC == colorH) && (colorA == colorF)) ||
((colorC == colorG) && (colorC == colorD)
&& (colorA != colorH) && (colorA == colorI))) {
product1 = colorC;
} else {
product1 = INTERPOLATE(colorA, colorC);
}
product2 = colorB;
} else if ((colorA == colorD) && (colorB == colorC)) {
if (colorA == colorB) {
product = colorA;
product1 = colorA;
product2 = colorA;
} else {
register int r = 0;
product1 = INTERPOLATE(colorA, colorC);
product = INTERPOLATE(colorA, colorB);
r += GetResult1(colorA, colorB, colorG, colorE, colorI);
r += GetResult2(colorB, colorA, colorK, colorF, colorJ);
r += GetResult2(colorB, colorA, colorH, colorN, colorM);
r += GetResult1(colorA, colorB, colorL, colorO, colorP);
if (r > 0)
product2 = colorA;
else if (r < 0)
product2 = colorB;
else {
product2 = Q_INTERPOLATE(colorA, colorB, colorC, colorD);
}
}
} else {
product2 = Q_INTERPOLATE(colorA, colorB, colorC, colorD);
if ((colorA == colorC) && (colorA == colorF)
&& (colorB != colorE) && (colorB == colorJ)) {
product = colorA;
} else if ((colorB == colorE) && (colorB == colorD)
&& (colorA != colorF) && (colorA == colorI)) {
product = colorB;
} else {
product = INTERPOLATE(colorA, colorB);
}
if ((colorA == colorB) && (colorA == colorH)
&& (colorG != colorC) && (colorC == colorM)) {
product1 = colorA;
} else if ((colorC == colorG) && (colorC == colorD)
&& (colorA != colorH) && (colorA == colorI)) {
product1 = colorC;
} else {
product1 = INTERPOLATE(colorA, colorC);
}
}
product = colorA | (product << 16);
product1 = product1 | (product2 << 16);
*((int32 *) dP) = product;
*((uint32 *)(dP + dstPitch)) = product1;
bP += inc_bP;
dP += sizeof(uint32);
} // end of for ( finish= width etc..)
srcPtr += srcPitch;
dstPtr += dstPitch * 2;
deltaPtr += srcPitch;
} // endof: while (height--)
}
}
static uint32 Bilinear(uint32 A, uint32 B, uint32 x)
{
unsigned long areaA, areaB;
unsigned long result;
if (A == B)
return A;
areaB = (x >> 11) & 0x1f; // reduce 16 bit fraction to 5 bits
areaA = 0x20 - areaB;
A = (A & redblueMask) | ((A & greenMask) << 16);
B = (B & redblueMask) | ((B & greenMask) << 16);
result = ((areaA * A) + (areaB * B)) >> 5;
return (result & redblueMask) | ((result >> 16) & greenMask);
}
static uint32 Bilinear4(uint32 A, uint32 B, uint32 C, uint32 D, uint32 x,
uint32 y)
{
unsigned long areaA, areaB, areaC, areaD;
unsigned long result, xy;
x = (x >> 11) & 0x1f;
y = (y >> 11) & 0x1f;
xy = (x * y) >> 5;
A = (A & redblueMask) | ((A & greenMask) << 16);
B = (B & redblueMask) | ((B & greenMask) << 16);
C = (C & redblueMask) | ((C & greenMask) << 16);
D = (D & redblueMask) | ((D & greenMask) << 16);
areaA = 0x20 + xy - x - y;
areaB = x - xy;
areaC = y - xy;
areaD = xy;
result = ((areaA * A) + (areaB * B) + (areaC * C) + (areaD * D)) >> 5;
return (result & redblueMask) | ((result >> 16) & greenMask);
}
void Scale_2xSaI(uint8 *srcPtr, uint32 srcPitch, uint8 * /* deltaPtr */ ,
uint8 *dstPtr, uint32 dstPitch,
uint32 dstWidth, uint32 dstHeight, int width, int height)
{
uint8 *dP;
uint16 *bP;
uint32 w;
uint32 h;
uint32 dw;
uint32 dh;
uint32 hfinish;
uint32 wfinish;
uint32 Nextline = srcPitch >> 1;
wfinish = (width - 1) << 16; // convert to fixed point
dw = wfinish / (dstWidth - 1);
hfinish = (height - 1) << 16; // convert to fixed point
dh = hfinish / (dstHeight - 1);
for (h = 0; h < hfinish; h += dh) {
uint32 y1, y2;
y1 = h & 0xffff; // fraction part of fixed point
bP = (uint16 *)(srcPtr + ((h >> 16) * srcPitch));
dP = dstPtr;
y2 = 0x10000 - y1;
w = 0;
for (; w < wfinish;) {
uint32 A, B, C, D;
uint32 E, F, G, H;
uint32 I, J, K, L;
uint32 x1, x2, a1, f1, f2;
uint32 position, product1;
position = w >> 16;
A = bP[position]; // current pixel
B = bP[position + 1]; // next pixel
C = bP[position + Nextline];
D = bP[position + Nextline + 1];
E = bP[position - Nextline];
F = bP[position - Nextline + 1];
G = bP[position - 1];
H = bP[position + Nextline - 1];
I = bP[position + 2];
J = bP[position + Nextline + 2];
K = bP[position + Nextline + Nextline];
L = bP[position + Nextline + Nextline + 1];
x1 = w & 0xffff; // fraction part of fixed point
x2 = 0x10000 - x1;
/*0 */
if (A == B && C == D && A == C)
product1 = A;
else
/*1 */
if (A == D && B != C) {
f1 = (x1 >> 1) + (0x10000 >> 2);
f2 = (y1 >> 1) + (0x10000 >> 2);
if (y1 <= f1 && A == J && A != E) // close to B
{
a1 = f1 - y1;
product1 = Bilinear(A, B, a1);
} else if (y1 >= f1 && A == G && A != L) // close to C
{
a1 = y1 - f1;
product1 = Bilinear(A, C, a1);
} else if (x1 >= f2 && A == E && A != J) // close to B
{
a1 = x1 - f2;
product1 = Bilinear(A, B, a1);
} else if (x1 <= f2 && A == L && A != G) // close to C
{
a1 = f2 - x1;
product1 = Bilinear(A, C, a1);
} else if (y1 >= x1) // close to C
{
a1 = y1 - x1;
product1 = Bilinear(A, C, a1);
} else if (y1 <= x1) // close to B
{
a1 = x1 - y1;
product1 = Bilinear(A, B, a1);
}
} else
/*2 */
if (B == C && A != D) {
f1 = (x1 >> 1) + (0x10000 >> 2);
f2 = (y1 >> 1) + (0x10000 >> 2);
if (y2 >= f1 && B == H && B != F) // close to A
{
a1 = y2 - f1;
product1 = Bilinear(B, A, a1);
} else if (y2 <= f1 && B == I && B != K) // close to D
{
a1 = f1 - y2;
product1 = Bilinear(B, D, a1);
} else if (x2 >= f2 && B == F && B != H) // close to A
{
a1 = x2 - f2;
product1 = Bilinear(B, A, a1);
} else if (x2 <= f2 && B == K && B != I) // close to D
{
a1 = f2 - x2;
product1 = Bilinear(B, D, a1);
} else if (y2 >= x1) // close to A
{
a1 = y2 - x1;
product1 = Bilinear(B, A, a1);
} else if (y2 <= x1) // close to D
{
a1 = x1 - y2;
product1 = Bilinear(B, D, a1);
}
}
/*3 */
else {
product1 = Bilinear4(A, B, C, D, x1, y1);
}
//end First Pixel
*(uint32 *)dP = product1;
dP += 2;
w += dw;
}
dstPtr += dstPitch;
}
}
/********* ScummVM call back functions **********/ /********* ScummVM call back functions **********/
int OSystem::waitTick(int delta) int OSystem::waitTick(int delta)
{ {
do { do {
updateScreen(scumm); updateScreen(g_scumm);
new_time = SDL_GetTicks(); new_time = SDL_GetTicks();
waitForTimer(scumm, delta * 15 + last_time - new_time); waitForTimer(g_scumm, delta * 15 + last_time - new_time);
last_time = SDL_GetTicks(); last_time = SDL_GetTicks();
if (gui._active) { if (gui._active) {
gui.loop(scumm); gui.loop(g_scumm);
delta = 5; delta = 5;
} }
} while (gui._active); } while (gui._active);