aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/riven.cpp
diff options
context:
space:
mode:
authorBastien Bouclet2016-08-07 11:26:43 +0200
committerEugene Sandulenko2017-07-03 08:50:10 +0200
commit05bed84a859589466e12c0a62311ce6959380d2b (patch)
tree2ab9f79cfcc0ad274ece91225f787f74ce162c83 /engines/mohawk/riven.cpp
parent670a3c4558f3c2c7e7c0d84d95b906e6fe0ce804 (diff)
downloadscummvm-rg350-05bed84a859589466e12c0a62311ce6959380d2b.tar.gz
scummvm-rg350-05bed84a859589466e12c0a62311ce6959380d2b.tar.bz2
scummvm-rg350-05bed84a859589466e12c0a62311ce6959380d2b.zip
MOHAWK: Rename the card and stack accessors
Diffstat (limited to 'engines/mohawk/riven.cpp')
-rw-r--r--engines/mohawk/riven.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 9a60384498..8b7ee885ae 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -588,7 +588,7 @@ static void catherineIdleTimer(MohawkEngine_Riven *vm) {
cathState = 1;
// Play the movie, blocking
- vm->_video->activateMLST(movie, vm->getCurCard()->getId());
+ vm->_video->activateMLST(movie, vm->getCard()->getId());
vm->_cursor->hideCursor();
vm->_video->playMovieBlockingRiven(movie);
vm->_cursor->showCursor();
@@ -722,7 +722,7 @@ static void sunnersBeachTimer(MohawkEngine_Riven *vm) {
// Unlike the other cards' scripts which automatically
// activate the MLST, we have to set it manually here.
uint16 mlstID = vm->_rnd->getRandomNumberRng(3, 8);
- vm->_video->activateMLST(mlstID, vm->getCurCard()->getId());
+ vm->_video->activateMLST(mlstID, vm->getCard()->getId());
VideoHandle handle = vm->_video->playMovieRiven(mlstID);
timerTime = handle->getDuration().msecs() + vm->_rnd->getRandomNumberRng(1, 30) * 1000;
@@ -797,7 +797,7 @@ void MohawkEngine_Riven::checkSunnerAlertClick() {
}
void MohawkEngine_Riven::addZipVisitedCard(uint16 cardId, uint16 cardNameId) {
- Common::String cardName = getCurStack()->getName(kCardNames, cardNameId);
+ Common::String cardName = getStack()->getName(kCardNames, cardNameId);
if (cardName.empty())
return;
ZipMode zip;