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

LAB: Fix a regression in roomCoords()

Browse source
This commit is contained in:
Filippos Karapetis 2015-12-04 22:52:55 +02:00 • committed by Willem Jan Palenstijn
parent dddd07cc87
commit 6f3644f377
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/lab/map.cpp
View file

@ -253,12 +253,20 @@ static void roomCoords(uint16 CurRoom, uint16 *x1, uint16 *y1, uint16 *x2, uint1
case HCORRIDOR: case HCORRIDOR:
curRoomImg = HRoom; curRoomImg = HRoom;
break; break;
default:
// Some rooms (like the map) do not have an image
break;
} }
*x1 = mapScaleX(Maps[CurRoom].x); *x1 = mapScaleX(Maps[CurRoom].x);
*y1 = mapScaleY(Maps[CurRoom].y); *y1 = mapScaleY(Maps[CurRoom].y);
*x2 = *x1 + curRoomImg->_width; *x2 = *x1;
*y2 = *y1 + curRoomImg->_height; *y2 = *y1;
if (curRoomImg) {
*x2 += curRoomImg->_width;
*y2 += curRoomImg->_height;
}
} }
/*****************************************************************************/ /*****************************************************************************/