[Scummvm-cvs-logs] SF.net SVN: scummvm:[54017] scummvm/trunk/engines/sci/engine/savegame.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 54017
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54017&view=rev
Author:   m_kiewitz
Date:     2010-11-01 20:08:42 +0000 (Mon, 01 Nov 2010)

Log Message:
-----------
SCI: fixing port restoring

- recalculate _freeCounter
- dont push disposed windows onto windowlist

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-11-01 19:56:01 UTC (rev 54016)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-11-01 20:08:42 UTC (rev 54017)
@@ -646,10 +646,14 @@
 				//  of the window can only get repainted by the scripts and they dont do that
 				//  so we will get empty, transparent windows instead. So perfect window order
 				//  shouldn't really matter
-				if (window->wndStyle & SCI_WINDOWMGR_STYLE_TOPMOST)
-					_windowList.push_front(window);
-				else
-					_windowList.push_back(window);
+				if (window->counterTillFree) {
+					_freeCounter++;
+				} else {
+					if (window->wndStyle & SCI_WINDOWMGR_STYLE_TOPMOST)
+						_windowList.push_front(window);
+					else
+						_windowList.push_back(window);
+				}
 
 				windowCount--;
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.