libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add patch #1060453 - MIVGA: Actor Scale Patch

Browse Source 
svn-id: r15712
This commit is contained in:
Travis Howell 2004-11-05 05:13:56 +00:00
parent 775bd838c7
commit df17c27ebf
3 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/actor.cpp
View File

@ -1036,7 +1036,7 @@ void Actor::drawActorCostume(bool hitTestMode) {
bcr->_clipOverride = _clipOverride; bcr->_clipOverride = _clipOverride;
if (_vm->_version == 4 && boxscale & 0x8000) { if (_vm->_version == 4 && boxscale & 0x8000) {
bcr->_scaleX = bcr->_scaleY = _vm->getScale(_walkbox, _pos.x, _pos.y); bcr->_scaleX = bcr->_scaleY = _vm->getScaleFromSlot((boxscale & 0x7fff) + 1, _pos.x, _pos.y);
} else { } else {
bcr->_scaleX = scalex; bcr->_scaleX = scalex;
bcr->_scaleY = scaley; bcr->_scaleY = scaley;

72
scumm/boxes.cpp
View File

@ -177,40 +177,46 @@ int ScummEngine::getScale(int box, int x, int y) {
// Was a scale slot specified? If so, we compute the effective scale // Was a scale slot specified? If so, we compute the effective scale
// from it, ignoring the box scale. // from it, ignoring the box scale.
if (slot) { if (slot)
assert(1 <= slot && slot <= ARRAYSIZE(_scaleSlots)); scale = getScaleFromSlot(slot, x, y);
int scaleX = 0, scaleY = 0;
ScaleSlot &s = _scaleSlots[slot-1]; return scale;
}
if (s.y1 == s.y2 && s.x1 == s.x2)
error("Invalid scale slot %d", slot);
int ScummEngine::getScaleFromSlot(int slot, int x, int y) {
if (s.y1 != s.y2) { assert(1 <= slot && slot <= ARRAYSIZE(_scaleSlots));
if (y < 0) int scale;
y = 0; int scaleX = 0, scaleY = 0;
ScaleSlot &s = _scaleSlots[slot-1];
scaleY = (s.scale2 - s.scale1) * (y - s.y1) / (s.y2 - s.y1) + s.scale1;
} if (s.y1 == s.y2 && s.x1 == s.x2)
if (s.x1 == s.x2) { error("Invalid scale slot %d", slot);
scale = scaleY;
} else { if (s.y1 != s.y2) {
scaleX = (s.scale2 - s.scale1) * (x - s.x1) / (s.x2 - s.x1) + s.scale1; if (y < 0)
y = 0;
if (s.y1 == s.y2) {
scale = scaleX; scaleY = (s.scale2 - s.scale1) * (y - s.y1) / (s.y2 - s.y1) + s.scale1;
} else { }
scale = (scaleX + scaleY) / 2; if (s.x1 == s.x2) {
} scale = scaleY;
} } else {
scaleX = (s.scale2 - s.scale1) * (x - s.x1) / (s.x2 - s.x1) + s.scale1;
// Clip the scale to range 1-255
if (scale < 1) if (s.y1 == s.y2) {
scale = 1; scale = scaleX;
else if (scale > 255) } else {
scale = 255; scale = (scaleX + scaleY) / 2;
} }
}
// Clip the scale to range 1-255
if (scale < 1)
scale = 1;
else if (scale > 255)
scale = 255;
// Finally return the scale
return scale; return scale;
} }

1
scumm/scumm.h
View File

@ -1117,6 +1117,7 @@ public:
int getBoxScale(int box); int getBoxScale(int box);
int getScale(int box, int x, int y); int getScale(int box, int x, int y);
int getScaleFromSlot(int slot, int x, int y);
protected: protected:
// Scaling slots/items // Scaling slots/items