[Scummvm-cvs-logs] SF.net SVN: scummvm:[46528] scummvm/trunk/engines/sci
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Dec 24 15:18:17 CET 2009
Revision: 46528
http://scummvm.svn.sourceforge.net/scummvm/?rev=46528&view=rev
Author: thebluegr
Date: 2009-12-24 14:18:16 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------
Added a hack in kAddScreenItem to display the view in question on screen. Some parts of the main menu can be seen now in GK1
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kernel32.cpp
scummvm/trunk/engines/sci/sci.cpp
Modified: scummvm/trunk/engines/sci/engine/kernel32.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel32.cpp 2009-12-24 13:50:50 UTC (rev 46527)
+++ scummvm/trunk/engines/sci/engine/kernel32.cpp 2009-12-24 14:18:16 UTC (rev 46528)
@@ -28,6 +28,7 @@
#include "sci/engine/kernel.h"
#include "sci/engine/segment.h"
#include "sci/engine/state.h"
+#include "sci/gui/gui.h"
namespace Sci {
@@ -594,11 +595,15 @@
int16 viewId = GET_SEL32V(s->_segMan, viewObj, view);
int16 loopNo = GET_SEL32V(s->_segMan, viewObj, loop);
int16 celNo = GET_SEL32V(s->_segMan, viewObj, cel);
- //int16 leftPos = 0;
- //int16 topPos = 0;
+ int16 leftPos = 50; // HACK: lsLeft, perhaps? (but it's 0...)
+ int16 topPos = 50; // HACK: lsTop, perhaps? (but it's 0...)
int16 priority = GET_SEL32V(s->_segMan, viewObj, priority);
//int16 control = 0;
- warning("kAddScreenItem, view %d, loop %d, cel %d, pri %d", viewId, loopNo, celNo, priority);
+
+ // HACK: just draw the view on screen
+ s->_gui->drawCel(viewId, loopNo, celNo, leftPos, topPos, priority, 0);
+
+ warning("kAddScreenItem, object %04x:%04x, view %d, loop %d, cel %d, pri %d", PRINT_REG(viewObj), viewId, loopNo, celNo, priority);
//s->_gui->addToPicView(viewId, loopNo, celNo, leftPos, topPos, priority, control);
return NULL_REG;
}
@@ -612,6 +617,7 @@
//int16 topPos = 0;
int16 priority = GET_SEL32V(s->_segMan, viewObj, priority);
//int16 control = 0;
+
warning("kUpdateScreenItem, view %d, loop %d, cel %d, pri %d", viewId, loopNo, celNo, priority);
return NULL_REG;
}
Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp 2009-12-24 13:50:50 UTC (rev 46527)
+++ scummvm/trunk/engines/sci/sci.cpp 2009-12-24 14:18:16 UTC (rev 46528)
@@ -151,7 +151,8 @@
#ifdef ENABLE_SCI32
if (getSciVersion() >= SCI_VERSION_2) {
// Falsify the Views with a Dummy GUI
- _gamestate->_gui = new SciGuiDummy(_gamestate, screen, palette, cursor);
+ //_gamestate->_gui = new SciGuiDummy(_gamestate, screen, palette, cursor);
+ _gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor); // new
} else {
#endif
#ifdef INCLUDE_OLDGFX
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