aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_mr.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-05-11 22:32:37 +0000
committerJohannes Schickel2008-05-11 22:32:37 +0000
commit6e0c56996662dec6ccd9e724161e55562b728d8b (patch)
tree984e1e647cd413e5f1701520511dd339b0dbf44e /engines/kyra/kyra_mr.cpp
parent6e3c92e2392eb429723e23a4c782e0c1a7037b18 (diff)
downloadscummvm-rg350-6e0c56996662dec6ccd9e724161e55562b728d8b.tar.gz
scummvm-rg350-6e0c56996662dec6ccd9e724161e55562b728d8b.tar.bz2
scummvm-rg350-6e0c56996662dec6ccd9e724161e55562b728d8b.zip
Consisteny fixes:
- Renamed classes *_v1 -> *_LoK - Renamed files *_v1.* -> *_lok.* - Renamed WSAMovieV1 -> WSAMovie_v1 - Renamed WSAMovieV2 -> WSAMovie_v2 svn-id: r32042
Diffstat (limited to 'engines/kyra/kyra_mr.cpp')
-rw-r--r--engines/kyra/kyra_mr.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 2168000dc9..6eca24fe98 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -325,7 +325,7 @@ int KyraEngine_MR::go() {
}
void KyraEngine_MR::initMainMenu() {
- _menuAnim = new WSAMovieV2(this, _screen);
+ _menuAnim = new WSAMovie_v2(this, _screen);
_menuAnim->open("REVENGE.WSA", 1, _screen->getPalette(0));
_menuAnim->setX(0);
_menuAnim->setY(0);
@@ -550,11 +550,11 @@ void KyraEngine_MR::initMouseShapes() {
void KyraEngine_MR::startup() {
debugC(9, kDebugLevelMain, "KyraEngine_MR::startup()");
- _album.wsa = new WSAMovieV2(this, _screen);
+ _album.wsa = new WSAMovie_v2(this, _screen);
assert(_album.wsa);
- _album.leftPage.wsa = new WSAMovieV2(this, _screen);
+ _album.leftPage.wsa = new WSAMovie_v2(this, _screen);
assert(_album.leftPage.wsa);
- _album.rightPage.wsa = new WSAMovieV2(this, _screen);
+ _album.rightPage.wsa = new WSAMovie_v2(this, _screen);
assert(_album.rightPage.wsa);
musicUpdate(0);
@@ -607,7 +607,7 @@ void KyraEngine_MR::startup() {
for (int i = 0; i < 16; ++i) {
_sceneAnims[i].flags = 0;
- _sceneAnimMovie[i] = new WSAMovieV2(this, _screen);
+ _sceneAnimMovie[i] = new WSAMovie_v2(this, _screen);
assert(_sceneAnimMovie[i]);
}
@@ -664,7 +664,7 @@ void KyraEngine_MR::startup() {
musicUpdate(0);
runStartupScript(1, 0);
_res->exists("MOODOMTR.WSA", true);
- _invWsa = new WSAMovieV2(this, _screen);
+ _invWsa = new WSAMovie_v2(this, _screen);
assert(_invWsa);
_invWsa->open("MOODOMTR.WSA", 1, 0);
_invWsaFrame = 6;