SCI/newgui: kGraph / InitPriority changed to reflect sci0 implementation, also moved code

svn-id: r45661

3 files changed, 16 insertions, 16 deletions

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index f26e014b2d..1950a606ac 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -267,8 +267,9 @@ reg_t kGraph(EngineState *s, int argc, reg_t *argv) {
 		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 @@ reg_t kBaseSetter(EngineState *s, int argc, reg_t *argv) {
 
 	// 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;
 }
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index baca9e5005..6f7ab143e7 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -101,14 +101,6 @@ void SciGui::initPriorityBands() {
 	}
 }
 
-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 @@ void SciGui::graphRedrawBox(Common::Rect rect) {
 	_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;
 
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index f1cef36a6f..008aae1c92 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -105,6 +105,7 @@ public:
 	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 @@ public:
 	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);