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

LAB: Merge the different X image maps

Browse source
This commit is contained in:
Filippos Karapetis 2015-12-13 20:29:58 +02:00 • committed by Willem Jan Palenstijn
parent 2e09975086
commit 99e09b2ca2
3 changed files with 21 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/lab/lab.cpp
View file

@ -118,11 +118,8 @@ LabEngine::LabEngine(OSystem *syst, const ADGameDescription *gameDesc)
_imgMaze = nullptr; _imgMaze = nullptr;
_imgHugeMaze = nullptr; _imgHugeMaze = nullptr;
_imgPath = nullptr; _imgPath = nullptr;
_imgMapNorth = nullptr; for (int i = 0; i < 4; i++)
_imgMapEast = nullptr; _imgMapX[i] = nullptr;
_imgMapSouth = nullptr;
_imgMapWest = nullptr;
_imgXMark = nullptr;
_maps = nullptr; _maps = nullptr;
_blankJournal = nullptr; _blankJournal = nullptr;

4
engines/lab/lab.h
View file

@ -118,8 +118,8 @@ private:
ButtonList _journalButtonList; ButtonList _journalButtonList;
ButtonList _mapButtonList; ButtonList _mapButtonList;
Image *_imgMap, *_imgRoom, *_imgUpArrowRoom, *_imgDownArrowRoom, *_imgBridge; Image *_imgMap, *_imgRoom, *_imgUpArrowRoom, *_imgDownArrowRoom, *_imgBridge;
Image *_imgHRoom, *_imgVRoom, *_imgMaze, *_imgHugeMaze, *_imgPath, *_imgMapNorth; Image *_imgHRoom, *_imgVRoom, *_imgMaze, *_imgHugeMaze, *_imgPath;
Image *_imgMapEast, *_imgMapSouth, *_imgMapWest, *_imgXMark; Image *_imgMapX[4];
InventoryData *_inventory; InventoryData *_inventory;
MapData *_maps; MapData *_maps;
byte *_blankJournal; byte *_blankJournal;

50
engines/lab/map.cpp
View file

