[Scummvm-cvs-logs] SF.net SVN: scummvm:[49567] scummvm/trunk/engines/sci/engine/savegame.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Jun 10 12:27:14 CEST 2010
Revision: 49567
http://scummvm.svn.sourceforge.net/scummvm/?rev=49567&view=rev
Author: thebluegr
Date: 2010-06-10 10:27:13 +0000 (Thu, 10 Jun 2010)
Log Message:
-----------
Pic port saving/loading is only used in SCI0-SCI11
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/savegame.cpp
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2010-06-10 10:20:25 UTC (rev 49566)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2010-06-10 10:27:13 UTC (rev 49567)
@@ -352,16 +352,14 @@
s.skip(4, VER(12), VER(12)); // obsolete: used to be status_bar_foreground
s.skip(4, VER(12), VER(12)); // obsolete: used to be status_bar_background
- if (s.getVersion() >= 13 && g_sci->_gui) {
- // Save/Load picPort as well (cause sierra sci also does this)
+ if (s.getVersion() >= 13 && getSciVersion() <= SCI_VERSION_1_1) {
+ // Save/Load picPort as well for SCI0-SCI1.1. Necessary for Castle of Dr. Brain,
+ // as the picPort has been changed when loading during the intro
int16 picPortTop, picPortLeft;
Common::Rect picPortRect;
- if (s.isSaving()) {
- // FIXME: _gfxPorts is 0 when using SCI32 code
- assert(g_sci->_gfxPorts);
+ if (s.isSaving())
picPortRect = g_sci->_gfxPorts->kernelGetPicWindow(picPortTop, picPortLeft);
- }
s.syncAsSint16LE(picPortRect.top);
s.syncAsSint16LE(picPortRect.left);
@@ -370,9 +368,8 @@
s.syncAsSint16LE(picPortTop);
s.syncAsSint16LE(picPortLeft);
- if (s.isLoading()) {
+ if (s.isLoading())
g_sci->_gfxPorts->kernelSetPicWindow(picPortRect, picPortTop, picPortLeft, false);
- }
}
s.skip(1, VER(9), VER(9)); // obsolete: used to be a flag indicating if we got sci11 or not
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