[Scummvm-git-logs] scummvm master -> 036f2221f88f844ea2b19a2f3d341ac671c6183e

[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:
036f2221f8 BLADERUNNER: Fixed typo in pixelFormat name


Commit: 036f2221f88f844ea2b19a2f3d341ac671c6183e
    https://github.com/scummvm/scummvm/commit/036f2221f88f844ea2b19a2f3d341ac671c6183e
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2019-04-17T23:09:01+02:00

Commit Message:
BLADERUNNER: Fixed typo in pixelFormat name

Changed paths:
    engines/bladerunner/bladerunner.cpp
    engines/bladerunner/bladerunner.h
    engines/bladerunner/font.cpp
    engines/bladerunner/image.cpp
    engines/bladerunner/outtake.cpp
    engines/bladerunner/savefile.cpp
    engines/bladerunner/slice_animations.cpp
    engines/bladerunner/slice_renderer.cpp
    engines/bladerunner/ui/esper.cpp
    engines/bladerunner/ui/vk.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index e8a22a8..83f9e17 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -302,7 +302,7 @@ void BladeRunnerEngine::pauseEngineIntern(bool pause) {
 }
 
 Common::Error BladeRunnerEngine::run() {
-	Graphics::PixelFormat format = screenPixelForrmat();
+	Graphics::PixelFormat format = screenPixelFormat();
 	initGraphics(640, 480, &format);
 
 	_system->showMouse(true);
@@ -375,8 +375,8 @@ bool BladeRunnerEngine::startup(bool hasSavegames) {
 
 	// This is the original startup in the game
 
-	_surfaceFront.create(640, 480, screenPixelForrmat());
-	_surfaceBack.create(640, 480, screenPixelForrmat());
+	_surfaceFront.create(640, 480, screenPixelFormat());
+	_surfaceBack.create(640, 480, screenPixelFormat());
 
 	_time = new Time(this);
 
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index fad396d..39e166d 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -312,7 +312,7 @@ static inline const Graphics::PixelFormat gameDataPixelFormat() {
 	return Graphics::PixelFormat(2, 5, 5, 5, 1, 10, 5, 0, 15);
 }
 
-static inline const Graphics::PixelFormat screenPixelForrmat() {
+static inline const Graphics::PixelFormat screenPixelFormat() {
 	// Should be a format supported by Android port
 	return Graphics::PixelFormat(2, 5, 5, 5, 1, 11, 6, 1, 0);
 }
diff --git a/engines/bladerunner/font.cpp b/engines/bladerunner/font.cpp
index 6fa90e6..c10c12d 100644
--- a/engines/bladerunner/font.cpp
+++ b/engines/bladerunner/font.cpp
@@ -157,7 +157,7 @@ void Font::reset() {
 	_screenHeight = 0;
 	_spacing1 = 0;
 	_spacing2 = 0;
-	_color = screenPixelForrmat().RGBToColor(255, 255, 255);
+	_color = screenPixelFormat().RGBToColor(255, 255, 255);
 	_intersperse = 0;
 
 	memset(_characters, 0, 256 * sizeof(Character));
diff --git a/engines/bladerunner/image.cpp b/engines/bladerunner/image.cpp
index bdd952b..55ae053 100644
--- a/engines/bladerunner/image.cpp
+++ b/engines/bladerunner/image.cpp
@@ -74,7 +74,7 @@ bool Image::open(const Common::String &name) {
 	}
 
 	_surface.init(width, height, 2*width, data, gameDataPixelFormat());
-	_surface.convertToInPlace(screenPixelForrmat());
+	_surface.convertToInPlace(screenPixelFormat());
 
 	delete[] buf;
 	delete stream;
diff --git a/engines/bladerunner/outtake.cpp b/engines/bladerunner/outtake.cpp
index e38dff1..74ac44a 100644
--- a/engines/bladerunner/outtake.cpp
+++ b/engines/bladerunner/outtake.cpp
@@ -35,7 +35,7 @@ namespace BladeRunner {
 
 OuttakePlayer::OuttakePlayer(BladeRunnerEngine *vm) {
 	_vm = vm;
-	_surfaceVideo.create(_vm->_surfaceBack.w, _vm->_surfaceBack.h, screenPixelForrmat());
+	_surfaceVideo.create(_vm->_surfaceBack.w, _vm->_surfaceBack.h, screenPixelFormat());
 }
 
 OuttakePlayer::~OuttakePlayer() {
diff --git a/engines/bladerunner/savefile.cpp b/engines/bladerunner/savefile.cpp
index 0a20f50..86e2fe7 100644
--- a/engines/bladerunner/savefile.cpp
+++ b/engines/bladerunner/savefile.cpp
@@ -144,7 +144,7 @@ bool SaveFileManager::readHeader(Common::SeekableReadStream &in, SaveFileHeader
 		s.read(thumbnailData, kThumbnailSize);
 
 		header._thumbnail->init(80, 60, 160, thumbnailData, gameDataPixelFormat());
-		header._thumbnail->convertToInPlace(screenPixelForrmat());
+		header._thumbnail->convertToInPlace(screenPixelFormat());
 		s.seek(pos);
 	}
 
diff --git a/engines/bladerunner/slice_animations.cpp b/engines/bladerunner/slice_animations.cpp
index 2cff038..f4fc134 100644
--- a/engines/bladerunner/slice_animations.cpp
+++ b/engines/bladerunner/slice_animations.cpp
@@ -57,7 +57,7 @@ bool SliceAnimations::open(const Common::String &name) {
 			_palettes[i].color[j].b = color_b;
 
 			const int bladeToScummVmConstant = 256 / 32; // 5 bits to 8 bits
-			uint16 rgb555 = screenPixelForrmat().RGBToColor(color_r * bladeToScummVmConstant, color_g * bladeToScummVmConstant, color_b * bladeToScummVmConstant);
+			uint16 rgb555 = screenPixelFormat().RGBToColor(color_r * bladeToScummVmConstant, color_g * bladeToScummVmConstant, color_b * bladeToScummVmConstant);
 			_palettes[i].color555[j] = rgb555;
 		}
 	}
diff --git a/engines/bladerunner/slice_renderer.cpp b/engines/bladerunner/slice_renderer.cpp
index e497b15..4c34053 100644
--- a/engines/bladerunner/slice_renderer.cpp
+++ b/engines/bladerunner/slice_renderer.cpp
@@ -36,7 +36,7 @@ namespace BladeRunner {
 
 SliceRenderer::SliceRenderer(BladeRunnerEngine *vm) {
 	_vm = vm;
-	_pixelFormat = screenPixelForrmat();
+	_pixelFormat = screenPixelFormat();
 
 	for (int i = 0; i < 942; i++) { // yes, its going just to 942 and not 997
 		_animationsShadowEnabled[i] = true;
diff --git a/engines/bladerunner/ui/esper.cpp b/engines/bladerunner/ui/esper.cpp
index 513b980..de41a19 100644
--- a/engines/bladerunner/ui/esper.cpp
+++ b/engines/bladerunner/ui/esper.cpp
@@ -97,7 +97,7 @@ void ESPER::open(Graphics::Surface *surface) {
 
 	_surfacePhoto.create(kPhotoWidth, kPhotoHeight, gameDataPixelFormat());
 
-	_surfaceViewport.create(_screen.width(), _screen.height(), screenPixelForrmat());
+	_surfaceViewport.create(_screen.width(), _screen.height(), screenPixelFormat());
 
 	_viewportNext = _viewport;
 
diff --git a/engines/bladerunner/ui/vk.cpp b/engines/bladerunner/ui/vk.cpp
index 821cf26..a68ec60 100644
--- a/engines/bladerunner/ui/vk.cpp
+++ b/engines/bladerunner/ui/vk.cpp
@@ -115,7 +115,7 @@ void VK::open(int actorId, int calibrationRatio) {
 		return;
 	}
 
-	_surfaceEye.create(172, 116, screenPixelForrmat());
+	_surfaceEye.create(172, 116, screenPixelFormat());
 	_vqaPlayerEye = new VQAPlayer(_vm, &_surfaceEye, eyeVqa);
 	if (!_vqaPlayerEye->open()) {
 		return;