diff options
author | Gregory Montoir | 2003-12-05 20:16:32 +0000 |
---|---|---|
committer | Gregory Montoir | 2003-12-05 20:16:32 +0000 |
commit | 472045d578bdd4488da0aec54516881f8616ec7b (patch) | |
tree | 8e1683157782fd353dd93a23914b75ee0e81abec /queen/cutaway.cpp | |
parent | e19909d3e394682b1610a9b0326b449a7f288099 (diff) | |
download | scummvm-rg350-472045d578bdd4488da0aec54516881f8616ec7b.tar.gz scummvm-rg350-472045d578bdd4488da0aec54516881f8616ec7b.tar.bz2 scummvm-rg350-472045d578bdd4488da0aec54516881f8616ec7b.zip |
- fix Joe scaling issue when switching from room 51 to 47 (temple)
- add remaining fadein() call in cutaway, pinnacle room is ok now
- add 2 macros to 'clarify' some room tests
- some cleanup
svn-id: r11502
Diffstat (limited to 'queen/cutaway.cpp')
-rw-r--r-- | queen/cutaway.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index b3983b0163..3cd211559f 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -990,7 +990,7 @@ void Cutaway::changeRooms(CutawayObject &object) { } else { // We need to display Joe on screen - if (_roomFade == 1) + if (_roomFade) mode = RDM_NOFADE_JOE; else mode = RDM_FADE_JOE_XY; @@ -1538,19 +1538,17 @@ void Cutaway::run(char *nextFilename) { if (_input->cutawayQuit()) break; - // XXX -#if 0 - if(ROOMFADE==1) - { - update(); - //CR 2 - CD-Rom - if(ROOM>=114) - fadein(0,255); - else - fadein(0,223); - ROOMFADE=0; + if (_roomFade) { + _logic->update(); + int end = 223; + if (IS_CD_INTRO_ROOM(_logic->currentRoom())) { + end = 255; + } + BobSlot *j = _graphics->bob(0); + _logic->display()->palFadeIn(0, end, _logic->currentRoom(), j->active, j->x, j->y); + _roomFade = false; } -#endif + } // for() stop(); @@ -1787,7 +1785,7 @@ void Cutaway::stop() { joeBob->x = joeX; joeBob->y = joeY; - joeBob->scale = _logic->findScale(joeX, joeY); + _logic->joeScale(_logic->findScale(joeX, joeY)); _logic->joeFace(); } } |