From 58e6627f1989b69a70358ec91ab54a0f180b56c9 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 3 Dec 2015 15:23:40 +0200 Subject: LAB: Remove superfluous image variables --- engines/lab/map.cpp | 22 +++++++--------------- 1 file 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; -- cgit v1.2.3