[Scummvm-cvs-logs] SF.net SVN: scummvm:[50784] scummvm/trunk/engines/sci/graphics/menu.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50784
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50784&view=rev
Author:   m_kiewitz
Date:     2010-07-10 16:22:08 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
SCI: calculate widths for menu after switching to menuport, i guess this was the reason why we sometimes had issues drawing parts of the menu (random issue)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/menu.cpp

Modified: scummvm/trunk/engines/sci/graphics/menu.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/menu.cpp	2010-07-10 15:18:41 UTC (rev 50783)
+++ scummvm/trunk/engines/sci/graphics/menu.cpp	2010-07-10 16:22:08 UTC (rev 50784)
@@ -704,8 +704,8 @@
 	// selecting first item of first menu every time. Also sierra sci didn't
 	// allow mouse interaction, when menu was activated via keyboard.
 
+	_oldPort = _ports->setPort(_ports->_menuPort);
 	calculateMenuAndItemWidth();
-	_oldPort = _ports->setPort(_ports->_menuPort);
 	_barSaveHandle = _paint16->bitsSave(_ports->_menuRect, GFX_SCREEN_MASK_VISUAL);
 
 	_ports->penColor(0);
@@ -827,8 +827,8 @@
 	bool firstMenuChange = true;
 	GuiMenuItemEntry *curItemEntry = NULL;
 
+	_oldPort = _ports->setPort(_ports->_menuPort);
 	calculateMenuAndItemWidth();
-	_oldPort = _ports->setPort(_ports->_menuPort);
 	_barSaveHandle = _paint16->bitsSave(_ports->_menuRect, GFX_SCREEN_MASK_VISUAL);
 
 	_ports->penColor(0);


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