aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_v2.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-04-12 23:17:21 +0000
committerJohannes Schickel2008-04-12 23:17:21 +0000
commit1f91dc03846caecc0651101f54ad25f1864ae132 (patch)
treebcb81be8cb19781ef4098810f8aacafe755cbf48 /engines/kyra/kyra_v2.cpp
parent91e1a6b7be34e2cbb52826c28ce210b15bb19f1e (diff)
downloadscummvm-rg350-1f91dc03846caecc0651101f54ad25f1864ae132.tar.gz
scummvm-rg350-1f91dc03846caecc0651101f54ad25f1864ae132.tar.bz2
scummvm-rg350-1f91dc03846caecc0651101f54ad25f1864ae132.zip
- some refactoring for Kyra3
- removed unneeded map code in KyraEngine_v3 svn-id: r31488
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
-rw-r--r--engines/kyra/kyra_v2.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index a4adf26798..e4beedecd5 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -179,7 +179,7 @@ KyraEngine_v2::~KyraEngine_v2() {
}
Movie *KyraEngine_v2::createWSAMovie() {
- return new WSAMovieV2(this);
+ return new WSAMovieV2(this, _screen);
}
int KyraEngine_v2::init() {
@@ -329,10 +329,10 @@ void KyraEngine_v2::startup() {
memset(_sceneAnims, 0, sizeof(_sceneAnims));
for (int i = 0; i < ARRAYSIZE(_sceneAnimMovie); ++i)
- _sceneAnimMovie[i] = new WSAMovieV2(this);
+ _sceneAnimMovie[i] = new WSAMovieV2(this, _screen);
memset(_wsaSlots, 0, sizeof(_wsaSlots));
for (int i = 0; i < ARRAYSIZE(_wsaSlots); ++i)
- _wsaSlots[i] = new WSAMovieV2(this);
+ _wsaSlots[i] = new WSAMovieV2(this, _screen);
_screen->_curPage = 0;
@@ -1855,7 +1855,7 @@ void KyraEngine_v2::loadInvWsa(const char *filename, int run, int delayTime, int
wsaFlags |= 2;
if (!_invWsa.wsa)
- _invWsa.wsa = new WSAMovieV2(this);
+ _invWsa.wsa = new WSAMovieV2(this, _screen);
if (!_invWsa.wsa->open(filename, wsaFlags, 0))
error("Couldn't open inventory WSA file '%s'", filename);