Fixed a bit the gui for FT and DIG. It still doesn't display a thing but it's not crashing anymore

svn-id: r3828
This commit is contained in:
Vincent Hamm 2002-03-25 12:26:37 +00:00
parent 8a3adc01ee
commit 5ca87c1269
5 changed files with 15 additions and 2 deletions

View file

@ -773,15 +773,17 @@ void Scumm::akos_codec1(AkosRenderer *ar) {
return; return;
case 2: case 2:
// akos_c1_spec2(ar); // akos_c1_spec2(ar);
warning("akos_c1_spec2");
return; return;
case 3: case 3:
// akos_c1_spec3(ar); // akos_c1_spec3(ar);
warning("akos_c1_spec3");
return; return;
} }
akos_generic_decode(ar); akos_generic_decode(ar);
// akos_c1_0y_decode(ar); // akos_c1_0y_decode(ar);
#if 0 #if 0

View file

@ -2509,7 +2509,7 @@ void Scumm::o6_miscOps() {
remapActor(derefActorSafe(args[1], "o6_miscOps:14"), args[2],args[3],args[4],args[5]); remapActor(derefActorSafe(args[1], "o6_miscOps:14"), args[2],args[3],args[4],args[5]);
break; break;
case 15: case 15:
warning("o6_miscOps: stub15(%d)", args[1]); _insaneFlag = args[1];
break; break;
case 16: { case 16: {
byte buf[200]; byte buf[200];

View file

@ -588,6 +588,10 @@ public:
void mainRun(); void mainRun();
int delta; // global time int delta; // global time
/* _insane vars */
int _insaneFlag;
void scummInit(); void scummInit();
void scummMain(int argc, char **argv); // is it still used ? void scummMain(int argc, char **argv); // is it still used ?

View file

@ -790,7 +790,11 @@ void Scumm::processKbd() {
if (_lastKeyHit==_vars[VAR_CUTSCENEEXIT_KEY]) { if (_lastKeyHit==_vars[VAR_CUTSCENEEXIT_KEY]) {
exitCutscene(); exitCutscene();
} else if (_lastKeyHit==_vars[VAR_SAVELOADDIALOG_KEY]) { } else if (_lastKeyHit==_vars[VAR_SAVELOADDIALOG_KEY]) {
if ( _features & GF_AFTER_V7)
runScript(_vars[VAR_UNK_SCRIPT],0,0,0);
((Gui*)_gui)->saveLoadDialog(); ((Gui*)_gui)->saveLoadDialog();
if ( _features & GF_AFTER_V7)
runScript(_vars[VAR_UNK_SCRIPT_2],0,0,0);
} else if (_lastKeyHit==_vars[VAR_TALKSTOP_KEY]) { } else if (_lastKeyHit==_vars[VAR_TALKSTOP_KEY]) {
_talkDelay = 0; _talkDelay = 0;
if (_sfxMode==2) if (_sfxMode==2)

View file

@ -1084,6 +1084,9 @@ int main(int argc, char* argv[]) {
} }
scumm->_charsetColor = 0; scumm->_charsetColor = 0;
scumm->_insaneFlag = 12;
/* */ /* */
scumm->_fullScreen = detector._fullScreen; scumm->_fullScreen = detector._fullScreen;