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

LAB: Cleanup of roomCords()

Browse Source
This commit is contained in:
Filippos Karapetis 2015-12-03 14:30:32 +02:00 committed by Willem Jan Palenstijn
parent f7fe91c8d2
commit 914bd26295
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/lab/map.cpp
View File

@ -252,34 +252,29 @@ void fade(bool fadein, uint16 res) {
/* Figures out what a room's coordinates should be. */
/*****************************************************************************/
static void roomCords(uint16 CurRoom, uint16 *x1, uint16 *y1, uint16 *x2, uint16 *y2) {
*x1 = mapScaleX(Maps[CurRoom].x);
*y1 = mapScaleY(Maps[CurRoom].y);
*x2 = *x1;
*y2 = *y1;
Image *curRoomImg = NULL;
switch (Maps[CurRoom].SpecialID) {
case NORMAL:
case UPARROWROOM:
case DOWNARROWROOM:
(*x2) += Room->_width;
(*y2) += Room->_height;
curRoomImg = Room;
break;
case BRIDGEROOM:
(*x2) += Bridge->_width;
(*y2) += Bridge->_height;
curRoomImg = Bridge;
break;
case VCORRIDOR:
(*x2) += VRoom->_width;
(*y2) += VRoom->_height;
curRoomImg = VRoom;
break;
case HCORRIDOR:
(*x2) += HRoom->_width;
(*y2) += HRoom->_height;
curRoomImg = HRoom;
break;
}
*x1 = mapScaleX(Maps[CurRoom].x);
*y1 = mapScaleY(Maps[CurRoom].y);
*x2 = *x1 + curRoomImg->_width;
*y2 = *y1 + curRoomImg->_height;
}
/*****************************************************************************/