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

cleanup

Browse source 
svn-id: r6855
This commit is contained in:
Max Horn 2003-03-24 21:56:29 +00:00
parent 12c0a6834a
commit c98130a0a6
2 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scumm/gfx.cpp
View file

@ -1719,20 +1719,17 @@ void Scumm::setCameraAt(int pos_x, int pos_y) {
runScript(_vars[VAR_SCROLL_SCRIPT], 0, 0, 0);
}
} else {
int t;
if (camera._mode != CM_FOLLOW_ACTOR || abs(pos_x - camera._cur.x) > (_realWidth / 2)) {
camera._cur.x = pos_x;
}
camera._dest.x = pos_x;
t = _vars[VAR_CAMERA_MIN_X];
if (camera._cur.x < t)
camera._cur.x = t;
if (camera._cur.x < _vars[VAR_CAMERA_MIN_X])
camera._cur.x = _vars[VAR_CAMERA_MIN_X];
t = _vars[VAR_CAMERA_MAX_X];
if (camera._cur.x > t)
camera._cur.x = t;
if (camera._cur.x > _vars[VAR_CAMERA_MAX_X])
camera._cur.x = _vars[VAR_CAMERA_MAX_X];
if (_vars[VAR_SCROLL_SCRIPT]) {
_vars[VAR_CAMERA_POS_X] = camera._cur.x;