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

ASYLUM: Revert previous commit!! Commented WorldStats xLeft and yTop from Scene::adjustCoordinates to correct actors and objects Scene scrolling positions.

Browse source 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@592 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
Alexandre Fontoura 2010-11-28 12:53:38 +00:00 • committed by Eugene Sandulenko
parent a6178aa903
commit ce04e57184
No known key found for this signature in database
GPG key ID: 014D387312D34F08
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/asylum/resources/actor.cpp
View file

@ -242,7 +242,7 @@ void Actor::draw() {
// Draw the actor // Draw the actor
Common::Point point; Common::Point point;
Common::Rect frameRect = GraphicResource::getFrameRect(_vm, _resourceId, _frameIndex); Common::Rect frameRect = GraphicResource::getFrameRect(_vm, _resourceId, _frameIndex);
getScene()->adjustCoordinates(frameRect.left + _point.x + _point1.x + getWorld()->xLeft, frameRect.top + _point.y + _point1.y + getWorld()->yTop, &point); getScene()->adjustCoordinates(frameRect.left + _point.x + _point1.x, frameRect.top + _point.y + _point1.y, &point);
// Compute frame index // Compute frame index
uint32 frameIndex = _frameIndex; uint32 frameIndex = _frameIndex;

2
engines/asylum/resources/object.cpp
View file

@ -191,7 +191,7 @@ void Object::draw() {
// Draw the object // Draw the object
Common::Point point; Common::Point point;
Common::Rect frameRect = GraphicResource::getFrameRect(_vm, _resourceId, _frameIndex); Common::Rect frameRect = GraphicResource::getFrameRect(_vm, _resourceId, _frameIndex);
getScene()->adjustCoordinates(x + frameRect.left + getWorld()->xLeft, y + frameRect.top + getWorld()->yTop, &point); getScene()->adjustCoordinates(x + frameRect.left, y + frameRect.top, &point);
if (_field_67C <= 0 || _field_67C >= 4 || Config.performance <= 1) { if (_field_67C <= 0 || _field_67C >= 4 || Config.performance <= 1) {
getScreen()->addGraphicToQueue(_resourceId, _frameIndex, point, (flags >> 11) & kObjectFlag2, _field_67C - 3, _priority); getScreen()->addGraphicToQueue(_resourceId, _frameIndex, point, (flags >> 11) & kObjectFlag2, _field_67C - 3, _priority);

4
engines/asylum/views/scene.cpp
View file

@ -1131,8 +1131,8 @@ void Scene::adjustCoordinates(int32 x, int32 y, Common::Point *point) {
if (!_ws) if (!_ws)
error("[Scene::adjustCoordinates] WorldStats not initialized properly!"); error("[Scene::adjustCoordinates] WorldStats not initialized properly!");
point->x = x - _ws->xLeft; point->x = x;// - _ws->xLeft;
point->y = y - _ws->yTop; point->y = y;// - _ws->yTop;
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////