thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHERLOCK: Reverse scaling factor in transBlitFrom to match original

Browse source 
Original uses scale amounts > 256 for image reduction, and values
less than that for image expansion
This commit is contained in:
Paul Gilbert 2015-06-06 15:36:23 -04:00
parent e28aa3af79
commit 2ac05321aa
3 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
engines/sherlock/resources.cpp
View file

@ -514,11 +514,11 @@ int ImageFrame::sDrawXSize(int scaleVal) const {
int width = _width;
int scale = scaleVal == 0 ? 1 : scaleVal;
if (scaleVal >= 256)
if (scaleVal >= SCALE_THRESHOLD)
--width;
int result = width * 256 / scale;
if (scaleVal >= 256)
int result = width * SCALE_THRESHOLD / scale;
if (scaleVal >= SCALE_THRESHOLD)
++result;
return result;
@ -528,11 +528,11 @@ int ImageFrame::sDrawYSize(int scaleVal) const {
int height = _height;
int scale = scaleVal == 0 ? 1 : scaleVal;
if (scaleVal >= 256)
if (scaleVal >= SCALE_THRESHOLD)
--height;
int result = height * 256 / scale;
if (scaleVal >= 256)
int result = height * SCALE_THRESHOLD / scale;
if (scaleVal >= SCALE_THRESHOLD)
++result;
return result;
@ -542,11 +542,11 @@ int ImageFrame::sDrawXOffset(int scaleVal) const {
int width = _offset.x;
int scale = scaleVal == 0 ? 1 : scaleVal;
if (scaleVal >= 256)
if (scaleVal >= SCALE_THRESHOLD)
--width;
int result = width * 256 / scale;
if (scaleVal >= 256)
int result = width * SCALE_THRESHOLD / scale;
if (scaleVal >= SCALE_THRESHOLD)
++result;
return result;
@ -556,11 +556,11 @@ int ImageFrame::sDrawYOffset(int scaleVal) const {
int height = _offset.y;
int scale = scaleVal == 0 ? 1 : scaleVal;
if (scaleVal >= 256)
if (scaleVal >= SCALE_THRESHOLD)
--height;
int result = height * 256 / scale;
if (scaleVal >= 256)
int result = height * SCALE_THRESHOLD / scale;
if (scaleVal >= SCALE_THRESHOLD)
++result;
return result;