From b6d1c45bb7ece9eab12f3bc958923112662232fb Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 17 Aug 2010 10:19:06 +0000
Subject: GOB: Fix warnings about potentially uninitialized vars.

svn-id: r52142
---
 engines/gob/inter_v6.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/gob/inter_v6.cpp')

diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index 73ef46bf31..a5a4f7d666 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -171,7 +171,7 @@ void Inter_v6::o6_playVmdOrMusic() {
 
 	_vm->_vidPlayer->evaluateFlags(props);
 
-	int slot;
+	int slot = 0;
 	if ((fileName[0] != 0) && ((slot = _vm->_vidPlayer->openVideo(true, fileName, props)) < 0)) {
 		WRITE_VAR(11, (uint32) -1);
 		return;
-- 
cgit v1.2.3


From e68b6e9f15b9025cd587273da8eaa089670cc0b0 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 30 Sep 2010 13:00:30 +0000
Subject: GOB: Remove dither stuff, commenting out most v6 drawing

svn-id: r52945
---
 engines/gob/inter_v6.cpp | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'engines/gob/inter_v6.cpp')

diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index a5a4f7d666..fc81de757e 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -65,7 +65,6 @@ void Inter_v6::setupOpcodesFunc() {
 
 	OPCODEFUNC(0x03, o6_loadCursor);
 	OPCODEFUNC(0x09, o6_assign);
-	OPCODEFUNC(0x13, o6_palLoad);
 	OPCODEFUNC(0x19, o6_removeHotspot);
 	OPCODEFUNC(0x33, o6_fillRect);
 }
@@ -357,17 +356,6 @@ bool Inter_v6::o6_assign(OpFuncParams &params) {
 	return false;
 }
 
-bool Inter_v6::o6_palLoad(OpFuncParams &params) {
-	o1_palLoad(params);
-
-	if (_gotFirstPalette)
-		_vm->_video->_palLUT->setPalette((const byte *)_vm->_global->_pPaletteDesc->vgaPal,
-				Graphics::PaletteLUT::kPaletteRGB, 6, 0);
-
-	_gotFirstPalette = true;
-	return false;
-}
-
 bool Inter_v6::o6_removeHotspot(OpFuncParams &params) {
 	int16 id;
 	uint8 stateType1    = Hotspots::kStateFilledDisabled | Hotspots::kStateType1;
-- 
cgit v1.2.3


From 51fd528fe56e00466255d54e1e71b19f34729bfd Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 30 Sep 2010 13:02:16 +0000
Subject: GOB: Change all drawing to use class Surface

svn-id: r52947
---
 engines/gob/inter_v6.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'engines/gob/inter_v6.cpp')

diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index fc81de757e..c6d0211c8f 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -238,7 +238,7 @@ bool Inter_v6::o6_loadCursor(OpFuncParams &params) {
 			props.lastFrame  = i;
 
 			_vm->_vidPlayer->play(vmdSlot, props);
-			_vm->_vidPlayer->copyFrame(vmdSlot, _vm->_draw->_cursorSprites->getVidMem(),
+			_vm->_vidPlayer->copyFrame(vmdSlot, _vm->_draw->_cursorSprites->getData(),
 					0, 0, _vm->_draw->_cursorWidth, _vm->_draw->_cursorWidth,
 					(start + i) * _vm->_draw->_cursorWidth, 0,
 					_vm->_draw->_cursorSprites->getWidth());
@@ -262,8 +262,7 @@ bool Inter_v6::o6_loadCursor(OpFuncParams &params) {
 	if (!resource)
 		return false;
 
-	_vm->_video->fillRect(*_vm->_draw->_cursorSprites,
-			index * _vm->_draw->_cursorWidth, 0,
+	_vm->_draw->_cursorSprites->fillRect(index * _vm->_draw->_cursorWidth, 0,
 			index * _vm->_draw->_cursorWidth + _vm->_draw->_cursorWidth - 1,
 			_vm->_draw->_cursorHeight - 1, 0);
 
-- 
cgit v1.2.3