aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
authorSven Hesse2012-06-30 02:33:12 +0200
committerSven Hesse2012-07-30 01:44:43 +0200
commit60cebba95ca1d30f2926acd2d415d09c75e2bd42 (patch)
treed35191bb6cf1026d7f7287d752ede7261dc5a823 /engines/gob
parent139b03c4bcafea260e79e3e83db897c71db41907 (diff)
downloadscummvm-rg350-60cebba95ca1d30f2926acd2d415d09c75e2bd42.tar.gz
scummvm-rg350-60cebba95ca1d30f2926acd2d415d09c75e2bd42.tar.bz2
scummvm-rg350-60cebba95ca1d30f2926acd2d415d09c75e2bd42.zip
GOB: Show the Once Upon A Time wait/load screen
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/pregob/onceupon/abracadabra.cpp4
-rw-r--r--engines/gob/pregob/onceupon/babayaga.cpp4
-rw-r--r--engines/gob/pregob/onceupon/onceupon.cpp17
-rw-r--r--engines/gob/pregob/onceupon/onceupon.h1
4 files changed, 26 insertions, 0 deletions
diff --git a/engines/gob/pregob/onceupon/abracadabra.cpp b/engines/gob/pregob/onceupon/abracadabra.cpp
index 8ece3d1c27..27845cd1d5 100644
--- a/engines/gob/pregob/onceupon/abracadabra.cpp
+++ b/engines/gob/pregob/onceupon/abracadabra.cpp
@@ -61,6 +61,10 @@ void Abracadabra::run() {
if (_vm->shouldQuit() || !correctCP)
return;
+ showWait();
+ if (_vm->shouldQuit())
+ return;
+
showTitle();
}
diff --git a/engines/gob/pregob/onceupon/babayaga.cpp b/engines/gob/pregob/onceupon/babayaga.cpp
index 1eb603492b..1dbda8227b 100644
--- a/engines/gob/pregob/onceupon/babayaga.cpp
+++ b/engines/gob/pregob/onceupon/babayaga.cpp
@@ -61,6 +61,10 @@ void BabaYaga::run() {
if (_vm->shouldQuit() || !correctCP)
return;
+ showWait();
+ if (_vm->shouldQuit())
+ return;
+
showTitle();
}
diff --git a/engines/gob/pregob/onceupon/onceupon.cpp b/engines/gob/pregob/onceupon/onceupon.cpp
index a5d05ce8c3..6f5d95b10c 100644
--- a/engines/gob/pregob/onceupon/onceupon.cpp
+++ b/engines/gob/pregob/onceupon/onceupon.cpp
@@ -489,6 +489,23 @@ void OnceUpon::setAnimState(ANIObject &ani, uint16 state, bool once, bool pause)
ani.setPosition();
}
+void OnceUpon::showWait() {
+ // Show the loading floppy
+
+ fadeOut();
+ clearScreen();
+ setGamePalette(10);
+
+ Surface wait(320, 43, 1);
+
+ _vm->_video->drawPackedSprite("wait.cmp", wait);
+ _vm->_draw->_backSurface->blit(wait, 0, 0, 72, 33, 122, 84);
+
+ _vm->_draw->forceBlit();
+
+ fadeIn();
+}
+
void OnceUpon::showTitle() {
// Show the Once Upon A Time title animation
// NOTE: This is currently only a mock-up. The real animation is in "ville.seq".
diff --git a/engines/gob/pregob/onceupon/onceupon.h b/engines/gob/pregob/onceupon/onceupon.h
index 8b454e01f3..99fb51431a 100644
--- a/engines/gob/pregob/onceupon/onceupon.h
+++ b/engines/gob/pregob/onceupon/onceupon.h
@@ -49,6 +49,7 @@ protected:
bool doCopyProtection(const uint8 colors[7], const uint8 shapes[7 * 20], const uint8 obfuscate[4]);
+ void showWait();
void showTitle();