diff options
author | Gregory Montoir | 2003-11-15 15:44:50 +0000 |
---|---|---|
committer | Gregory Montoir | 2003-11-15 15:44:50 +0000 |
commit | 308b5de8a67295418f3d870fb69083e60cc2b3f5 (patch) | |
tree | 9aaa087eb8d9b190684d7ee303a484103e678454 /queen/display.cpp | |
parent | aaa5631a9963b02a96d5f82187465433c6b2dd13 (diff) | |
download | scummvm-rg350-308b5de8a67295418f3d870fb69083e60cc2b3f5.tar.gz scummvm-rg350-308b5de8a67295418f3d870fb69083e60cc2b3f5.tar.bz2 scummvm-rg350-308b5de8a67295418f3d870fb69083e60cc2b3f5.zip |
fix some bugs :
- right-clicking on inventory item doesn't execute default action
- unapplied room light level when Joe enters a room
- updated comment in roomDisplay on palette fading problem
- during dialogue, invalid mouse-overs (added enum for joeWalk flag too)
preparing Journal stuff :
- add a (almost useless) useJournal method to Logic
- removed useless code in Graphics, as it should (and could) be easily re-written in a more OO way
svn-id: r11299
Diffstat (limited to 'queen/display.cpp')
-rw-r--r-- | queen/display.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/queen/display.cpp b/queen/display.cpp index c5fe3a9525..71df588c60 100644 --- a/queen/display.cpp +++ b/queen/display.cpp @@ -256,12 +256,14 @@ void Display::palSetJoe(JoePalette pal) { } -void Display::palFadeIn(int start, int end, uint16 roomNum) { +void Display::palFadeIn(int start, int end, uint16 roomNum, bool dynalum, int16 dynaX, int16 dynaY) { debug(9, "Display::palFadeIn(%d, %d)", start, end); memcpy(_pals.screen, _pals.room, 256 * 3); if (roomNum < 90 || (roomNum > 94 && roomNum < 114)) { - // XXX dynalum(); + if (dynalum) { + dynalumUpdate(dynaX, dynaY); + } int n = end - start + 1; uint8 tempPal[256 * 3]; int i; |