diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 | 
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 | 
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /engines/mohawk/myst.cpp | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'engines/mohawk/myst.cpp')
| -rw-r--r-- | engines/mohawk/myst.cpp | 8 | 
1 files changed, 7 insertions, 1 deletions
| diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 6bdf163a91..342fa4e78c 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -441,6 +441,7 @@ void MohawkEngine_Myst::changeToStack(uint16 stack, uint16 card, uint16 linkSrcS  		_scriptParser = new MystStacks::Credits(this);  		break;  	case kDemoStack: +		_gameState->_globals.currentAge = 0;  		_scriptParser = new MystStacks::Demo(this);  		break;  	case kDniStack: @@ -469,6 +470,7 @@ void MohawkEngine_Myst::changeToStack(uint16 stack, uint16 card, uint16 linkSrcS  		_scriptParser = new MystStacks::Selenitic(this);  		break;  	case kDemoSlidesStack: +		_gameState->_globals.currentAge = 1;  		_scriptParser = new MystStacks::Slides(this);  		break;  	case kStoneshipStack: @@ -645,7 +647,11 @@ void MohawkEngine_Myst::changeToCard(uint16 card, bool updateScreen) {  	for (uint16 i = 0; i < _resources.size(); i++)  		_resources[i]->handleCardChange(); -	// TODO: Handle Script Resources +	// The demo resets the cursor at each card change except when in the library +	if (getFeatures() & GF_DEMO +			&& _gameState->_globals.currentAge != 2) { +		_cursor->setDefaultCursor(); +	}  	// Make sure the screen is updated  	if (updateScreen) { | 