@ -71,10 +71,10 @@ void LabEngine::loadMapData() {
_imgMaze = new Image(mapImages); _imgMaze = new Image(mapImages);
_imgHugeMaze = new Image(mapImages); _imgHugeMaze = new Image(mapImages);
_imgMapNorth = new Image(mapImages); _imgMapX[NORTH] = new Image(mapImages);
_imgMapEast = new Image(mapImages); _imgMapX[EAST] = new Image(mapImages);
_imgMapSouth = new Image(mapImages); _imgMapX[SOUTH] = new Image(mapImages);
_imgMapWest = new Image(mapImages); _imgMapX[WEST] = new Image(mapImages);
_imgPath = new Image(mapImages); _imgPath = new Image(mapImages);
_imgBridge = new Image(mapImages); _imgBridge = new Image(mapImages);
@ -115,11 +115,8 @@ void LabEngine::freeMapData() {
delete _imgMaze; delete _imgMaze;
delete _imgHugeMaze; delete _imgHugeMaze;
delete _imgPath; delete _imgPath;
delete _imgMapNorth; for (int i = 0; i < 4; i++)
delete _imgMapEast; delete _imgMapX[i];
delete _imgMapSouth;
delete _imgMapWest;
// _imgXMark is a pointer to one of the four buffers above
delete[] _maps; delete[] _maps;
_imgMap = nullptr; _imgMap = nullptr;
@ -132,11 +129,8 @@ void LabEngine::freeMapData() {
_imgMaze = nullptr; _imgMaze = nullptr;
_imgHugeMaze = nullptr; _imgHugeMaze = nullptr;
_imgPath = nullptr; _imgPath = nullptr;
_imgMapNorth = nullptr; for (int i = 0; i < 4; i++)
_imgMapEast = nullptr; _imgMapX[i] = nullptr;
_imgMapSouth = nullptr;
_imgMapWest = nullptr;
_imgXMark = nullptr;
_maps = nullptr; _maps = nullptr;
} }
@ -216,16 +210,16 @@ void LabEngine::drawRoomMap(uint16 curRoom, bool drawMarkFl) {
if (WESTDOOR & flags) if (WESTDOOR & flags)
_imgPath->drawImage(x - _imgPath->_width, y + offset); _imgPath->drawImage(x - _imgPath->_width, y + offset);
drawX = x + (_imgRoom->_width - _imgXMark->_width) / 2; drawX = x + (_imgRoom->_width - _imgMapX[_direction]->_width) / 2;
drawY = y + (_imgRoom->_height - _imgXMark->_height) / 2; drawY = y + (_imgRoom->_height - _imgMapX[_direction]->_height) / 2;
break; break;
case BRIDGEROOM: case BRIDGEROOM:
_imgBridge->drawImage(x, y); _imgBridge->drawImage(x, y);
drawX = x + (_imgBridge->_width - _imgXMark->_width) / 2; drawX = x + (_imgBridge->_width - _imgMapX[_direction]->_width) / 2;
drawY = y + (_imgBridge->_height - _imgXMark->_height) / 2; drawY = y + (_imgBridge->_height - _imgMapX[_direction]->_height) / 2;
break; break;
@ -262,8 +256,8 @@ void LabEngine::drawRoomMap(uint16 curRoom, bool drawMarkFl) {
if (WESTMDOOR & flags) if (WESTMDOOR & flags)
_imgPath->drawImage(x - _imgPath->_width, y - offset - _imgPath->_height + _imgVRoom->_height); _imgPath->drawImage(x - _imgPath->_width, y - offset - _imgPath->_height + _imgVRoom->_height);
drawX = x + (_imgVRoom->_width - _imgXMark->_width) / 2; drawX = x + (_imgVRoom->_width - _imgMapX[_direction]->_width) / 2;
drawY = y + (_imgVRoom->_height - _imgXMark->_height) / 2; drawY = y + (_imgVRoom->_height - _imgMapX[_direction]->_height) / 2;
break; break;
@ -300,8 +294,8 @@ void LabEngine::drawRoomMap(uint16 curRoom, bool drawMarkFl) {
if (WESTDOOR & flags) if (WESTDOOR & flags)
_imgPath->drawImage(x - _imgPath->_width, y + offset); _imgPath->drawImage(x - _imgPath->_width, y + offset);
drawX = x + (_imgHRoom->_width - _imgXMark->_width) / 2; drawX = x + (_imgHRoom->_width - _imgMapX[_direction]->_width) / 2;
drawY = y + (_imgHRoom->_height - _imgXMark->_height) / 2; drawY = y + (_imgHRoom->_height - _imgMapX[_direction]->_height) / 2;
break; break;
@ -310,7 +304,7 @@ void LabEngine::drawRoomMap(uint16 curRoom, bool drawMarkFl) {
} }
if (drawMarkFl) if (drawMarkFl)
_imgXMark->drawImage(drawX, drawY); _imgMapX[_direction]->drawImage(drawX, drawY);
} }
/** /**
@ -603,16 +597,6 @@ void LabEngine::doMap(uint16 curRoom) {
_music->updateMusic(); _music->updateMusic();
loadMapData(); loadMapData();
_graphics->blackAllScreen(); _graphics->blackAllScreen();
if (_direction == NORTH)
_imgXMark = _imgMapNorth;
else if (_direction == SOUTH)
_imgXMark = _imgMapSouth;
else if (_direction == EAST)
_imgXMark = _imgMapEast;
else if (_direction == WEST)
_imgXMark = _imgMapWest;
_event->attachButtonList(&_mapButtonList); _event->attachButtonList(&_mapButtonList);
drawMap(curRoom, curRoom, _maps[curRoom]._pageNumber, false, true); drawMap(curRoom, curRoom, _maps[curRoom]._pageNumber, false, true);
_event->mouseShow(); _event->mouseShow();