aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2015-12-03 15:23:40 +0200
committerWillem Jan Palenstijn2015-12-23 21:33:49 +0100
commit58e6627f1989b69a70358ec91ab54a0f180b56c9 (patch)
tree5773c92f1912b681f06ef7f8164c996f85925b1b
parentca52b2624ee420b80a79bae2648e3fd5d7e79e76 (diff)
downloadscummvm-rg350-58e6627f1989b69a70358ec91ab54a0f180b56c9.tar.gz
scummvm-rg350-58e6627f1989b69a70358ec91ab54a0f180b56c9.tar.bz2
scummvm-rg350-58e6627f1989b69a70358ec91ab54a0f180b56c9.zip
LAB: Remove superfluous image variables
-rw-r--r--engines/lab/map.cpp22
1 files changed, 7 insertions, 15 deletions
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index b3312619c1..9b7f3f3e40 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -72,8 +72,7 @@ extern RoomData *_rooms;
static Image *Map, *Room, *UpArrowRoom, *DownArrowRoom, *Bridge,
*HRoom, *VRoom, *Maze, *HugeMaze, *Path, *MapNorth,
- *MapEast, *MapSouth, *MapWest, *XMark, *Back, *BackAlt,
- *Down, *DownAlt, *Up, *UpAlt;
+ *MapEast, *MapSouth, *MapWest, *XMark;
static uint16 MaxRooms;
static MapData *Maps;
@@ -152,22 +151,15 @@ static bool loadMapData() {
Path = new Image(mapImages);
Bridge = new Image(mapImages);
- Back = new Image(mapImages);
- BackAlt = new Image(mapImages);
- Up = new Image(mapImages);
- UpAlt = new Image(mapImages);
- Down = new Image(mapImages);
- DownAlt = new Image(mapImages);
+ backgadget._image = new Image(mapImages);
+ backgadget._altImage = new Image(mapImages);
+ upgadget._image = new Image(mapImages);
+ upgadget._altImage = new Image(mapImages);
+ downgadget._image = new Image(mapImages);
+ downgadget._altImage = new Image(mapImages);
delete mapImages;
- backgadget._image = Back;
- backgadget._altImage = BackAlt;
- upgadget._image = Up;
- upgadget._altImage = UpAlt;
- downgadget._image = Down;
- downgadget._altImage = DownAlt;
-
counter = 0;
gptr = MapGadgetList;