[Scummvm-cvs-logs] SF.net SVN: scummvm:[45044] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 45044
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45044&view=rev
Author:   m_kiewitz
Date:     2009-10-13 19:08:40 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
SCI/newgui: DrawControl type 10 is actually just a dummy in qfg1ega, we dont need to do anything. I believe some other control is responsible for the percentage box

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui.h

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-13 19:00:09 UTC (rev 45043)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-13 19:08:40 UTC (rev 45044)
@@ -1130,8 +1130,8 @@
 		delete[] listStrings;
 		return;
 
-	case SCI_CONTROLS_TYPE_PERCENTAGE:
-		// TODO: Implement this
+	case SCI_CONTROLS_TYPE_DUMMY:
+		// Actually this here does nothing at all, its required by at least QfG1/EGA that we accept this type
 		return;
 
 	default:

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-13 19:00:09 UTC (rev 45043)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-13 19:08:40 UTC (rev 45044)
@@ -408,9 +408,11 @@
 	SegManager *segMan = _s->_segMan;
 	int16 controlType = GET_SEL32V(controlObject, type);
 
-	if (controlType == SCI_CONTROLS_TYPE_TEXTEDIT) {
+	switch (controlType) {
+	case SCI_CONTROLS_TYPE_TEXTEDIT:
 		// Only process textedit controls in here
 		_gfx->TexteditChange(controlObject, eventObject);
+		return;
 	}
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-13 19:00:09 UTC (rev 45043)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-13 19:08:40 UTC (rev 45044)
@@ -38,7 +38,7 @@
 	SCI_CONTROLS_TYPE_ICON			= 4,
 	SCI_CONTROLS_TYPE_LIST			= 6,
 	SCI_CONTROLS_TYPE_LIST_ALIAS	= 7,
-	SCI_CONTROLS_TYPE_PERCENTAGE	= 10
+	SCI_CONTROLS_TYPE_DUMMY			= 10
 };
 
 class SciGuiScreen;


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