aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/minigames
diff options
context:
space:
mode:
authorSven Hesse2012-01-28 20:08:13 +0100
committerSven Hesse2012-01-28 20:08:13 +0100
commitc161cc123239966128d9487e84face5fbdc463de (patch)
tree4843dfb2a6831d6f99d11de18eb286f6dfd1dd44 /engines/gob/minigames
parentc0d0792ccf346270f4def39182748e4c9f3def3d (diff)
downloadscummvm-rg350-c161cc123239966128d9487e84face5fbdc463de.tar.gz
scummvm-rg350-c161cc123239966128d9487e84face5fbdc463de.tar.bz2
scummvm-rg350-c161cc123239966128d9487e84face5fbdc463de.zip
GOB: Fade the Diving minigame in
Diffstat (limited to 'engines/gob/minigames')
-rw-r--r--engines/gob/minigames/geisha/diving.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 6b891b4c31..047eb5b5d0 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -23,6 +23,7 @@
#include "common/list.h"
#include "gob/global.h"
+#include "gob/palanim.h"
#include "gob/draw.h"
#include "gob/video.h"
#include "gob/decfile.h"
@@ -116,14 +117,21 @@ Diving::~Diving() {
bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
_hasPearlLocation = hasPearlLocation;
+ _vm->_palAnim->fade(0, 0, 0);
+
init();
initScreen();
initCursor();
initPlants();
+ updateAirMeter();
+ updateAnims();
+
_vm->_draw->blitInvalidated();
_vm->_video->retrace();
+ _vm->_palAnim->fade(_vm->_global->_pPaletteDesc, 0, 0);
+
while (!_vm->shouldQuit()) {
checkShots();
checkOkoHurt();
@@ -340,8 +348,6 @@ void Diving::initScreen() {
memcpy(_vm->_draw->_vgaPalette , kPalette, 48);
memcpy(_vm->_draw->_vgaSmallPalette, kPalette, 48);
- _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
-
_vm->_draw->_backSurface->clear();
_background->draw(*_vm->_draw->_backSurface);