[Scummvm-cvs-logs] scummvm master -> bd81da1a6a7604805c927073f086767c5baf2bac
csnover
csnover at users.noreply.github.com
Tue Mar 15 20:32:31 CET 2016
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:
bd81da1a6a SCI32: Initialise all scaler tables
Commit: bd81da1a6a7604805c927073f086767c5baf2bac
https://github.com/scummvm/scummvm/commit/bd81da1a6a7604805c927073f086767c5baf2bac
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-15T14:30:57-05:00
Commit Message:
SCI32: Initialise all scaler tables
Initialising only the first table means that if the first ratios
aren't 1:1 but the *second* ratios are 1:1, the second ratios will
read from an uninitialised table.
Changed paths:
engines/sci/graphics/celobj32.h
diff --git a/engines/sci/graphics/celobj32.h b/engines/sci/graphics/celobj32.h
index 8d030cf..14d9fa3 100644
--- a/engines/sci/graphics/celobj32.h
+++ b/engines/sci/graphics/celobj32.h
@@ -180,13 +180,16 @@ public:
CelScaler() :
_scaleTables(),
_activeIndex(0) {
- CelScalerTable &table = _scaleTables[_activeIndex];
+ CelScalerTable &table = _scaleTables[0];
table.scaleX = Ratio();
table.scaleY = Ratio();
for (int i = 0; i < ARRAYSIZE(table.valuesX); ++i) {
table.valuesX[i] = i;
table.valuesY[i] = i;
}
+ for (int i = 1; i < ARRAYSIZE(_scaleTables); ++i) {
+ _scaleTables[i] = _scaleTables[0];
+ }
}
/**
More information about the Scummvm-git-logs
mailing list