[Scummvm-cvs-logs] scummvm master -> 9b9296069157315d037efc45f900513dffe2d5dc

[bluegr]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
55390e77b1 SCI: Remove unused _gfxScreen parameter from GfxRemap
16a7bcb0c3 SCI32: Implement kBitmapSetDisplace
9b92960691 SCI32: Document kAddLine


Commit: 55390e77b1483284fe5782b742bd1eb126e4b9a1
    https://github.com/scummvm/scummvm/commit/55390e77b1483284fe5782b742bd1eb126e4b9a1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-03-15T11:28:13+02:00

Commit Message:
SCI: Remove unused _gfxScreen parameter from GfxRemap

Changed paths:
    engines/sci/graphics/remap.cpp
    engines/sci/graphics/remap.h
    engines/sci/sci.cpp



diff --git a/engines/sci/graphics/remap.cpp b/engines/sci/graphics/remap.cpp
index 999cfc7..9f4b9f7 100644
--- a/engines/sci/graphics/remap.cpp
+++ b/engines/sci/graphics/remap.cpp
@@ -32,8 +32,8 @@ namespace Sci {
 #pragma mark -
 #pragma mark SCI16 remapping (QFG4 demo)
 
-GfxRemap::GfxRemap(GfxScreen *screen, GfxPalette *palette)
-	: _screen(screen), _palette(palette) {
+GfxRemap::GfxRemap(GfxPalette *palette)
+	: _palette(palette) {
 	_remapOn = false;
 	resetRemapping();
 }
diff --git a/engines/sci/graphics/remap.h b/engines/sci/graphics/remap.h
index cce48ec..b2b37aa 100644
--- a/engines/sci/graphics/remap.h
+++ b/engines/sci/graphics/remap.h
@@ -46,7 +46,7 @@ enum ColorRemappingType {
  */
 class GfxRemap {
 public:
-	GfxRemap(GfxScreen *screen, GfxPalette *_palette);
+	GfxRemap(GfxPalette *_palette);
 	~GfxRemap();
 
 	void resetRemapping();
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index f5ad048..e14d12b 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -689,7 +689,7 @@ void SciEngine::initGraphics() {
 #endif
 		_gfxPalette16 = new GfxPalette(_resMan, _gfxScreen);
 		if (getGameId() == GID_QFG4DEMO)
-			_gfxRemap16 = new GfxRemap(_gfxScreen, _gfxPalette16);
+			_gfxRemap16 = new GfxRemap(_gfxPalette16);
 #ifdef ENABLE_SCI32
 	}
 #endif


Commit: 16a7bcb0c35ff0d97b943d941a252df424c0a427
    https://github.com/scummvm/scummvm/commit/16a7bcb0c35ff0d97b943d941a252df424c0a427
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-03-15T11:29:24+02:00

Commit Message:
SCI32: Implement kBitmapSetDisplace

Changed paths:
    engines/sci/engine/kgraphics32.cpp



diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index 63c1b1f..429d3b5 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -657,9 +657,11 @@ reg_t kBitmapInvert(EngineState *s, int argc, reg_t *argv) {
 }
 
 reg_t kBitmapSetDisplace(EngineState *s, int argc, reg_t *argv) {
-	// bitmap, x, y
+	BitmapResource bitmap(argv[0]);
+	Common::Point newPos(argv[1].toUint16(), argv[2].toUint16());
+	bitmap.setDisplace(newPos);
 
-	return kStubNull(s, argc + 1, argv - 1);
+	return s->r_acc;
 }
 
 reg_t kBitmapCreateFromView(EngineState *s, int argc, reg_t *argv) {


Commit: 9b9296069157315d037efc45f900513dffe2d5dc
    https://github.com/scummvm/scummvm/commit/9b9296069157315d037efc45f900513dffe2d5dc
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-03-15T11:30:53+02:00

Commit Message:
SCI32: Document kAddLine

Changed paths:
    engines/sci/engine/kgraphics32.cpp



diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index 429d3b5..30cae5d 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -711,12 +711,12 @@ reg_t kAddLine(EngineState *s, int argc, reg_t *argv) {
 	reg_t plane = argv[0];
 	Common::Point startPoint(argv[1].toUint16(), argv[2].toUint16());
 	Common::Point endPoint(argv[3].toUint16(), argv[4].toUint16());
-	// argv[5] is unknown (a number, usually 200)
+	byte priority = (byte)argv[5].toUint16();
 	byte color = (byte)argv[6].toUint16();
-	byte priority = (byte)argv[7].toUint16();
-	byte control = (byte)argv[8].toUint16();
-	// argv[9] is unknown (usually a small number, 1 or 2). Thickness, perhaps?
-//	return g_sci->_gfxFrameout->addPlaneLine(plane, startPoint, endPoint, color, priority, control);
+	byte style = (byte)argv[7].toUint16();	// 0: solid, 1: dashed, 2: pattern
+	byte pattern = (byte)argv[8].toUint16();
+	byte thickness = (byte)argv[9].toUint16();
+//	return g_sci->_gfxFrameout->addPlaneLine(plane, startPoint, endPoint, color, priority, 0);
 	return s->r_acc;
 #endif
 }