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

Implemented gui during insane

Browse source 
svn-id: r3829
This commit is contained in:
Vincent Hamm 2002-03-25 14:22:09 +00:00
parent 5ca87c1269
commit c13853de28
4 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
insane.cpp
View file

@ -414,7 +414,7 @@ void codec37(CodecData *cd, PersistentCodecData37 *pcd) {
case 1: case 1:
case 4: case 4:
printf("code %d", cd->src[0]); warning("code %d", cd->src[0]);
return; return;
default: default:
@ -596,6 +596,9 @@ void SmushPlayer::startVideo(short int arg, byte* videoFile)
fileSize=fileReadBE32(); fileSize=fileReadBE32();
sm->videoFinished = 0;
sm->_insaneState = 1;
do { do {
if(ftell(_in)>=fileSize ) if(ftell(_in)>=fileSize )
return; return;
@ -613,10 +616,12 @@ void SmushPlayer::startVideo(short int arg, byte* videoFile)
updateScreen(sm); updateScreen(sm);
sm->delta = sm->_system->waitTick(sm->delta); sm->delta = sm->_system->waitTick(sm->delta);
sm->processKbd();
if(sm->_keyPressed == sm->_vars[sm->VAR_CUTSCENEEXIT_KEY]) } while (!sm->videoFinished);
return;
} while (1); sm->_insaneState = 0;
} }

2
scumm.h
View file

@ -591,6 +591,8 @@ public:
/* _insane vars */ /* _insane vars */
int _insaneFlag; int _insaneFlag;
int _insaneState;
int videoFinished;
void scummInit(); void scummInit();

5
scummvm.cpp
View file

@ -788,7 +788,10 @@ void Scumm::processKbd() {
} }
if (_lastKeyHit==_vars[VAR_CUTSCENEEXIT_KEY]) { if (_lastKeyHit==_vars[VAR_CUTSCENEEXIT_KEY]) {
exitCutscene(); if (_insaneState) {
videoFinished=1;
} else
exitCutscene();
} else if (_lastKeyHit==_vars[VAR_SAVELOADDIALOG_KEY]) { } else if (_lastKeyHit==_vars[VAR_SAVELOADDIALOG_KEY]) {
if ( _features & GF_AFTER_V7) if ( _features & GF_AFTER_V7)
runScript(_vars[VAR_UNK_SCRIPT],0,0,0); runScript(_vars[VAR_UNK_SCRIPT],0,0,0);

2
sdl.cpp
View file

@ -1087,6 +1087,8 @@ int main(int argc, char* argv[]) {
scumm->_insaneFlag = 12; scumm->_insaneFlag = 12;
scumm->_insaneState = 0;
/* */ /* */
scumm->_fullScreen = detector._fullScreen; scumm->_fullScreen = detector._fullScreen;