[Scummvm-cvs-logs] SF.net SVN: scummvm:[54652] scummvm/trunk/engines/mohawk/livingbooks.cpp
fuzzie at users.sourceforge.net
fuzzie at users.sourceforge.net
Mon Nov 29 22:42:37 CET 2010
Revision: 54652
http://scummvm.svn.sourceforge.net/scummvm/?rev=54652&view=rev
Author: fuzzie
Date: 2010-11-29 21:42:37 +0000 (Mon, 29 Nov 2010)
Log Message:
-----------
MOHAWK: move GF_NO_READONLY check to after actual page load
Modified Paths:
--------------
scummvm/trunk/engines/mohawk/livingbooks.cpp
Modified: scummvm/trunk/engines/mohawk/livingbooks.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.cpp 2010-11-29 21:42:00 UTC (rev 54651)
+++ scummvm/trunk/engines/mohawk/livingbooks.cpp 2010-11-29 21:42:37 UTC (rev 54652)
@@ -276,18 +276,6 @@
_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 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list