diff options
| author | Strangerke | 2015-12-13 22:51:23 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:34:03 +0100 |
| commit | ad54a75b853ada2c4ae4b99368ac3038dcd92d33 (patch) | |
| tree | 69f25b8d3fe0ded70a6d8728157f1dac7a759303 /engines/lab/map.cpp | |
| parent | 2b91bf2f34c3e0ec4e83fa478f1e426d36719cb7 (diff) | |
| download | scummvm-rg350-ad54a75b853ada2c4ae4b99368ac3038dcd92d33.tar.gz scummvm-rg350-ad54a75b853ada2c4ae4b99368ac3038dcd92d33.tar.bz2 scummvm-rg350-ad54a75b853ada2c4ae4b99368ac3038dcd92d33.zip | |
LAB: Add _vm to Image class
Diffstat (limited to 'engines/lab/map.cpp')
| -rw-r--r-- | engines/lab/map.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp index 1861ccc6a0..f8207ad844 100644 --- a/engines/lab/map.cpp +++ b/engines/lab/map.cpp @@ -62,25 +62,25 @@ enum MapFloor { void LabEngine::loadMapData() { Common::File *mapImages = _resource->openDataFile("P:MapImage"); - _imgMap = new Image(mapImages); - _imgRoom = new Image(mapImages); - _imgUpArrowRoom = new Image(mapImages); - _imgDownArrowRoom = new Image(mapImages); - _imgHRoom = new Image(mapImages); - _imgVRoom = new Image(mapImages); - _imgMaze = new Image(mapImages); - _imgHugeMaze = new Image(mapImages); - - _imgMapX[NORTH] = new Image(mapImages); - _imgMapX[EAST] = new Image(mapImages); - _imgMapX[SOUTH] = new Image(mapImages); - _imgMapX[WEST] = new Image(mapImages); - _imgPath = new Image(mapImages); - _imgBridge = new Image(mapImages); - - _mapButtonList.push_back(_event->createButton( 8, _utils->vgaScaleY(105), 0, VKEY_LTARROW, new Image(mapImages), new Image(mapImages))); // back - _mapButtonList.push_back(_event->createButton( 55, _utils->vgaScaleY(105), 1, VKEY_UPARROW, new Image(mapImages), new Image(mapImages))); // up - _mapButtonList.push_back(_event->createButton(101, _utils->vgaScaleY(105), 2, VKEY_DNARROW, new Image(mapImages), new Image(mapImages))); // down + _imgMap = new Image(mapImages, this); + _imgRoom = new Image(mapImages, this); + _imgUpArrowRoom = new Image(mapImages, this); + _imgDownArrowRoom = new Image(mapImages, this); + _imgHRoom = new Image(mapImages, this); + _imgVRoom = new Image(mapImages, this); + _imgMaze = new Image(mapImages, this); + _imgHugeMaze = new Image(mapImages, this); + + _imgMapX[NORTH] = new Image(mapImages, this); + _imgMapX[EAST] = new Image(mapImages, this); + _imgMapX[SOUTH] = new Image(mapImages, this); + _imgMapX[WEST] = new Image(mapImages, this); + _imgPath = new Image(mapImages, this); + _imgBridge = new Image(mapImages, this); + + _mapButtonList.push_back(_event->createButton( 8, _utils->vgaScaleY(105), 0, VKEY_LTARROW, new Image(mapImages, this), new Image(mapImages, this))); // back + _mapButtonList.push_back(_event->createButton( 55, _utils->vgaScaleY(105), 1, VKEY_UPARROW, new Image(mapImages, this), new Image(mapImages, this))); // up + _mapButtonList.push_back(_event->createButton(101, _utils->vgaScaleY(105), 2, VKEY_DNARROW, new Image(mapImages, this), new Image(mapImages, this))); // down delete mapImages; |