SCI: kAddToPic, kAnimate and kSetNowSeen transferred to SciGUI32, not yet implemented in newgui

svn-id: r44606

4 files changed, 23 insertions, 3 deletions

diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index f9660462eb..a01aed81cd 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -325,6 +325,22 @@ int16 SciGUI::onControl(byte screenMask, Common::Rect rect) {
 	return result;
 }
 
+void SciGUI::animate(reg_t castListReference, bool cycle, int argc, reg_t *argv) {
+	// FIXME: port over from gregs engine
+}
+
+void SciGUI::addToPicList(reg_t listReference, int argc, reg_t *argv) {
+	// FIXME: port over from gregs engine
+}
+
+void SciGUI::addToPicView(sciResourceId viewId, uint16 loopNo, uint16 cellNo, int16 leftPos, int16 topPos, int16 priority, int16 control) {
+	// FIXME: port over from gregs engine
+}
+
+void SciGUI::setNowSeen(reg_t objectReference) {
+	// FIXME: port over from gregs engine
+}
+
 void SciGUI::moveCursor(int16 x, int16 y) {
 	Common::Point newPos;
 	
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index de2353733e..bffaa0f1a9 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -75,6 +75,11 @@ public:
 	virtual void paletteAnimate(int fromColor, int toColor, int speed);
 
 	virtual int16 onControl(byte screenMask, Common::Rect rect);
+	// FIXME: argc/argv because of gui32.cpp, should get removed sometime
+	virtual void animate(reg_t listReference, bool cycle, int argc, reg_t *argv);
+	virtual void addToPicList(reg_t listReference, int argc, reg_t *argv);
+	virtual void addToPicView(sciResourceId viewId, uint16 loopNo, uint16 cellNo, int16 leftPos, int16 topPos, int16 priority, int16 control);
+	virtual void setNowSeen(reg_t objectReference);
 
 	virtual void moveCursor(int16 x, int16 y);
 
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp
index b417eb4fe8..4001ea06c5 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/gui/gui_gfx.cpp
@@ -916,7 +916,7 @@ void SciGUIgfx::Draw_Line(int16 left, int16 top, int16 right, int16 bottom, byte
 void SciGUIgfx::Draw_Horiz(int16 left, int16 right, int16 top, byte flag, byte color, byte prio, byte control) {
 	if (right < left)
 		SWAP(right, left);
-	for (int i = left; i <= right; i++)
+	for (int i = left; i < right; i++)
 		_screen->Put_Pixel(i, top, flag, color, prio, control);
 }
 
@@ -924,7 +924,7 @@ void SciGUIgfx::Draw_Horiz(int16 left, int16 right, int16 top, byte flag, byte c
 void SciGUIgfx::Draw_Vert(int16 top, int16 bottom, int16 left, byte flag, byte color, byte prio, byte control) {
 	if (top > bottom)
 		SWAP(top, bottom);
-	for (int i = top; i <= bottom; i++)
+	for (int i = top; i < bottom; i++)
 		_screen->Put_Pixel(left, i, flag, color, prio, control);
 }
 
diff --git a/engines/sci/gui/gui_view.cpp b/engines/sci/gui/gui_view.cpp
index f190d5245a..f795565483 100644
--- a/engines/sci/gui/gui_view.cpp
+++ b/engines/sci/gui/gui_view.cpp
@@ -241,7 +241,6 @@ byte *SciGUIview::getBitmap(uint16 loopNo, uint16 cellNo) {
 
 	uint16 width = _loop[loopNo].cell[cellNo].width;
 	uint16 height = _loop[loopNo].cell[cellNo].height;
-//	byte *ptr = _resourceData + _loop[loopNo].cell[cellNo].offset;
 	// allocating memory to store cel's bitmap
 	assert(width * height <= 64000);
 	uint16 pixelCount = width * height;