libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 05:34:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: Fix for object initialisatioon in R2R scene 3500

Browse Source
This commit is contained in:
Paul Gilbert 2013-06-29 19:38:58 -04:00
parent 527b1b9b9c
commit 4dbc1ce5cc
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/tsage/graphics.h
View File

@ -42,7 +42,6 @@ class Rect : public Common::Rect, public Serialisable {
public:
Rect() : Common::Rect() {}
Rect(int16 x1, int16 y1, int16 x2, int16 y2) : Common::Rect(x1, y1, x2, y2) {}
Rect(const Common::Rect &r) : Common::Rect(r) {}
void set(int16 x1, int16 y1, int16 x2, int16 y2);
void collapse(int dx, int dy);

11
engines/tsage/ringworld2/ringworld2_logic.cpp
View File

@ -1396,7 +1396,6 @@ bool MazeUI::setMazePosition(Common::Point pt) {
}
void MazeUI::draw() {
int xs = _rect1.left;
int yPos = 0;
int yInc;
Visage visage;
@ -1429,9 +1428,9 @@ void MazeUI::draw() {
yPos = _rect1.top;
yInc = _height - (_field30 % _height);
Rect srcBounds(Common::Rect(_field2E % _width, _field30 % _height,
_rect1.width(), yInc));
Rect destBounds(Common::Rect(_rect1.left, yPos, _rect1.width(), yInc));
Rect srcBounds(_field2E % _width, _field30 % _height,
(_field2E % _width) + _rect1.width(), (_field30 % _height) + yInc);
Rect destBounds(_rect1.left, yPos, _rect1.right, yPos + yInc);
R2_GLOBALS._screenSurface.copyFrom(_mapImage, srcBounds, destBounds);
} else {
@ -1441,8 +1440,8 @@ void MazeUI::draw() {
yInc = _rect1.bottom - yPos;
}
Rect srcBounds(Common::Rect(0, _field2E, _rect1.width(), yInc));
Rect destBounds(Common::Rect(_rect1.left, yPos, _rect1.width(), yInc));
Rect srcBounds(0, _field2E, _rect1.width(), _field2E + yInc);
Rect destBounds(_rect1.left, yPos, _rect1.right, yPos + yInc);
R2_GLOBALS._screenSurface.copyFrom(_mapImage, srcBounds, destBounds);
}
}

6
engines/tsage/ringworld2/ringworld2_scenes3.cpp
View File

@ -3027,7 +3027,7 @@ void Scene3500::Actor7::sub109466(int arg1, int arg2, int arg3, int arg4, int ar
_fieldAC = _fieldAA / _fieldA8;
postInit();
setup(10501, 3, 1);
setup(1050, 3, 1);
fixPriority(255);
sub109663(arg5);
}
@ -3616,7 +3616,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
_item7.setDetails(96, 3500, 12, 10, -1);
_actor8.postInit();
_actor8.setup(10501, 1, 1);
_actor8.setup(1050, 1, 1);
_actor8.setPosition(Common::Point(160, 73));
_actor8.fixPriority(1);
@ -3670,9 +3670,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
_mazeUI.setMazePosition(_position1);
_action1._field24 = 0;
warning("gfx_set_pane_p()");
_mazeUI.draw();
warning("gfx_set_pane_p()");
_field1286 = 1;
R2_GLOBALS._player.postInit();