[Scummvm-cvs-logs] SF.net SVN: scummvm:[45661] scummvm/trunk/engines/sci
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Wed Nov 4 13:54:32 CET 2009
Revision: 45661
http://scummvm.svn.sourceforge.net/scummvm/?rev=45661&view=rev
Author: m_kiewitz
Date: 2009-11-04 12:54:27 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
SCI/newgui: kGraph / InitPriority changed to reflect sci0 implementation, also moved code
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-11-04 12:19:05 UTC (rev 45660)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-11-04 12:54:27 UTC (rev 45661)
@@ -267,8 +267,9 @@
break;
case K_GRAPH_ADJUST_PRIORITY:
- debugC(2, kDebugLevelGraphics, "adjust_priority(%d, %d)\n", argv[1].toSint16(), argv[2].toSint16());
- s->_gui->modifyPriorityBands(argv[1].toSint16() - 10, argv[2].toSint16() - 10);
+ // Seems to be only implemented for SCI0/SCI01 games
+ debugC(2, kDebugLevelGraphics, "adjust_priority(%d, %d)\n", argv[1].toUint16(), argv[2].toUint16());
+ s->_gui->graphAdjustPriority(argv[1].toUint16(), argv[2].toUint16());
break;
case K_GRAPH_SAVE_UPSCALEDHIRES_BOX:
@@ -495,10 +496,10 @@
// WORKAROUND for a problem in LSL1VGA. This allows the casino door to be opened,
// till the actual problem is found
- if (s->_gameName == "lsl1sci" && s->currentRoomNumber() == 300) {
- int top = GET_SEL32V(s->_segMan, object, brTop);
- PUT_SEL32V(s->_segMan, object, brTop, top + 2);
- }
+ //if (s->_gameName == "lsl1sci" && s->currentRoomNumber() == 300) {
+ // int top = GET_SEL32V(s->_segMan, object, brTop);
+ // PUT_SEL32V(s->_segMan, object, brTop, top + 2);
+ //}
return s->r_acc;
}
Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp 2009-11-04 12:19:05 UTC (rev 45660)
+++ scummvm/trunk/engines/sci/gui/gui.cpp 2009-11-04 12:54:27 UTC (rev 45661)
@@ -101,14 +101,6 @@
}
}
-void SciGui::modifyPriorityBands(int top, int bottom) {
- if (_usesOldGfxFunctions) {
- _gfx->PriorityBandsInit(15, top, bottom);
- } else {
- _gfx->PriorityBandsInit(14, top, bottom);
- }
-}
-
void SciGui::wait(int16 ticks) {
uint32 time;
@@ -508,6 +500,14 @@
_gfx->SetPort(oldPort);
}
+void SciGui::graphAdjustPriority(int top, int bottom) {
+ if (_usesOldGfxFunctions) {
+ _gfx->PriorityBandsInit(15, top, bottom);
+ } else {
+ _gfx->PriorityBandsInit(14, top, bottom);
+ }
+}
+
int16 SciGui::picNotValid(int16 newPicNotValid) {
int16 oldPicNotValid = _screen->_picNotValid;
Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h 2009-11-04 12:19:05 UTC (rev 45660)
+++ scummvm/trunk/engines/sci/gui/gui.h 2009-11-04 12:54:27 UTC (rev 45661)
@@ -105,6 +105,7 @@
virtual void graphRestoreBox(reg_t handle);
virtual void graphUpdateBox(Common::Rect rect);
virtual void graphRedrawBox(Common::Rect rect);
+ virtual void graphAdjustPriority(int top, int bottom);
virtual int16 picNotValid(int16 newPicNotValid);
@@ -145,8 +146,6 @@
virtual void portraitShow(Common::String resourceName, Common::Point position, uint16 resourceNum, uint16 noun, uint16 verb, uint16 cond, uint16 seq);
virtual void portraitUnload(uint16 portraitId);
- virtual void modifyPriorityBands(int top, int bottom);
-
virtual bool debugUndither(bool flag);
virtual bool debugShowMap(int mapNo);
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