aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2014-11-01 22:25:41 -0400
committerPaul Gilbert2014-12-12 22:20:05 -0500
commitc03845258843a7b0d1db792ea42a986bf79c917a (patch)
treebffdf02489cee50150bc151c7dde37977d2ba56d /engines
parentf3063a13f08a2b085d92d0a79231e568671501b3 (diff)
downloadscummvm-rg350-c03845258843a7b0d1db792ea42a986bf79c917a.tar.gz
scummvm-rg350-c03845258843a7b0d1db792ea42a986bf79c917a.tar.bz2
scummvm-rg350-c03845258843a7b0d1db792ea42a986bf79c917a.zip
ACCESS: Add missing _startup checks to palette cycling opcodes
Diffstat (limited to 'engines')
-rw-r--r--engines/access/amazon/amazon_scripts.cpp5
-rw-r--r--engines/access/scripts.cpp3
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 0ea9ee5ebe..3e7fd4e84e 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -449,8 +449,9 @@ void AmazonScripts::cmdHelp() {
error("TODO: more cmdHelp");
}
-void AmazonScripts::cmdCycleBack() {
- _vm->_screen->cyclePaletteBackwards();
+void AmazonScripts::cmdCycleBack() {
+ if (_vm->_startup == -1)
+ _vm->_screen->cyclePaletteBackwards();
}
void AmazonScripts::cmdChapter() {
int chapter = _data->readByte();
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2aa10b6b4a..c46d7b972f 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -522,7 +522,8 @@ void Scripts::cmdSetCycle() {
}
void Scripts::cmdCycle() {
- _vm->_screen->cyclePaletteForward();
+ if (_vm->_startup == -1)
+ _vm->_screen->cyclePaletteForward();
}
void Scripts::cmdCharSpeak() {