[Scummvm-cvs-logs] SF.net SVN: scummvm:[48771] scummvm/trunk/engines/sci/graphics
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Thu Apr 22 18:55:46 CEST 2010
Revision: 48771
http://scummvm.svn.sourceforge.net/scummvm/?rev=48771&view=rev
Author: m_kiewitz
Date: 2010-04-22 16:55:46 +0000 (Thu, 22 Apr 2010)
Log Message:
-----------
SCI: SCI1LATE+ checks for STYLE_USER, versions before check for STYLE_USER|STYLE_TRANSPARENT
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/ports.cpp
scummvm/trunk/engines/sci/graphics/ports.h
Modified: scummvm/trunk/engines/sci/graphics/ports.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/ports.cpp 2010-04-22 15:30:26 UTC (rev 48770)
+++ scummvm/trunk/engines/sci/graphics/ports.cpp 2010-04-22 16:55:46 UTC (rev 48771)
@@ -85,6 +85,11 @@
// will work, but some scripts seem to check for 0 and initialize the variable again in that case
// resulting in problems.
+ if (getSciVersion() >= SCI_VERSION_1_LATE)
+ _styleUser = SCI_WINDOWMGR_STYLE_USER;
+ else
+ _styleUser = SCI_WINDOWMGR_STYLE_USER | SCI_WINDOWMGR_STYLE_TRANSPARENT;
+
// Jones, Slater and Hoyle 3 were called with parameter -Nw 0 0 200 320.
// Mother Goose (SCI1) uses -Nw 0 0 159 262. The game will later use SetPort so we don't need to set the other fields.
// This actually meant not skipping the first 10 pixellines in windowMgrPort
@@ -233,7 +238,7 @@
}
r = dims;
- if ((style != SCI_WINDOWMGR_STYLE_USER) && !(style & SCI_WINDOWMGR_STYLE_NOFRAME)) {
+ if ((style != _styleUser) && !(style & SCI_WINDOWMGR_STYLE_NOFRAME)) {
r.grow(1);
if (style & SCI_WINDOWMGR_STYLE_TITLE) {
r.top -= 10;
@@ -298,7 +303,7 @@
}
// drawing frame,shadow and title
- if (!(wndStyle & SCI_WINDOWMGR_STYLE_USER)) {
+ if (wndStyle != _styleUser) {
r = pWnd->dims;
if (!(wndStyle & SCI_WINDOWMGR_STYLE_NOFRAME)) {
r.translate(1, 1);
Modified: scummvm/trunk/engines/sci/graphics/ports.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/ports.h 2010-04-22 15:30:26 UTC (rev 48770)
+++ scummvm/trunk/engines/sci/graphics/ports.h 2010-04-22 16:55:46 UTC (rev 48771)
@@ -109,6 +109,8 @@
bool _usesOldGfxFunctions;
+ uint16 _styleUser;
+
/** The list of open 'windows' (and ports), in visual order. */
PortList _windowList;
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