[Scummvm-git-logs] scummvm master -> 9512cf46b739b2ca37c0e101fa440ece5072b722

[peterkohaut]

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

Summary:
9512cf46b7 BLADERUNNER: Fix build


Commit: 9512cf46b739b2ca37c0e101fa440ece5072b722
    https://github.com/scummvm/scummvm/commit/9512cf46b739b2ca37c0e101fa440ece5072b722
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2017-08-25T00:18:38+02:00

Commit Message:
BLADERUNNER: Fix build

Changed paths:
    engines/bladerunner/settings.h
    engines/bladerunner/spinner.cpp
    engines/bladerunner/vqa_player.h


diff --git a/engines/bladerunner/settings.h b/engines/bladerunner/settings.h
index 105c8fc..713acfe 100644
--- a/engines/bladerunner/settings.h
+++ b/engines/bladerunner/settings.h
@@ -32,7 +32,7 @@ enum PlayerAgenda {
 	kPlayerAgendaNormal = 1,
 	kPlayerAgendaSurly = 2,
 	kPlayerAgendaErratic = 3,
-	kPlayerAgendaUserChoice = 4,
+	kPlayerAgendaUserChoice = 4
 };
 
 class Settings {
diff --git a/engines/bladerunner/spinner.cpp b/engines/bladerunner/spinner.cpp
index acee0cb..6b8cb34 100644
--- a/engines/bladerunner/spinner.cpp
+++ b/engines/bladerunner/spinner.cpp
@@ -62,39 +62,39 @@ bool Spinner::querySelectableDestinationFlag(int destination) const {
 }
 
 SpinnerDestination SpinnerDestinationsNear[] = {
-	{ 0, { 210, 263, 263, 332 } },
-	{ 1, { 307, 330, 361, 381 } },
-	{ 2, { 338, 137, 362, 169 } },
-	{ 3, { 248, 135, 289, 168 } },
-	{ 4, { 352, 222, 379, 238 } },
-	{ -1, { -1,-1,-1,-1 } }
+	{  0, Common::Rect(210, 263, 263, 332) },
+	{  1, Common::Rect(307, 330, 361, 381) },
+	{  2, Common::Rect(338, 137, 362, 169) },
+	{  3, Common::Rect(248, 135, 289, 168) },
+	{  4, Common::Rect(352, 222, 379, 238) },
+	{ -1, Common::Rect(-1,-1,-1,-1) }
 
 };
 
 SpinnerDestination SpinnerDestinationsMedium[] = {
-	{ 0, { 252, 242, 279, 283 } },
-	{ 1, { 301, 273, 328, 304 } },
-	{ 2, { 319, 182, 336, 200 } },
-	{ 3, { 269, 181, 293, 200 } },
-	{ 4, { 325, 227, 345, 240 } },
-	{ 5, { 259,  74, 380, 119 } },
-	{ 6, { 203, 124, 224, 136 } },
-	{ 7, { 200, 147, 222, 170 } },
-	{ -1, { -1,-1,-1,-1 } }
+	{  0, Common::Rect(252, 242, 279, 283) },
+	{  1, Common::Rect(301, 273, 328, 304) },
+	{  2, Common::Rect(319, 182, 336, 200) },
+	{  3, Common::Rect(269, 181, 293, 200) },
+	{  4, Common::Rect(325, 227, 345, 240) },
+	{  5, Common::Rect(259,  74, 380, 119) },
+	{  6, Common::Rect(203, 124, 224, 136) },
+	{  7, Common::Rect(200, 147, 222, 170) },
+	{ -1, Common::Rect(-1,-1,-1,-1) }
 };
 
 SpinnerDestination SpinnerDestinationsFar[] = {
-	{ 0, { 220, 227, 246, 262 } },
-	{ 1, { 260, 252, 286, 279 } },
-	{ 2, { 286, 178, 302, 196 } },
-	{ 3, { 244, 178, 263, 195 } },
-	{ 4, { 288, 216, 306, 228 } },
-	{ 5, { 249,  77, 353, 124 } },
-	{ 6, { 190, 127, 208, 138 } },
-	{ 7, { 185, 149, 206, 170 } },
-	{ 8, { 398, 249, 419, 268 } },
-	{ 9, { 390, 218, 419, 236 } },
-	{ -1, { -1, -1, -1, -1 } }
+	{  0, Common::Rect(220, 227, 246, 262) },
+	{  1, Common::Rect(260, 252, 286, 279) },
+	{  2, Common::Rect(286, 178, 302, 196) },
+	{  3, Common::Rect(244, 178, 263, 195) },
+	{  4, Common::Rect(288, 216, 306, 228) },
+	{  5, Common::Rect(249,  77, 353, 124) },
+	{  6, Common::Rect(190, 127, 208, 138) },
+	{  7, Common::Rect(185, 149, 206, 170) },
+	{  8, Common::Rect(398, 249, 419, 268) },
+	{  9, Common::Rect(390, 218, 419, 236) },
+	{ -1, Common::Rect(-1, -1, -1, -1) }
 };
 
 static void spinner_mouseInCallback(int, void*);
diff --git a/engines/bladerunner/vqa_player.h b/engines/bladerunner/vqa_player.h
index b60f648..b436567 100644
--- a/engines/bladerunner/vqa_player.h
+++ b/engines/bladerunner/vqa_player.h
@@ -48,7 +48,6 @@ class ZBuffer;
 class VQAPlayer {
 	BladeRunnerEngine           *_vm;
 	Common::SeekableReadStream  *_s;
-	const Graphics::Surface     *_surface;
 	VQADecoder                   _decoder;
 	const uint16                *_zBuffer;
 	Audio::QueuingAudioStream   *_audioStream;
@@ -78,7 +77,6 @@ public:
 	VQAPlayer(BladeRunnerEngine *vm, Graphics::Surface *surface)
 		: _vm(vm),
 		  _s(nullptr),
-		  _surface(surface),
 		  _decoder(surface),
 		  _zBuffer(nullptr),
 		  _audioStream(nullptr),