Implemented gui during insane
svn-id: r3829
This commit is contained in:
parent
5ca87c1269
commit
c13853de28
4 changed files with 17 additions and 5 deletions
13
insane.cpp
13
insane.cpp
|
@ -414,7 +414,7 @@ void codec37(CodecData *cd, PersistentCodecData37 *pcd) {
|
|||
|
||||
case 1:
|
||||
case 4:
|
||||
printf("code %d", cd->src[0]);
|
||||
warning("code %d", cd->src[0]);
|
||||
return;
|
||||
|
||||
default:
|
||||
|
@ -596,6 +596,9 @@ void SmushPlayer::startVideo(short int arg, byte* videoFile)
|
|||
|
||||
fileSize=fileReadBE32();
|
||||
|
||||
sm->videoFinished = 0;
|
||||
sm->_insaneState = 1;
|
||||
|
||||
do {
|
||||
if(ftell(_in)>=fileSize )
|
||||
return;
|
||||
|
@ -614,9 +617,11 @@ void SmushPlayer::startVideo(short int arg, byte* videoFile)
|
|||
|
||||
sm->delta = sm->_system->waitTick(sm->delta);
|
||||
|
||||
if(sm->_keyPressed == sm->_vars[sm->VAR_CUTSCENEEXIT_KEY])
|
||||
return;
|
||||
} while (1);
|
||||
sm->processKbd();
|
||||
|
||||
} while (!sm->videoFinished);
|
||||
|
||||
sm->_insaneState = 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
2
scumm.h
2
scumm.h
|
@ -591,6 +591,8 @@ public:
|
|||
/* _insane vars */
|
||||
|
||||
int _insaneFlag;
|
||||
int _insaneState;
|
||||
int videoFinished;
|
||||
|
||||
|
||||
void scummInit();
|
||||
|
|
|
@ -788,6 +788,9 @@ void Scumm::processKbd() {
|
|||
}
|
||||
|
||||
if (_lastKeyHit==_vars[VAR_CUTSCENEEXIT_KEY]) {
|
||||
if (_insaneState) {
|
||||
videoFinished=1;
|
||||
} else
|
||||
exitCutscene();
|
||||
} else if (_lastKeyHit==_vars[VAR_SAVELOADDIALOG_KEY]) {
|
||||
if ( _features & GF_AFTER_V7)
|
||||
|
|
2
sdl.cpp
2
sdl.cpp
|
@ -1087,6 +1087,8 @@ int main(int argc, char* argv[]) {
|
|||
|
||||
scumm->_insaneFlag = 12;
|
||||
|
||||
scumm->_insaneState = 0;
|
||||
|
||||
/* */
|
||||
|
||||
scumm->_fullScreen = detector._fullScreen;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue