[Scummvm-git-logs] scummvm master -> 8fff8bcb3eb65a5ac636358421d4fb89ebd2c4db

[madmoose]

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

Summary:
bf45db6c58 BLADERUNNER: Add blit and blitToScreen helpers
8fff8bcb3e BLADERUNNER: Fix float conversion warning


Commit: bf45db6c589a75c8b2e19bd734d4e2dd306158c9
    https://github.com/scummvm/scummvm/commit/bf45db6c589a75c8b2e19bd734d4e2dd306158c9
Author: Thomas Fach-Pedersen (thomas at fach-pedersen.net)
Date: 2017-08-04T21:43:47+02:00

Commit Message:
BLADERUNNER: Add blit and blitToScreen helpers

Changed paths:
    engines/bladerunner/bladerunner.cpp
    engines/bladerunner/bladerunner.h
    engines/bladerunner/outtake.cpp
    engines/bladerunner/scene.cpp
    engines/bladerunner/spinner.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 348d5f7..76c0c3f 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -526,8 +526,7 @@ bool BladeRunnerEngine::loadSplash() {
 
 	img.copyToSurface(&_surfaceGame);
 
-	_system->copyRectToScreen(_surfaceGame.getPixels(), _surfaceGame.pitch, 0, 0, _surfaceGame.w, _surfaceGame.h);
-	_system->updateScreen();
+	blitToScreen(_surfaceGame);
 
 	return true;
 }
@@ -616,9 +615,9 @@ void BladeRunnerEngine::gameTick() {
 			backgroundChanged = true;
 		}
 		(void)backgroundChanged;
-		_surfaceGame.copyRectToSurface(_surfaceInterface.getPixels(), _surfaceInterface.pitch, 0, 0, 640, 480);
+		blit(_surfaceInterface, _surfaceGame);
 		// TODO: remove zbuffer draw
-		//_surface2.copyRectToSurface(_zbuffer->getData(), 1280, 0, 0, 640, 480);
+		// _surfaceGame.copyRectToSurface(_zbuffer->getData(), 1280, 0, 0, 640, 480);
 
 		// TODO: Render overlays
 
@@ -774,8 +773,7 @@ void BladeRunnerEngine::gameTick() {
 			}
 #endif
 
-			_system->copyRectToScreen(_surfaceGame.getPixels(), _surfaceGame.pitch, 0, 0, 640, 480);
-			_system->updateScreen();
+			blitToScreen(_surfaceGame);
 			_system->delayMillis(10);
 		}
 	}
@@ -1019,4 +1017,13 @@ void BladeRunnerEngine::ISez(const char *str) {
 	debug("\t%s", str);
 }
 
+void BladeRunnerEngine::blitToScreen(const Graphics::Surface &src) {
+	_system->copyRectToScreen(src.getPixels(), src.pitch, 0, 0, src.w, src.h);
+	_system->updateScreen();
+}
+
+void blit(const Graphics::Surface &src, Graphics::Surface &dst) {
+	dst.copyRectToSurface(src.getPixels(), src.pitch, 0, 0, src.w, src.h);
+}
+
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index 8fd43df..fd654ac 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -194,12 +194,16 @@ public:
 	void playerGainsControl();
 
 	void ISez(const char *str);
+
+	void blitToScreen(const Graphics::Surface &src);
 };
 
 static inline const Graphics::PixelFormat createRGB555() {
 	return Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
 }
 
+void blit(const Graphics::Surface &src, Graphics::Surface &dst);
+
 } // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/outtake.cpp b/engines/bladerunner/outtake.cpp
index 80e4d78..d600790 100644
--- a/engines/bladerunner/outtake.cpp
+++ b/engines/bladerunner/outtake.cpp
@@ -59,8 +59,7 @@ void OuttakePlayer::play(const Common::String &name, bool noLocalization, int co
 			break;
 
 		if (frame >= 0) {
-			_vm->_system->copyRectToScreen(_vm->_surfaceGame.getPixels(), _vm->_surfaceGame.pitch, 0, 0, 640, 480);
-			_vm->_system->updateScreen();
+			_vm->blitToScreen(_vm->_surfaceGame);
 		}
 
 		_vm->_system->delayMillis(10);
diff --git a/engines/bladerunner/scene.cpp b/engines/bladerunner/scene.cpp
index 1e5297a..f73d0d9 100644
--- a/engines/bladerunner/scene.cpp
+++ b/engines/bladerunner/scene.cpp
@@ -172,7 +172,7 @@ bool Scene::close(bool isLoadingGame) {
 int Scene::advanceFrame() {
 	int frame = _vqaPlayer->update();
 	if (frame >= 0) {
-		_vm->_surfaceGame.copyRectToSurface(_vm->_surfaceInterface.getPixels(), _vm->_surfaceInterface.pitch, 0, 0, 640, 480);
+		blit(_vm->_surfaceInterface, _vm->_surfaceGame);
 		_vqaPlayer->updateZBuffer(_vm->_zbuffer);
 		_vqaPlayer->updateView(_vm->_view);
 		_vqaPlayer->updateLights(_vm->_lights);
diff --git a/engines/bladerunner/spinner.cpp b/engines/bladerunner/spinner.cpp
index 6c30a62..bc447e1 100644
--- a/engines/bladerunner/spinner.cpp
+++ b/engines/bladerunner/spinner.cpp
@@ -247,7 +247,7 @@ void Spinner::tick() {
 	assert(frame >= -1);
 
 	// vqaPlayer renders to _surfaceInterface
-	_vm->_surfaceGame.copyRectToSurface(_vm->_surfaceInterface, 0, 0, Common::Rect(640, 480));
+	blit(_vm->_surfaceInterface, _vm->_surfaceGame);
 
 	_imagePicker->draw(_vm->_surfaceInterface);
 
@@ -260,8 +260,7 @@ void Spinner::tick() {
 	}
 	_vm->_mouse->draw(_vm->_surfaceGame, p.x, p.y);
 
-	_vm->_system->copyRectToScreen(_vm->_surfaceGame.getPixels(), _vm->_surfaceGame.pitch, 0, 0, 640, 480);
-	_vm->_system->updateScreen();
+	_vm->blitToScreen(_vm->_surfaceGame);
 	_vm->_system->delayMillis(10);
 }
 


Commit: 8fff8bcb3eb65a5ac636358421d4fb89ebd2c4db
    https://github.com/scummvm/scummvm/commit/8fff8bcb3eb65a5ac636358421d4fb89ebd2c4db
Author: Thomas Fach-Pedersen (thomas at fach-pedersen.net)
Date: 2017-08-04T21:43:47+02:00

Commit Message:
BLADERUNNER: Fix float conversion warning

Changed paths:
    engines/bladerunner/script/ai/leon.cpp


diff --git a/engines/bladerunner/script/ai/leon.cpp b/engines/bladerunner/script/ai/leon.cpp
index 7c46ad0..63dc3d4 100644
--- a/engines/bladerunner/script/ai/leon.cpp
+++ b/engines/bladerunner/script/ai/leon.cpp
@@ -202,8 +202,8 @@ bool AIScriptLeon::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 			Actor_Says(kActorMcCoy, 565, 18);
 			Actor_Face_Actor(kActorMcCoy, kActorLeon, true);
 			Actor_Says(kActorLeon, 140, 12);
-			Actor_Says_With_Pause(kActorMcCoy, 570, 0.0, 17);
-			Actor_Says_With_Pause(kActorMcCoy, 575, 1.2, 13);
+			Actor_Says_With_Pause(kActorMcCoy, 570, 0.0f, 17);
+			Actor_Says_With_Pause(kActorMcCoy, 575, 1.2f, 13);
 			Actor_Says(kActorLeon, 150, 3);
 			Actor_Says(kActorMcCoy, 580, 3);
 			Actor_Says(kActorLeon, 160, 13);