aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Milburn2010-11-29 21:42:37 +0000
committerAlyssa Milburn2010-11-29 21:42:37 +0000
commitb1b7ffa1f245bc969a0dbeec8612436d41e3402b (patch)
tree56453ad5672ecc43513aeb05565f791657b8b155
parent790bba6c27a91a5068d02a92a7859524706c1974 (diff)
downloadscummvm-rg350-b1b7ffa1f245bc969a0dbeec8612436d41e3402b.tar.gz
scummvm-rg350-b1b7ffa1f245bc969a0dbeec8612436d41e3402b.tar.bz2
scummvm-rg350-b1b7ffa1f245bc969a0dbeec8612436d41e3402b.zip
MOHAWK: move GF_NO_READONLY check to after actual page load
svn-id: r54652
-rw-r--r--engines/mohawk/livingbooks.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index e9c2febe54..3459cd8f08 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -276,18 +276,6 @@ bool MohawkEngine_LivingBooks::loadPage(LBMode mode, uint page, uint subpage) {
_readOnly = true;
}
- if (getFeatures() & GF_NO_READONLY) {
- if (_readOnly) {
- // TODO: make this a warning, after some testing?
- error("game detection table is bad (remove GF_NO_READONLY)");
- } else {
- // some very early versions of the LB engine don't have
- // .r entries in their book info; instead, it is just hardcoded
- // like this (which would unfortunately break later games)
- _readOnly = (mode != kLBControlMode && mode != kLBPlayMode);
- }
- }
-
// TODO: fading between pages
bool fade = false;
if (filename.hasSuffix(" fade")) {
@@ -304,6 +292,18 @@ bool MohawkEngine_LivingBooks::loadPage(LBMode mode, uint page, uint subpage) {
return false;
}
+ if (getFeatures() & GF_NO_READONLY) {
+ if (_readOnly) {
+ // TODO: make this a warning, after some testing?
+ error("game detection table is bad (remove GF_NO_READONLY)");
+ } else {
+ // some very early versions of the LB engine don't have
+ // .r entries in their book info; instead, it is just hardcoded
+ // like this (which would unfortunately break later games)
+ _readOnly = (mode != kLBControlMode && mode != kLBPlayMode);
+ }
+ }
+
debug(1, "Stack Version: %d", getResourceVersion());
_curMode = mode;