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

[m_kiewitz at users.sourceforge.net]

Revision: 44837
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44837&view=rev
Author:   m_kiewitz
Date:     2009-10-09 17:47:33 +0000 (Fri, 09 Oct 2009)

Log Message:
-----------
SCI: drawMenuBar/clearMenuBar now using gui class, currently unimplemented in newgui, but so wont get affected by oldgui switching to visualScreen anymore (e.g. qfg2)

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

Modified: scummvm/trunk/engines/sci/engine/kmenu.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmenu.cpp	2009-10-09 17:41:59 UTC (rev 44836)
+++ scummvm/trunk/engines/sci/engine/kmenu.cpp	2009-10-09 17:47:33 UTC (rev 44837)
@@ -83,13 +83,9 @@
 
 reg_t kDrawMenuBar(EngineState *s, int argc, reg_t *argv) {
 	if (argv[0].toSint16())
-		sciw_set_menubar(s, s->titlebar_port, s->_menubar, -1);
+		s->_gui->drawMenuBar();
 	else
-		sciw_set_status_bar(s, s->titlebar_port, "", 0, 0);
-
-	s->titlebar_port->draw(Common::Point(0, 0));
-	gfxop_update(s->gfx_state);
-
+		s->_gui->clearMenuBar();
 	return s->r_acc;
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-09 17:41:59 UTC (rev 44836)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-09 17:47:33 UTC (rev 44837)
@@ -259,6 +259,14 @@
 	_screen->copyToScreen();
 }
 
+void SciGui::drawMenuBar() {
+	// TODO: Implement menubar
+}
+
+void SciGui::clearMenuBar() {
+	// TODO: Implement menubar
+}
+
 void SciGui::drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo) {
 	GuiPort *oldPort = _gfx->SetPort((GuiPort *)_windowMgr->_picWind);
 

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-09 17:41:59 UTC (rev 44836)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-09 17:47:33 UTC (rev 44837)
@@ -64,6 +64,8 @@
 	virtual void textColors(int argc, reg_t *argv);
 
 	virtual void drawStatus(const char *text, int16 colorPen, int16 colorBack);
+	virtual void drawMenuBar();
+	virtual void clearMenuBar();
 	virtual void drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo);
 	virtual void drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo);
 	virtual void drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite);

Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-09 17:41:59 UTC (rev 44836)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-09 17:47:33 UTC (rev 44837)
@@ -505,6 +505,18 @@
 	gfxop_update(s->gfx_state);
 }
 
+void SciGui32::drawMenuBar() {
+	sciw_set_menubar(s, s->titlebar_port, s->_menubar, -1);
+	s->titlebar_port->draw(Common::Point(0, 0));
+	gfxop_update(s->gfx_state);
+}
+
+void SciGui32::clearMenuBar() {
+	sciw_set_status_bar(s, s->titlebar_port, "", 0, 0);
+	s->titlebar_port->draw(Common::Point(0, 0));
+	gfxop_update(s->gfx_state);
+}
+
 void SciGui32::drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo) {
 	drawn_pic_t dp;
 	gfx_color_t transparent = s->wm_port->_bgcolor;

Modified: scummvm/trunk/engines/sci/gui32/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-09 17:41:59 UTC (rev 44836)
+++ scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-09 17:47:33 UTC (rev 44837)
@@ -56,6 +56,8 @@
 	void textColors(int argc, reg_t *argv);
 
 	void drawStatus(const char *text, int16 colorPen, int16 colorBack);
+	void drawMenuBar();
+	void clearMenuBar();
 	void drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo);
 	void drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo);
 	void drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite);


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