[Scummvm-git-logs] scummvm master -> e10296aab5b38bec165ac7cece2a2ae9378089da
dreammaster
paulfgilbert at gmail.com
Mon Feb 24 01:51:37 UTC 2020
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:
e10296aab5 ULTIMA8: Tiny whitespace fixes
Commit: e10296aab5b38bec165ac7cece2a2ae9378089da
https://github.com/scummvm/scummvm/commit/e10296aab5b38bec165ac7cece2a2ae9378089da
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-02-23T17:51:34-08:00
Commit Message:
ULTIMA8: Tiny whitespace fixes
Changed paths:
engines/ultima/ultima8/graphics/palette_manager.cpp
engines/ultima/ultima8/graphics/soft_render_surface.inl
diff --git a/engines/ultima/ultima8/graphics/palette_manager.cpp b/engines/ultima/ultima8/graphics/palette_manager.cpp
index 1874178..c33c390 100644
--- a/engines/ultima/ultima8/graphics/palette_manager.cpp
+++ b/engines/ultima/ultima8/graphics/palette_manager.cpp
@@ -189,12 +189,12 @@ void PaletteManager::getTransformMatrix(int16 matrix[12], PalTransforms trans) {
case Transform_NoRed: {
matrix[0] = 0;
matrix[1] = 0;
- matrix[2] = 0;
- matrix[3] = 0;
+ matrix[2] = 0;
+ matrix[3] = 0;
matrix[4] = 0;
matrix[5] = 0x800;
- matrix[6] = 0;
- matrix[7] = 0;
+ matrix[6] = 0;
+ matrix[7] = 0;
matrix[8] = 0;
matrix[9] = 0;
matrix[10] = 0x800;
@@ -256,12 +256,12 @@ void PaletteManager::getTransformMatrix(int16 matrix[12], PalTransforms trans) {
case Transform_BRG: {
matrix[0] = 0;
matrix[1] = 0x800;
- matrix[2] = 0;
- matrix[3] = 0;
+ matrix[2] = 0;
+ matrix[3] = 0;
matrix[4] = 0;
matrix[5] = 0;
- matrix[6] = 0x800;
- matrix[7] = 0;
+ matrix[6] = 0x800;
+ matrix[7] = 0;
matrix[8] = 0x800;
matrix[9] = 0;
matrix[10] = 0;
@@ -273,12 +273,12 @@ void PaletteManager::getTransformMatrix(int16 matrix[12], PalTransforms trans) {
case Transform_GBR: {
matrix[0] = 0;
matrix[1] = 0;
- matrix[2] = 0x800;
- matrix[3] = 0;
+ matrix[2] = 0x800;
+ matrix[3] = 0;
matrix[4] = 0x800;
matrix[5] = 0;
- matrix[6] = 0;
- matrix[7] = 0;
+ matrix[6] = 0;
+ matrix[7] = 0;
matrix[8] = 0;
matrix[9] = 0x800;
matrix[10] = 0;
@@ -291,12 +291,12 @@ void PaletteManager::getTransformMatrix(int16 matrix[12], PalTransforms trans) {
perr << "Unknown Palette Transformation: " << trans << Std::endl;
matrix[0] = 0x800;
matrix[1] = 0;
- matrix[2] = 0;
- matrix[3] = 0;
+ matrix[2] = 0;
+ matrix[3] = 0;
matrix[4] = 0;
matrix[5] = 0x800;
- matrix[6] = 0;
- matrix[7] = 0;
+ matrix[6] = 0;
+ matrix[7] = 0;
matrix[8] = 0;
matrix[9] = 0;
matrix[10] = 0x800;
diff --git a/engines/ultima/ultima8/graphics/soft_render_surface.inl b/engines/ultima/ultima8/graphics/soft_render_surface.inl
index 1fd5d60..7d95286 100644
--- a/engines/ultima/ultima8/graphics/soft_render_surface.inl
+++ b/engines/ultima/ultima8/graphics/soft_render_surface.inl
@@ -221,7 +221,7 @@ const int32 neg = (FLIP_CONDITIONAL)?-1:0;
int type = dlen & 1;
dlen >>= 1;
- pixptr= line_start+x+XNEG(xpos);
+ pixptr = line_start+x+XNEG(xpos);
endrun = pixptr + XNEG(dlen);
if (!type) {
More information about the Scummvm-git-logs
mailing list